cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Kyep
2018-08-08 10:39:25 -07:00
parent ebb9097492
commit 2dd35bc894
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/grid_check.dm
+4 -4
View File
@@ -17,8 +17,8 @@
if(announce)
event_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
var/list/skipped_areas = list(/area/turret_protected/ai, /area/syndicate_depot)
var/list/skipped_areas_apc = list(/area/engine/engineering, /area/syndicate_depot)
var/list/skipped_areas = list(/area/turret_protected/ai, /area/syndicate_depot/core, /area/syndicate_depot/outer)
var/list/skipped_areas_apc = list(/area/engine/engineering, /area/syndicate_depot/core, /area/syndicate_depot/outer)
for(var/obj/machinery/power/smes/S in machines)
var/area/current_area = get_area(S)
@@ -41,8 +41,8 @@
C.cell.charge = 0
/proc/power_restore(var/announce = 1)
var/list/skipped_areas = list(/area/turret_protected/ai, /area/syndicate_depot)
var/list/skipped_areas_apc = list(/area/engine/engineering, /area/syndicate_depot)
var/list/skipped_areas = list(/area/turret_protected/ai, /area/syndicate_depot/core, /area/syndicate_depot/outer)
var/list/skipped_areas_apc = list(/area/engine/engineering, /area/syndicate_depot/core, /area/syndicate_depot/outer)
if(announce)
event_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+8
View File
@@ -134,6 +134,14 @@
if(scan_cycles >= 15 && istype(depotarea))
scan_cycles = 0
if(!atoms_share_level(src, spawn_turf))
if(istype(loc, /obj/structure/closet))
var/obj/structure/closet/O = loc
forceMove(get_turf(src))
visible_message("<span class='boldwarning'>[src] smashes their way out of [O]!</span>")
qdel(O)
raise_alert("[src] reported being trapped in a locker.")
raised_alert = FALSE
return
if(alert_on_spacing)
raise_alert("[src] lost in space.")
death()