cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-29 16:18:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix area selection for electrical fault and containment subroutine events

Browse Source
This commit is contained in:
Cerebulon
2023-01-23 21:56:41 +00:00
parent 2009c45324
commit 4c9620b9cd
3 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/gamemaster/event2/events/engineering/wallrot.dm
-6
View File
@@ -8,9 +8,6 @@
/datum/event2/meta/wallrot/get_weight()
return (10 + metric.count_people_in_department(DEPARTMENT_ENGINEERING) * 10) / (times_ran + 1)
/datum/event2/event/wallrot
var/turf/simulated/wall/origin = null
@@ -42,6 +39,3 @@
rot_count++
if(rot_count >= target_rot)
break
code/modules/gamemaster/event2/events/everyone/electrical_fault.dm
+2 -5
View File
@@ -35,12 +35,10 @@
to cause voltage spikes and other electrical issues very soon. Please secure sensitive electrical equipment until the situation passes.", "[location_name()] Sensor Array")
/datum/event2/event/electrical_fault/set_up()
valid_z_levels = get_location_z_levels()
valid_z_levels -= using_map.sealed_levels // Space levels only please!
valid_apcs = list()
for(var/obj/machinery/power/apc/A in global.machines)
if(A.z in valid_z_levels)
for(var/obj/machinery/power/apc/A in machines)
if(A.z in using_map.station_levels)
valid_apcs += A
/datum/event2/event/electrical_fault/start()
@@ -97,4 +95,3 @@
// log_debug("ELECTRICAL EVENT: Emagged \the [A].")
playsound(A, 'sound/machines/chime.ogg', 50, 1)
apcs_emagged++
maps/cynosure/cynosure_events.dm
+44 -3
View File
@@ -1,11 +1,10 @@
// The Station Director's office is specific to the Southern Cross, so this needs to go here.
// Area defines on Cynosure differ from previous maps, so these have to be overriden with map-specific lists.
/datum/event2/event/prison_break/bridge
area_types_to_break = list(
/area/surface/station/command/operations,
/area/surface/station/crew_quarters/captain
)
// So is xenoflora isolation it seems.
/datum/event2/meta/prison_break/xenobio
irrelevant_areas = list(
/area/surface/station/rnd/xenobiology/xenoflora,
@@ -13,8 +12,50 @@
)
/datum/event2/event/prison_break/xenobio
area_types_to_break = list(/area/surface/station/rnd/xenobiology)
area_types_to_ignore = list(
/area/surface/station/rnd/xenobiology/xenoflora,
/area/surface/station/rnd/xenobiology/xenoflora_isolation
)
ignore_blast_doors = TRUE // Needed to avoid a breach.
ignore_blast_doors = TRUE // Needed to avoid a breach.
/datum/event2/meta/prison_break/brig
relevant_areas = list(
/area/surface/station/security/prison,
/area/surface/station/security/hallway,
/area/surface/station/security/processing,
/area/surface/station/security/interrogation
)
/datum/event2/event/prison_break/brig
area_types_to_break = list(
/area/surface/station/security/prison,
/area/surface/station/security/hallway/cell_hallway,
/area/surface/station/security/hallway/stairwell,
/area/surface/station/maintenance/substation/security,
/area/surface/station/security/lobby,
/area/surface/station/security/processing,
/area/surface/station/security/interrogation
)
/datum/event2/event/prison_break/armory
area_types_to_break = list(
/area/surface/station/security/brig,
/area/surface/station/security/warden,
/area/surface/station/security/evidence_storage,
/area/surface/station/security/equiptment_storage,
/area/surface/station/security/armoury,
/area/surface/station/security/tactical
)
/datum/event2/meta/prison_break/virology
relevant_areas = list(
/area/surface/station/medical/virology
)
/datum/event2/event/prison_break/virology
area_types_to_break = list(
/area/surface/station/medical/virology,
/area/surface/station/medical/patient_wing,
/area/surface/station/medical/office
)