cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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

2
code/_helpers/game.dm
View File

@@ -464,7 +464,7 @@
return candidates
/proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480)
if(!isobj(O)) O = new /obj/screen/text()
if(!isobj(O)) O = new /atom/movable/screen/text()
O.maptext = maptext
O.maptext_height = maptext_height
O.maptext_width = maptext_width

66
code/_helpers/unsorted.dm
View File

@@ -1515,47 +1515,47 @@ var/mob/dview/dview_mob
/proc/get_tgui_plane_masters()
. = list()
// 'Utility' planes
. += new /obj/screen/plane_master/fullbright //Lighting system (lighting_overlay objects)
. += new /obj/screen/plane_master/lighting //Lighting system (but different!)
. += new /obj/screen/plane_master/o_light_visual //Object lighting (using masks)
. += new /obj/screen/plane_master/emissive //Emissive overlays
. += new /atom/movable/screen/plane_master/fullbright //Lighting system (lighting_overlay objects)
. += new /atom/movable/screen/plane_master/lighting //Lighting system (but different!)
. += new /atom/movable/screen/plane_master/o_light_visual //Object lighting (using masks)
. += new /atom/movable/screen/plane_master/emissive //Emissive overlays
. += new /obj/screen/plane_master/ghosts //Ghosts!
. += new /obj/screen/plane_master{plane = PLANE_AI_EYE} //AI Eye!
. += new /atom/movable/screen/plane_master/ghosts //Ghosts!
. += new /atom/movable/screen/plane_master{plane = PLANE_AI_EYE} //AI Eye!
. += new /obj/screen/plane_master{plane = PLANE_CH_STATUS} //Status is the synth/human icon left side of medhuds
. += new /obj/screen/plane_master{plane = PLANE_CH_HEALTH} //Health bar
. += new /obj/screen/plane_master{plane = PLANE_CH_LIFE} //Alive-or-not icon
. += new /obj/screen/plane_master{plane = PLANE_CH_ID} //Job ID icon
. += new /obj/screen/plane_master{plane = PLANE_CH_WANTED} //Wanted status
. += new /obj/screen/plane_master{plane = PLANE_CH_IMPLOYAL} //Loyalty implants
. += new /obj/screen/plane_master{plane = PLANE_CH_IMPTRACK} //Tracking implants
. += new /obj/screen/plane_master{plane = PLANE_CH_IMPCHEM} //Chemical implants
. += new /obj/screen/plane_master{plane = PLANE_CH_SPECIAL} //"Special" role stuff
. += new /obj/screen/plane_master{plane = PLANE_CH_STATUS_OOC} //OOC status HUD
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_STATUS} //Status is the synth/human icon left side of medhuds
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_HEALTH} //Health bar
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_LIFE} //Alive-or-not icon
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_ID} //Job ID icon
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_WANTED} //Wanted status
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_IMPLOYAL} //Loyalty implants
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_IMPTRACK} //Tracking implants
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_IMPCHEM} //Chemical implants
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_SPECIAL} //"Special" role stuff
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_STATUS_OOC} //OOC status HUD
. += new /obj/screen/plane_master{plane = PLANE_ADMIN1} //For admin use
. += new /obj/screen/plane_master{plane = PLANE_ADMIN2} //For admin use
. += new /obj/screen/plane_master{plane = PLANE_ADMIN3} //For admin use
. += new /atom/movable/screen/plane_master{plane = PLANE_ADMIN1} //For admin use
. += new /atom/movable/screen/plane_master{plane = PLANE_ADMIN2} //For admin use
. += new /atom/movable/screen/plane_master{plane = PLANE_ADMIN3} //For admin use
. += new /obj/screen/plane_master{plane = PLANE_MESONS} //Meson-specific things like open ceilings.
. += new /obj/screen/plane_master{plane = PLANE_BUILDMODE} //Things that only show up while in build mode
. += new /obj/screen/plane_master{plane = PLANE_JANHUD}
. += new /atom/movable/screen/plane_master{plane = PLANE_MESONS} //Meson-specific things like open ceilings.
. += new /atom/movable/screen/plane_master{plane = PLANE_BUILDMODE} //Things that only show up while in build mode
. += new /atom/movable/screen/plane_master{plane = PLANE_JANHUD}
// Real tangible stuff planes
. += new /obj/screen/plane_master/main{plane = TURF_PLANE}
. += new /obj/screen/plane_master/main{plane = OBJ_PLANE}
. += new /obj/screen/plane_master/main{plane = MOB_PLANE}
. += new /obj/screen/plane_master/cloaked //Cloaked atoms!
. += new /atom/movable/screen/plane_master/main{plane = TURF_PLANE}
. += new /atom/movable/screen/plane_master/main{plane = OBJ_PLANE}
. += new /atom/movable/screen/plane_master/main{plane = MOB_PLANE}
. += new /atom/movable/screen/plane_master/cloaked //Cloaked atoms!
//VOREStation Add - Random other plane masters
. += new /obj/screen/plane_master{plane = PLANE_CH_STATUS_R} //Right-side status icon
. += new /obj/screen/plane_master{plane = PLANE_CH_HEALTH_VR} //Health bar but transparent at 100
. += new /obj/screen/plane_master{plane = PLANE_CH_BACKUP} //Backup implant status
. += new /obj/screen/plane_master{plane = PLANE_CH_VANTAG} //Vore Antags
. += new /obj/screen/plane_master{plane = PLANE_CH_STOMACH} //Stomachs
. += new /obj/screen/plane_master{plane = PLANE_AUGMENTED} //Augmented reality
. += new /obj/screen/plane_master{plane = PLANE_SOULCATCHER} //Soulcatcher
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_STATUS_R} //Right-side status icon
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_HEALTH_VR} //Health bar but transparent at 100
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_BACKUP} //Backup implant status
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_VANTAG} //Vore Antags
. += new /atom/movable/screen/plane_master{plane = PLANE_CH_STOMACH} //Stomachs
. += new /atom/movable/screen/plane_master{plane = PLANE_AUGMENTED} //Augmented reality
. += new /atom/movable/screen/plane_master{plane = PLANE_SOULCATCHER} //Soulcatcher
//VOREStation Add End
/proc/CallAsync(datum/source, proctype, list/arguments)
set waitfor = FALSE