cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] obj screen to atom movable screen (#11719)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-21 16:04:35 -07:00
committed by GitHub
parent fd68853af6
commit 303e88c0b2
141 changed files with 1307 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/devices/communicator/UI_tgui.dm
View File

@@ -4,10 +4,10 @@
var/turf/last_camera_turf
// Stuff needed to render the map
var/map_name
var/obj/screen/map_view/cam_screen
var/atom/movable/screen/map_view/cam_screen
var/list/cam_plane_masters
var/obj/screen/background/cam_background
var/obj/screen/skybox/local_skybox
var/atom/movable/screen/background/cam_background
var/atom/movable/screen/skybox/local_skybox
// Proc: setup_tgui_camera()
// Parameters: None
@@ -24,7 +24,7 @@
cam_plane_masters = get_tgui_plane_masters()
for(var/obj/screen/instance as anything in cam_plane_masters)
for(var/atom/movable/screen/instance as anything in cam_plane_masters)
instance.assigned_map = map_name
instance.del_on_map_removal = FALSE
instance.screen_loc = "[map_name]:CENTER"

2
code/game/objects/items/devices/communicator/communicator.dm
View File

@@ -328,7 +328,7 @@
var/mob/M = usr
if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
return
if(!istype(over_object, /obj/screen))
if(!istype(over_object, /atom/movable/screen))
return attack_self(M)
return

2
code/game/objects/items/devices/communicator/phone.dm
View File

@@ -75,7 +75,7 @@
voice_mobs.Add(new_voice)
GLOB.listening_objects |= src
var/obj/screen/blackness = new() //Makes a black screen, so the candidate can't see what's going on before actually 'connecting' to the communicator.
var/atom/movable/screen/blackness = new() //Makes a black screen, so the candidate can't see what's going on before actually 'connecting' to the communicator.
blackness.screen_loc = ui_entire_screen
blackness.icon = 'icons/effects/effects.dmi'
blackness.icon_state = "1"

4
code/game/objects/items/devices/flashlight.dm
View File

@@ -191,7 +191,7 @@
if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why?
return
if (!( istype(over_object, /obj/screen) ))
if (!( istype(over_object, /atom/movable/screen) ))
return ..()
//makes sure that the thing is equipped, so that we can't drag it into our hand from miles away.
@@ -202,7 +202,7 @@
if (( usr.restrained() ) || ( usr.stat ))
return
if ((src.loc == usr) && !(istype(over_object, /obj/screen)) && !usr.unEquip(src))
if ((src.loc == usr) && !(istype(over_object, /atom/movable/screen)) && !usr.unEquip(src))
return
switch(over_object.name)