Conflicts!!!

2020-06-22 17:39:24 +03:00
parent 66cbdd1174 a0a4007332
commit c41d2e78be
395 changed files with 84463 additions and 336540 deletions
@@ -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