cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better Client Colors and Drugs (#9102)

Browse Source 
The druggy overlay has been upgraded.

Ports NebulaSS13/Nebula#619
Also ports CrimsonShrike's colour multiplication code which allows client colours to affect eachother.
This commit is contained in:
Geeves
2020-06-20 11:33:42 +03:00
committed by GitHub
parent 14e48172bd
commit a074b7e224
6 changed files with 87 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/life.dm
+5 -1
View File
@@ -225,8 +225,12 @@
if (eye_blurry)
client.screen += global_hud.blurry
if (druggy)
if(druggy)
client.screen += global_hud.druggy
if(druggy > 5)
add_client_color(/datum/client_color/oversaturated)
else
remove_client_color(/datum/client_color/oversaturated)
if (stat != 2)
if (machine)
code/modules/mob/living/carbon/human/species/species.dm
+9 -2
View File
@@ -494,8 +494,15 @@
H.client.screen += global_hud.darkMask
else if((!H.equipment_prescription && (H.disabilities & NEARSIGHTED)) || H.equipment_tint_total == TINT_MODERATE)
H.client.screen += global_hud.vimpaired
if(H.eye_blurry) H.client.screen += global_hud.blurry
if(H.druggy) H.client.screen += global_hud.druggy
if(H.eye_blurry)
H.client.screen += global_hud.blurry
if(H.druggy)
H.client.screen += global_hud.druggy
if(H.druggy > 5)
H.add_client_color(/datum/client_color/oversaturated)
else
H.remove_client_color(/datum/client_color/oversaturated)
for(var/overlay in H.equipment_overlays)
H.client.screen |= overlay
code/modules/mob/living/life.dm
+8 -3
View File
@@ -152,12 +152,17 @@
blind.invisibility = 0
else
blind.invisibility = 101
if (disabilities & NEARSIGHTED)
if(disabilities & NEARSIGHTED)
client.screen += global_hud.vimpaired
if (eye_blurry)
if(eye_blurry)
client.screen += global_hud.blurry
if (druggy)
if(druggy)
client.screen += global_hud.druggy
if(druggy > 5)
add_client_color(/datum/client_color/oversaturated)
else
remove_client_color(/datum/client_color/oversaturated)
if(machine)
var/viewflags = machine.check_eye(src)
if(viewflags < 0)