cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Statpanel + holder runtimes (#8098)

Browse Source
This commit is contained in:
Raeschen
2024-03-29 14:06:04 +01:00
committed by GitHub
parent b65504a25d
commit e96964a51d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/subsystems/statpanel_ch.dm
View File

@@ -50,7 +50,7 @@ SUBSYSTEM_DEF(statpanels)
var/client/target = currentrun[length(currentrun)] var/client/target = currentrun[length(currentrun)]
currentrun.len-- currentrun.len--
if(!target.stat_panel.is_ready()) if(!target?.stat_panel?.is_ready()) // Null target client, client has null stat panel, or stat panel isn't ready
continue continue
if(target.stat_tab == "Status" && num_fires % status_wait == 0) if(target.stat_tab == "Status" && num_fires % status_wait == 0)
@@ -393,6 +393,9 @@ SUBSYSTEM_DEF(statpanels)
for(index in 1 to length(to_make)) for(index in 1 to length(to_make))
var/atom/thing = to_make[index] var/atom/thing = to_make[index]
if(!thing) // A null thing snuck in somehow
continue
var/generated_string var/generated_string
if(ismob(thing) || length(thing.overlays) > 0) if(ismob(thing) || length(thing.overlays) > 0)
var/force_south = FALSE var/force_south = FALSE

2
code/modules/clothing/head/misc_special.dm
View File

@@ -137,7 +137,7 @@
var/turf/location = src.loc var/turf/location = src.loc
if(istype(location, /mob/)) if(istype(location, /mob/))
var/mob/living/carbon/human/M = location var/mob/living/carbon/human/M = location
if(istype(M) && M.item_is_in_hands(src) || M.head == src) //CHOMPEdit if(ishuman(M) && (M.item_is_in_hands(src) || M.head == src)) //CHOMPEdit
location = M.loc location = M.loc
if (istype(location, /turf)) if (istype(location, /turf))

2
code/modules/mob/holder.dm
View File

@@ -64,7 +64,7 @@ var/list/holder_mob_icon_cache = list()
location = "[H.loc.loc]'s [H.loc]" location = "[H.loc.loc]'s [H.loc]"
else else
location = "[H.loc]" location = "[H.loc]"
if (location != "" && statpanel("Status")) if (location != "")
. += "" . += ""
. += "Location: [location]" . += "Location: [location]"
//CHOMPEdit End //CHOMPEdit End