Conflicts!!!
This commit is contained in:
@@ -289,7 +289,7 @@
|
||||
|
||||
/obj/effect/sliding_puzzle/prison/dispense_reward()
|
||||
prisoner.forceMove(get_turf(src))
|
||||
prisoner.notransform = FALSE
|
||||
prisoner.mob_transforming = FALSE
|
||||
prisoner = null
|
||||
|
||||
//Some armor so it's harder to kill someone by mistake.
|
||||
@@ -329,7 +329,7 @@
|
||||
return FALSE
|
||||
|
||||
//First grab the prisoner and move them temporarily into the generator so they won't get thrown around.
|
||||
prisoner.notransform = TRUE
|
||||
prisoner.mob_transforming = TRUE
|
||||
prisoner.forceMove(cube)
|
||||
to_chat(prisoner,"<span class='userdanger'>You're trapped by the prison cube! You will remain trapped until someone solves it.</span>")
|
||||
|
||||
@@ -350,4 +350,4 @@
|
||||
//Move them into random block
|
||||
var/obj/structure/puzzle_element/E = pick(cube.elements)
|
||||
prisoner.forceMove(E)
|
||||
return TRUE
|
||||
return TRUE
|
||||
|
||||
@@ -413,13 +413,13 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
|
||||
. = ..()
|
||||
if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
M.notransform = TRUE
|
||||
M.mob_transforming = TRUE
|
||||
|
||||
/obj/item/abstracthotelstorage/Exited(atom/movable/AM, atom/newLoc)
|
||||
. = ..()
|
||||
if(ismob(AM))
|
||||
var/mob/M = AM
|
||||
M.notransform = FALSE
|
||||
M.mob_transforming = FALSE
|
||||
|
||||
//Space Ruin stuff
|
||||
/area/ruin/space/has_grav/hilbertresearchfacility
|
||||
|
||||
Reference in New Issue
Block a user