Merge remote-tracking branch 'citadel/master' into mobility_flags

This commit is contained in:
kevinz000
2020-01-19 16:18:12 -07:00
320 changed files with 5694 additions and 2936 deletions

View File

@@ -172,6 +172,15 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
var/turf/T = locate(_x, _y, _z)
A.forceMove(T)
/obj/item/hilbertshotel/ghostdojo
name = "Infinite Dormitories"
anchored = TRUE
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
/obj/item/hilbertshotel/ghostdojo/interact(mob/user)
. = ..()
promptAndCheckIn(user)
//Template Stuff
/datum/map_template/hilbertshotel
name = "Hilbert's Hotel Room"