cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 20:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14065 from Heroman3003/prom-glow-fix

Browse Source 
Fixes prommie glow
This commit is contained in:
Casey
2022-11-13 20:48:04 +00:00
committed by CHOMPStation2
parent 8c16cf9e16
commit 9ccc5174fb
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+2
View File
@@ -291,11 +291,13 @@
var/obj/item/organ/internal/I = null //Used for further down below when an organ is picked.
if(!radiation)
if(species.appearance_flags & RADIATION_GLOWS)
glow_override = FALSE
set_light(0)
if(accumulated_rads)
accumulated_rads -= RADIATION_SPEED_COEFFICIENT //Accumulated rads slowly dissipate very slowly. Get to medical to get it treated!
else if(((life_tick % 5 == 0) && radiation) || (radiation > 600)) //Radiation is a slow, insidious killer. Unless you get a massive dose, then the onset is sudden!
if(species.appearance_flags & RADIATION_GLOWS)
glow_override = TRUE
set_light(max(1,min(5,radiation/15)), max(1,min(10,radiation/25)), species.get_flesh_colour(src))
// END DOGSHIT SNOWFLAKE
code/modules/mob/living/life.dm
+3
View File
@@ -238,6 +238,9 @@
return
/mob/living/proc/handle_light()
if(glow_override)
return FALSE
if(instability >= TECHNOMANCER_INSTABILITY_MIN_GLOW)
var/distance = round(sqrt(instability / 2))
if(distance)
code/modules/mob/living/living_defines.dm
+3 -2
View File
@@ -55,7 +55,8 @@
var/image/dsoverlay = null //Overlay used for darksight eye adjustments
var/glow_toggle = 0 // If they're glowing!
var/glow_toggle = FALSE // If they're glowing!
var/glow_override = FALSE // Ignore the manual toggle
var/glow_range = 2
var/glow_intensity = null
var/glow_color = "#FFFFFF" // The color they're glowing!
@@ -80,4 +81,4 @@
var/flying = 0 // Allows flight
var/inventory_panel_type = /datum/inventory_panel
var/datum/inventory_panel/inventory_panel
var/last_resist_time = 0 // world.time of the most recent resist that wasn't on cooldown.
var/last_resist_time = 0 // world.time of the most recent resist that wasn't on cooldown.