mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts: # code/game/machinery/turrets.dm
This commit is contained in:
@@ -25,6 +25,18 @@
|
||||
/turf/simulated/wall/rust,
|
||||
/turf/simulated/wall/r_wall/rust)
|
||||
smooth = SMOOTH_TRUE
|
||||
|
||||
/obj/structure/falsewall/New(loc)
|
||||
..()
|
||||
air_update_turf(1)
|
||||
|
||||
/obj/structure/falsewall/Destroy()
|
||||
density = 0
|
||||
air_update_turf(1)
|
||||
return ..()
|
||||
|
||||
/obj/structure/falsewall/CanAtmosPass(turf/T)
|
||||
return !density
|
||||
|
||||
/obj/structure/falsewall/attack_hand(mob/user)
|
||||
if(opening)
|
||||
@@ -47,6 +59,7 @@
|
||||
sleep(4)
|
||||
set_opacity(1)
|
||||
update_icon()
|
||||
air_update_turf(1)
|
||||
opening = 0
|
||||
|
||||
/obj/structure/falsewall/proc/do_the_flick()
|
||||
|
||||
@@ -18,11 +18,24 @@
|
||||
density = 1
|
||||
dir = EAST
|
||||
var/obj/structure/m_tray/connected = null
|
||||
var/list/status_descriptors = list(
|
||||
"The tray is currently extended.",
|
||||
"The tray is currently empty.",
|
||||
"The tray contains an unviable body.",
|
||||
"The tray contains a body that is responsive to revival techniques.",
|
||||
"The tray contains something that is not a body.",
|
||||
"The tray contains a body that might be responsive."
|
||||
)
|
||||
anchored = 1.0
|
||||
|
||||
/obj/structure/morgue/initialize()
|
||||
. = ..()
|
||||
update()
|
||||
|
||||
/obj/structure/morgue/proc/update()
|
||||
if(connected)
|
||||
icon_state = "morgue0"
|
||||
desc = initial(desc) + "\n[status_descriptors[1]]"
|
||||
else
|
||||
if(contents.len)
|
||||
|
||||
@@ -36,13 +49,21 @@
|
||||
|
||||
if(M.client)
|
||||
icon_state = "morgue3"
|
||||
desc = initial(desc) + "\n[status_descriptors[4]]"
|
||||
else if(G && G.client) //There is a ghost and it is connected to the server
|
||||
icon_state = "morgue5"
|
||||
desc = initial(desc) + "\n[status_descriptors[6]]"
|
||||
else
|
||||
icon_state = "morgue2"
|
||||
desc = initial(desc) + "\n[status_descriptors[3]]"
|
||||
|
||||
else icon_state = "morgue4"
|
||||
else icon_state = "morgue1"
|
||||
|
||||
else
|
||||
icon_state = "morgue4"
|
||||
desc = initial(desc) + "\n[status_descriptors[5]]"
|
||||
else
|
||||
icon_state = "morgue1"
|
||||
desc = initial(desc) + "\n[status_descriptors[2]]"
|
||||
return
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user