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

Fix logging, saferooms and remove medbay "botany" sign #1325

Merged
merged 4 commits into from
Nov 3, 2023
Merged
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: 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