Code Readability - Structures (#18273)

* structures

* requested changes
This commit is contained in:
KalevTait
2022-07-10 14:00:25 +01:00
committed by GitHub
parent 6775604810
commit 8dcf49855b
34 changed files with 191 additions and 194 deletions
+18 -18
View File
@@ -22,7 +22,7 @@
desc = "Used to keep bodies in until someone fetches them."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "morgue"
density = 1
density = TRUE
max_integrity = 400
dir = EAST
var/obj/structure/m_tray/connected = null
@@ -34,7 +34,7 @@
NOT_BODY = "The tray contains something that is not a body.",
GHOST_CONNECTED = "The tray contains a body that might be responsive."
)
anchored = 1.0
anchored = TRUE
var/open_sound = 'sound/items/deconstruct.ogg'
var/status
@@ -182,10 +182,10 @@
desc = "Apply corpse before closing. May float away in no-gravity."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "morgue_tray"
density = 1
density = TRUE
layer = 2.0
var/obj/structure/morgue/connected = null
anchored = 1.0
anchored = TRUE
pass_flags = LETPASSTHROW
max_integrity = 350
@@ -246,12 +246,12 @@
desc = "A human incinerator. Works well on barbeque nights."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "crema"
density = 1
density = TRUE
var/obj/structure/c_tray/connected = null
anchored = 1.0
var/cremating = 0
anchored = TRUE
var/cremating = FALSE
var/id = 1
var/locked = 0
var/locked = FALSE
var/open_sound = 'sound/items/deconstruct.ogg'
/obj/structure/crematorium/Initialize(mapload)
@@ -296,13 +296,13 @@
if(cremating)
to_chat(usr, "<span class='warning'>It's locked.</span>")
return
if((connected) && (locked == 0))
if(connected && !locked)
for(var/atom/movable/A in connected.loc)
if(!(A.anchored) && A.move_resist != INFINITY)
A.forceMove(src)
playsound(loc, open_sound, 50, 1)
QDEL_NULL(connected)
else if(locked == 0)
else if(!locked)
playsound(loc, open_sound, 50, 1)
connect()
add_fingerprint(user)
@@ -347,8 +347,8 @@
for(var/mob/M in viewers(src))
M.show_message("<span class='warning'>You hear a roar as the crematorium activates.</span>", 1)
cremating = 1
locked = 1
cremating = TRUE
locked = TRUE
update()
for(var/mob/living/M in search_contents_for(/mob/living))
@@ -369,8 +369,8 @@
new /obj/effect/decal/cleanable/ash(src)
sleep(30)
cremating = 0
locked = 0
cremating = FALSE
locked = FALSE
update()
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
return
@@ -406,10 +406,10 @@
desc = "Apply body before burning."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "crema_tray"
density = 1
density = TRUE
layer = 2.0
var/obj/structure/crematorium/connected = null
anchored = 1.0
anchored = TRUE
pass_flags = LETPASSTHROW
/obj/structure/c_tray/attack_hand(mob/user as mob)
@@ -454,9 +454,9 @@
use_power = IDLE_POWER_USE
idle_power_usage = 100
active_power_usage = 5000
anchored = 1.0
anchored = TRUE
req_access = list(ACCESS_CREMATORIUM)
var/on = 0
var/on = FALSE
var/area/area = null
var/otherarea = null
var/id = 1