cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 12:17:40 +01: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-22 01:04:35 +02:00
committed by GitHub
co-authored by Kashargul
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
code/modules/client/client defines.dm
+1 -1
View File
@@ -102,7 +102,7 @@
preload_rsc = PRELOAD_RSC
var/global/obj/screen/click_catcher/void
var/global/atom/movable/screen/click_catcher/void
control_freak = 0 //CHOMPedit KSC 1/30/20 - This enables all clientside options for Players.
// List of all asset filenames sent to this client by the asset cache, along with their assoicated md5s
code/modules/client/preferences.dm
+5 -5
View File
@@ -55,7 +55,7 @@ var/list/preferences_datums = list()
var/antag_vis = "Hidden" //How visible antag association is to others.
//Mob preview
var/list/char_render_holders //Should only be a key-value list of north/south/east/west = obj/screen.
var/list/char_render_holders //Should only be a key-value list of north/south/east/west = atom/movable/screen.
var/static/list/preview_screen_locs = list(
"1" = "character_preview_map:2,7",
"2" = "character_preview_map:2,5",
@@ -196,14 +196,14 @@ var/list/preferences_datums = list()
if(!client)
return
var/obj/screen/setup_preview/pm_helper/PMH = LAZYACCESS(char_render_holders, "PMH")
var/atom/movable/screen/setup_preview/pm_helper/PMH = LAZYACCESS(char_render_holders, "PMH")
if(!PMH)
PMH = new
LAZYSET(char_render_holders, "PMH", PMH)
client.screen |= PMH
PMH.screen_loc = preview_screen_locs["PMH"]
var/obj/screen/setup_preview/bg/BG = LAZYACCESS(char_render_holders, "BG")
var/atom/movable/screen/setup_preview/bg/BG = LAZYACCESS(char_render_holders, "BG")
if(!BG)
BG = new
BG.plane = TURF_PLANE
@@ -215,7 +215,7 @@ var/list/preferences_datums = list()
BG.screen_loc = preview_screen_locs["BG"]
for(var/D in GLOB.cardinal)
var/obj/screen/setup_preview/O = LAZYACCESS(char_render_holders, "[D]")
var/atom/movable/screen/setup_preview/O = LAZYACCESS(char_render_holders, "[D]")
if(!O)
O = new
O.pref = src
@@ -236,7 +236,7 @@ var/list/preferences_datums = list()
/datum/preferences/proc/clear_character_previews()
for(var/index in char_render_holders)
var/obj/screen/S = char_render_holders[index]
var/atom/movable/screen/S = char_render_holders[index]
client?.screen -= S
qdel(S)
char_render_holders = null
code/modules/client/preferences_tgui.dm
+1 -1
View File
@@ -189,7 +189,7 @@
/datum/preferences/proc/jiggle_map()
// Fix for weird byond bug, jiggles the map around a little
var/obj/screen/setup_preview/pm_helper/PMH = LAZYACCESS(char_render_holders, "PMH")
var/atom/movable/screen/setup_preview/pm_helper/PMH = LAZYACCESS(char_render_holders, "PMH")
sleep(0.1 SECONDS)
PMH.screen_loc = LAZYACCESS(preview_screen_locs, "PMHjiggle")
sleep(0.1 SECONDS)