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
+5 -10
View File
@@ -12,7 +12,6 @@ FLOOR SAFES
icon_state = "safe"
anchored = 1
density = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
var/open = 0 //is the safe open?
var/tumbler_1_pos //the tumbler position- from 0 to 72
var/tumbler_1_open //the tumbler position to open at- 0 to 72
@@ -24,7 +23,6 @@ FLOOR SAFES
/obj/structure/safe/New()
..()
tumbler_1_pos = rand(0, 71)
tumbler_1_open = rand(0, 71)
@@ -93,7 +91,7 @@ FLOOR SAFES
var/mob/living/carbon/human/user = usr
var/canhear = 0
if(user.is_holding_item_of_type(/obj/item/clothing/neck/stethoscope))
if(istype(user.l_hand, /obj/item/clothing/tie/stethoscope) || istype(user.r_hand, /obj/item/clothing/tie/stethoscope))
canhear = 1
if(href_list["open"])
@@ -153,26 +151,23 @@ FLOOR SAFES
if(!user.drop_item())
user << "<span class='warning'>\The [I] is stuck to your hand, you cannot put it in the safe!</span>"
return
I.forceMove(src)
I.loc = src
user << "<span class='notice'>You put [I] in [src].</span>"
updateUsrDialog()
return
else
user << "<span class='notice'>[I] won't fit in [src].</span>"
return
else if(istype(I, /obj/item/clothing/neck/stethoscope))
else if(istype(I, /obj/item/clothing/tie/stethoscope))
user << "<span class='warning'>Hold [I] in one of your hands while you manipulate the dial!</span>"
else
return ..()
/obj/structure/safe/handle_atom_del(atom/A)
updateUsrDialog()
/obj/structure/safe/blob_act(obj/structure/blob/B)
obj/structure/safe/blob_act(obj/effect/blob/B)
return
/obj/structure/safe/ex_act(severity, target)
obj/structure/safe/ex_act(severity, target)
return