Revert "12/21 modernizations from TG live"
This commit is contained in:
@@ -57,8 +57,7 @@
|
||||
name = "wabbajack altar"
|
||||
desc = "Whether you're sleeping or waking, it's going to be \
|
||||
quite chaotic."
|
||||
obj_integrity = 1000
|
||||
max_integrity = 1000
|
||||
health = 1000
|
||||
verb_say = "chants"
|
||||
var/obj/machinery/power/emitter/energycannon/magical/our_statue
|
||||
var/list/mob/living/sleepers = list()
|
||||
@@ -95,11 +94,12 @@
|
||||
// New sleepers
|
||||
for(var/i in found - sleepers)
|
||||
var/mob/living/L = i
|
||||
L.add_atom_colour("#800080", TEMPORARY_COLOUR_PRIORITY)
|
||||
L.visible_message("<span class='revennotice'>A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious.</span>",
|
||||
L.color = "#800080"
|
||||
L.visible_message("<span class='revennotice'>A strange purple glow \
|
||||
wraps itself around [L] as they suddenly fall unconcious.</span>",
|
||||
"<span class='revendanger'>[desc]</span>")
|
||||
// Don't let them sit suround unconscious forever
|
||||
addtimer(src, "sleeper_dreams", 100, TIMER_NORMAL, L)
|
||||
addtimer(src, "sleeper_dreams", 100, FALSE, L)
|
||||
|
||||
// Existing sleepers
|
||||
for(var/i in found)
|
||||
@@ -109,7 +109,7 @@
|
||||
// Missing sleepers
|
||||
for(var/i in sleepers - found)
|
||||
var/mob/living/L = i
|
||||
L.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, "#800080")
|
||||
L.color = initial(L.color)
|
||||
L.visible_message("<span class='revennotice'>The glow from [L] fades \
|
||||
away.</span>")
|
||||
L.grab_ghost()
|
||||
@@ -185,10 +185,9 @@
|
||||
// with CENTCOM_BARSTAFF)
|
||||
|
||||
/obj/structure/table/wood/bar
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
burn_state = LAVA_PROOF
|
||||
flags = NODECONSTRUCT
|
||||
obj_integrity = 1000
|
||||
max_integrity = 1000
|
||||
health = 1000
|
||||
var/boot_dir = 1
|
||||
|
||||
/obj/structure/table/wood/bar/Crossed(atom/movable/AM)
|
||||
|
||||
Reference in New Issue
Block a user