Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-02-08 01:16:02 -05:00
86 changed files with 1335 additions and 896 deletions
@@ -303,7 +303,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
user.reset_perspective(parentSphere)
user.set_machine(src)
var/datum/action/peepholeCancel/PHC = new
user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 1)
PHC.Grant(user)
return TRUE