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] more 516 compat (#9914)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-01-20 01:29:59 -07:00
committed by GitHub
parent 7adbee0911
commit 5c1ab76e5d
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ZAS/Fire.dm
View File

@@ -176,6 +176,8 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
//reduce firelevel. //reduce firelevel.
if(enemy_tile.fire_protection > world.time-30) if(enemy_tile.fire_protection > world.time-30)
firelevel -= 1.5 firelevel -= 1.5
if(firelevel < 0)
firelevel = 0
continue continue
//Spread the fire. //Spread the fire.

2
code/game/machinery/camera/tracking.dm
View File

@@ -230,7 +230,7 @@
return TRACKING_TERMINATE return TRACKING_TERMINATE
var/turf/pos = get_turf(src) var/turf/pos = get_turf(src)
var/area/B = pos?.loc // No cam tracking in dorms! var/area/B = pos?.loc // No cam tracking in dorms!
if(InvalidPlayerTurf(pos) || B.flag_check(AREA_BLOCK_TRACKING)) if(InvalidPlayerTurf(pos) || B?.flag_check(AREA_BLOCK_TRACKING))
return TRACKING_TERMINATE return TRACKING_TERMINATE
if(invisibility >= INVISIBILITY_LEVEL_ONE) //cloaked if(invisibility >= INVISIBILITY_LEVEL_ONE) //cloaked
return TRACKING_TERMINATE return TRACKING_TERMINATE

2
code/game/machinery/computer/Operating.dm
View File

@@ -111,7 +111,7 @@
var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD)) var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
occupantData["bloodLevel"] = blood_volume occupantData["bloodLevel"] = blood_volume
occupantData["bloodMax"] = occupant.species.blood_volume occupantData["bloodMax"] = occupant.species.blood_volume
occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here occupantData["bloodPercent"] = occupant.species.blood_volume ? round(100*(blood_volume/occupant.species.blood_volume), 0.01) : 0 //copy pasta ends here, some species have no blood volume
occupantData["bloodType"] = occupant.dna.b_type occupantData["bloodType"] = occupant.dna.b_type
occupantData["surgery"] = build_surgery_list(user) occupantData["surgery"] = build_surgery_list(user)

2
code/game/objects/structures/janicart.dm
View File

@@ -484,6 +484,8 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
L.pixel_x = -13 L.pixel_x = -13
L.pixel_y = 7 L.pixel_y = 7
/obj/structure/bed/chair/janicart/update_icon()
return
/obj/structure/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj) /obj/structure/bed/chair/janicart/bullet_act(var/obj/item/projectile/Proj)
if(has_buckled_mobs()) if(has_buckled_mobs())

7
code/modules/admin/verbs/debug.dm
View File

@@ -239,15 +239,16 @@
dellog += "</ol>" dellog += "</ol>"
usr << browse(dellog.Join(), "window=dellog") usr << browse("<html>[dellog.Join()]</html>", "window=dellog")
/client/proc/cmd_display_init_log() /client/proc/cmd_display_init_log()
set category = "Debug.Investigate" set category = "Debug.Investigate"
set name = "Display Initialize() Log" set name = "Display Initialize() Log"
set desc = "Displays a list of things that didn't handle Initialize() properly" set desc = "Displays a list of things that didn't handle Initialize() properly"
if(!check_rights(R_DEBUG)) return if(!check_rights(R_DEBUG))
src << browse(replacetext(SSatoms.InitLog(), "\n", "<br>"), "window=initlog") return
src << browse("<html>[replacetext(SSatoms.InitLog(), "\n", "<br>")]</html>", "window=initlog")
/* /*
/client/proc/cmd_display_overlay_log() /client/proc/cmd_display_overlay_log()

8
code/modules/pda/pda.dm
View File

@@ -498,12 +498,10 @@ var/global/list/obj/item/pda/PDAs = list()
/obj/item/pda/Destroy() /obj/item/pda/Destroy()
PDAs -= src PDAs -= src
if(id.loc != src) if (id && !delete_id && id.loc == src)
id = null id.forceMove(get_turf(loc))
if (src.id && !delete_id)
src.id.forceMove(get_turf(src.loc))
else else
QDEL_NULL(src.id) QDEL_NULL(id)
current_app = null current_app = null
scanmode = null scanmode = null

6
code/modules/pda/utilities.dm
View File

@@ -50,9 +50,9 @@
user.show_message(span_notice("Analyzing Results for [C]:")) user.show_message(span_notice("Analyzing Results for [C]:"))
user.show_message(span_notice(" Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]"), 1) user.show_message(span_notice(" Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]"), 1)
user.show_message(span_notice(" Damage Specifics:") + " [(C.getOxyLoss() > 50) ? span_warning(C.getOxyLoss()) : C.getOxyLoss()]-\ user.show_message(span_notice(" Damage Specifics:") + " [(C.getOxyLoss() > 50) ? span_warning(C.getOxyLoss()) : C.getOxyLoss()]-\
[(C.getToxLoss() > 50) ? span_warning(C.getToxLoss()) : C.getToxLoss()]-\ [(C.getToxLoss() > 50) ? span_warning("[C.getToxLoss()]") : C.getToxLoss()]-\
[(C.getFireLoss() > 50) ? span_warning(C.getFireLoss()) : C.getFireLoss()]-\ [(C.getFireLoss() > 50) ? span_warning("[C.getFireLoss()]") : C.getFireLoss()]-\
[(C.getBruteLoss() > 50) ? span_warning(C.getBruteLoss()) : C.getBruteLoss()]", 1) [(C.getBruteLoss() > 50) ? span_warning("[C.getBruteLoss()]") : C.getBruteLoss()]", 1)
user.show_message(span_notice(" Key: Suffocation/Toxin/Burns/Brute"), 1) user.show_message(span_notice(" Key: Suffocation/Toxin/Burns/Brute"), 1)
user.show_message(span_notice(" Body Temperature: [C.bodytemperature-T0C]&deg;C ([C.bodytemperature*1.8-459.67]&deg;F)"), 1) user.show_message(span_notice(" Body Temperature: [C.bodytemperature-T0C]&deg;C ([C.bodytemperature*1.8-459.67]&deg;F)"), 1)
if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH))) if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH)))