cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 21:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Archie
2021-01-05 03:41:08 -03:00
parent d98266036f 90ae23caaa
commit 9e37d3be62
106 changed files with 13604 additions and 13417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/ruins/spaceruin_code/hilbertshotel.dm
+9 -8
View File
@@ -276,14 +276,15 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
promptExit(user)
/turf/closed/indestructible/hoteldoor/AltClick(mob/user)
. = ..()
if(get_dist(get_turf(src), get_turf(user)) <= 1)
to_chat(user, "<span class='notice'>You peak through the door's bluespace peephole...</span>")
user.reset_perspective(parentSphere)
user.set_machine(src)
var/datum/action/peepholeCancel/PHC = new
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
PHC.Grant(user)
. = ..()
if(get_dist(get_turf(src), get_turf(user)) <= 1)
to_chat(user, "<span class='notice'>You peak through the door's bluespace peephole...</span>")
user.reset_perspective(parentSphere)
user.set_machine(src)
var/datum/action/peepholeCancel/PHC = new
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
PHC.Grant(user)
return TRUE
/turf/closed/indestructible/hoteldoor/check_eye(mob/user)
if(get_dist(get_turf(src), get_turf(user)) >= 2)