cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

moves core to /area/ subtype, bugfix

Browse Source
This commit is contained in:
Kyep
2018-08-06 23:17:30 -07:00
parent d56f2105fd
commit cfce50fe8a
10 changed files with 249 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/crates_lockers/closets/secure/depot.dm
View File

@@ -26,7 +26,7 @@
. = ..()
/obj/structure/closet/secure_closet/syndicate/depot/proc/loot_pickup()
var/area/syndicate_depot/depotarea = areaMaster
var/area/syndicate_depot/core/depotarea = areaMaster
if(depotarea)
depotarea.locker_looted()

12
code/game/objects/structures/depot.dm
View File

@@ -6,7 +6,7 @@
icon_state = "powersink1"
anchored = 1
max_integrity = 50
var/area/syndicate_depot/depotarea
var/area/syndicate_depot/core/depotarea
/obj/structure/fusionreactor/Initialize()
. = ..()
@@ -65,14 +65,14 @@
var/beepsound = 'sound/items/timer.ogg'
var/deliberate = FALSE
var/max_cycles = 10
var/max_fire_range = 6
var/area/syndicate_depot/depotarea
var/max_fire_range = 9
var/area/syndicate_depot/core/depotarea
/obj/effect/overload/Initialize()
. = ..()
processing_objects.Add(src)
depotarea = areaMaster
if(depotarea)
if(istype(depotarea))
if(!depotarea.used_self_destruct)
depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards.
depotarea.updateicon()
@@ -90,7 +90,9 @@
new /obj/effect/hotspot(turf)
return
if(depotarea)
if(!istype(depotarea))
depotarea = areaMaster
if(istype(depotarea))
depotarea.destroyed = TRUE
depotarea.updateicon()