Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge #1338

Merged
merged 13 commits into from
Nov 3, 2023
Merged

Merge #1338

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/datums/browser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

return {"<!DOCTYPE html>
<html>
<meta charset=UTF-8">
<meta charset="UTF-8">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
[head_content]
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/doors/door.dm
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@
operating = DOOR_OPERATING_YES

do_animate("opening")
icon_state = "door0"
set_opacity(0)
if(width > 1)
set_fillers_opacity(0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@
return -1

if(!held_item)
to_chat(usr, SPAN_WARNING("You have nothing to drop!"))
to_chat(src, SPAN_WARNING("You have nothing to drop!"))
return 0

if(!drop_gently)
Expand Down
12 changes: 12 additions & 0 deletions html/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,22 @@ <h3 class="author">Обновления KandJX:</h3>
<div class="log tweak">Голокарты теперь корректно отображают цвета зон</div>
<div class="log maptweak">Мелкофиксы то тут то там</div>
</div>
<h3 class="author">Обновления LordNest:</h3>
<div class="changes bgimages16">
<div class="log bugfix">Пофиксил спавнпоинты пионеров, сержанта и инженера Пионерского Корпуса</div>
</div>
<h3 class="author">Обновления SierraKomodo:</h3>
<div class="changes bgimages16">
<div class="log bugfix">Cryopods can now be used to leave the round even if there's no power.</div>
</div>
<h3 class="author">Обновления SuhEugene:</h3>
<div class="changes bgimages16">
<div class="log bugfix">Fixed red circle triangle exclaimnation mark airlock opening icon</div>
<div class="log bugfix">Починил кодировку тикет-панели (в очередной раз).</div>
<div class="log bugfix">Убрал логирование, которое возможно сильно нагружает сервер.</div>
<div class="log bugfix">Сделал бункеры рабочими.</div>
<div class="log maptweak">Удалил табличку ботаники из меда.</div>
</div>
<h3 class="author">Обновления emmanuelbassil:</h3>
<div class="changes bgimages16">
<div class="log bugfix">Gas scanner no longer scans the inside of your backpack on storage</div>
Expand Down
22 changes: 22 additions & 0 deletions html/changelogs/.all_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22204,7 +22204,29 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p
\u0430 \u0437\u043E\u043D"
- maptweak: "\u041C\u0435\u043B\u043A\u043E\u0444\u0438\u043A\u0441\u044B \u0442\
\u043E \u0442\u0443\u0442 \u0442\u043E \u0442\u0430\u043C"
LordNest:
- bugfix: "\u041F\u043E\u0444\u0438\u043A\u0441\u0438\u043B \u0441\u043F\u0430\u0432\
\u043D\u043F\u043E\u0438\u043D\u0442\u044B \u043F\u0438\u043E\u043D\u0435\u0440\
\u043E\u0432, \u0441\u0435\u0440\u0436\u0430\u043D\u0442\u0430 \u0438 \u0438\
\u043D\u0436\u0435\u043D\u0435\u0440\u0430 \u041F\u0438\u043E\u043D\u0435\u0440\
\u0441\u043A\u043E\u0433\u043E \u041A\u043E\u0440\u043F\u0443\u0441\u0430"
SierraKomodo:
- bugfix: Cryopods can now be used to leave the round even if there's no power.
SuhEugene:
- bugfix: Fixed red circle triangle exclaimnation mark airlock opening icon
- bugfix: "\u041F\u043E\u0447\u0438\u043D\u0438\u043B \u043A\u043E\u0434\u0438\u0440\
\u043E\u0432\u043A\u0443 \u0442\u0438\u043A\u0435\u0442-\u043F\u0430\u043D\u0435\
\u043B\u0438 (\u0432 \u043E\u0447\u0435\u0440\u0435\u0434\u043D\u043E\u0439\
\ \u0440\u0430\u0437)."
- bugfix: "\u0423\u0431\u0440\u0430\u043B \u043B\u043E\u0433\u0438\u0440\u043E\u0432\
\u0430\u043D\u0438\u0435, \u043A\u043E\u0442\u043E\u0440\u043E\u0435 \u0432\u043E\
\u0437\u043C\u043E\u0436\u043D\u043E \u0441\u0438\u043B\u044C\u043D\u043E \u043D\
\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u0442 \u0441\u0435\u0440\u0432\u0435\
\u0440."
- bugfix: "\u0421\u0434\u0435\u043B\u0430\u043B \u0431\u0443\u043D\u043A\u0435\u0440\
\u044B \u0440\u0430\u0431\u043E\u0447\u0438\u043C\u0438."
- maptweak: "\u0423\u0434\u0430\u043B\u0438\u043B \u0442\u0430\u0431\u043B\u0438\
\u0447\u043A\u0443 \u0431\u043E\u0442\u0430\u043D\u0438\u043A\u0438 \u0438\u0437\
\ \u043C\u0435\u0434\u0430."
emmanuelbassil:
- bugfix: Gas scanner no longer scans the inside of your backpack on storage
2 changes: 0 additions & 2 deletions maps/sierra/areas/z3_sierra_deck2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@

/area/crew_quarters/safe_room/seconddeck
name = "Second Deck - Safe Room"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

/area/maintenance/substation/seconddeck
name = "Second Deck - Substation"
Expand Down
4 changes: 1 addition & 3 deletions maps/sierra/areas/z4_sierra_deck1.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,8 @@
name = "First Deck - Living - Library"
holomap_color = HOLOMAP_AREACOLOR_CREW

/area/crew_quarters/safe_room
/area/crew_quarters/safe_room/firstdeck
name = "First Deck - Citadel"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

/* SECURITY AREAS
* ==============
Expand Down
1 change: 0 additions & 1 deletion maps/sierra/areas/z5_sierra_bridge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@

/area/crew_quarters/safe_room/bridge
name = "Bridge - Safe Room"
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

/area/crew_quarters/heads/office/rd/cobed
icon_state = "heads_rd"
Expand Down
4 changes: 4 additions & 0 deletions maps/sierra/sierra_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
icon_state = "thruster"
req_access = list(access_engine)

/area/crew_quarters/safe_room
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_ESCAPE

#include "areas/shuttles.dm"
#include "areas/z1_sierra_deck4.dm"
#include "areas/z2_sierra_deck3.dm"
Expand Down
16 changes: 16 additions & 0 deletions maps/sierra/sierra_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,19 @@
to_chat(Player, "<font color='red'><b>Вы не пережили события на [station_name()]...</b></font>")
else
to_chat(Player, "<font color='red'><b>Вы не пережили события на [station_name()]...</b></font>")

/datum/map/bolt_saferooms()
for(var/atype in typesof(/area/crew_quarters/safe_room))
var/area/A = locate(atype)
if(istype(A))
for(var/obj/machinery/door/airlock/vault/bolted/V in A.contents)
if(!V.locked)
V.lock()

/datum/map/unbolt_saferooms()
for(var/atype in typesof(/area/crew_quarters/safe_room))
var/area/A = locate(atype)
if(istype(A))
for(var/obj/machinery/door/airlock/vault/bolted/V in A.contents)
if(V.locked)
V.unlock()
Loading