Revert "12/21 modernizations from TG live"

This commit is contained in:
LetterJay
2016-12-22 22:35:44 -06:00
committed by GitHub
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
+9 -36
View File
@@ -17,8 +17,6 @@
icon_state = "morgue1"
density = 1
anchored = 1
obj_integrity = 400
max_integrity = 400
var/obj/structure/tray/connected = null
var/locked = 0
@@ -40,6 +38,9 @@
/obj/structure/bodycontainer/update_icon()
return
/obj/structure/bodycontainer/alter_health()
return src.loc
/obj/structure/bodycontainer/relaymove(mob/user)
if(user.stat || !isturf(loc))
return
@@ -61,16 +62,11 @@
close()
add_fingerprint(user)
/obj/structure/bodycontainer/attack_robot(mob/user)
if(!user.Adjacent(src))
return
return attack_hand(user)
/obj/structure/bodycontainer/attackby(obj/P, mob/user, params)
add_fingerprint(user)
if(istype(P, /obj/item/weapon/pen))
var/t = stripped_input(user, "What would you like the label to be?", text("[]", name), null)
if (user.get_active_held_item() != P)
if (user.get_active_hand() != P)
return
if ((!in_range(src, usr) && src.loc != user))
return
@@ -81,17 +77,9 @@
else
return ..()
/obj/structure/bodycontainer/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal (loc, 5)
qdel(src)
/obj/structure/bodycontainer/container_resist(mob/living/user)
/obj/structure/bodycontainer/container_resist()
open()
/obj/structure/bodycontainer/relay_container_resist(mob/living/user, obj/O)
user << "<span class='notice'>You slam yourself into the side of [O].</span>"
container_resist(user)
/obj/structure/bodycontainer/proc/open()
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
var/turf/T = get_step(src, opendir)
@@ -136,14 +124,10 @@
icon_state = "morgue3"
return
for(var/mob/living/M in compiled)
if(M.client && !M.suiciding)
if(M.client)
icon_state = "morgue4" // Cloneable
break
/obj/item/weapon/paper/morguereminder
name = "morgue memo"
info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- Centcom medical inspector"
/*
* Crematorium
*/
@@ -155,10 +139,6 @@ var/global/list/crematoriums = new/list()
opendir = SOUTH
var/id = 1
/obj/structure/bodycontainer/crematorium/attack_robot(mob/user) //Borgs can't use crematoriums without help
user << "<span class='warning'>[src] is locked against you.</span>"
return
/obj/structure/bodycontainer/crematorium/Destroy()
crematoriums.Remove(src)
return ..()
@@ -218,10 +198,9 @@ var/global/list/crematoriums = new/list()
new /obj/effect/decal/cleanable/ash(src)
sleep(30)
if(!qdeleted(src))
locked = 0
update_icon()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people
locked = 0
update_icon()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people
/*
@@ -236,8 +215,6 @@ var/global/list/crematoriums = new/list()
var/obj/structure/bodycontainer/connected = null
anchored = 1
pass_flags = LETPASSTHROW
obj_integrity = 350
max_integrity = 350
/obj/structure/tray/Destroy()
if(connected)
@@ -246,10 +223,6 @@ var/global/list/crematoriums = new/list()
connected = null
return ..()
/obj/structure/tray/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal (loc, 2)
qdel(src)
/obj/structure/tray/attack_paw(mob/user)
return src.attack_hand(user)