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

Planes Framework (#4545)

Browse Source 
* Polaris initial plane upstream merge

* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT

* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.

* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking

Setting stuff like colorblindness variety and things.

* Remove NIF reference, fix lighting layer define

* Handle effects above lighting plane

* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE

* Merge: 3000% human/update_icons() speed improvement

* Merge: Avoid ghosts pointing at things
This commit is contained in:
Arokha Sieyes
2018-01-17 13:45:54 -06:00
committed by Anewbe
parent b2624f5a2e
commit f2fef6f410
86 changed files with 874 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/blood.dm
+4 -4
View File
@@ -93,11 +93,11 @@ var/const/CE_STABLE_THRESHOLD = 0.5
if(blood_volume >= BLOOD_VOLUME_SAFE)
if(pale)
pale = 0
update_body()
update_icons_body()
else if(blood_volume >= BLOOD_VOLUME_OKAY)
if(!pale)
pale = 1
update_body()
update_icons_body()
var/word = pick("dizzy","woosey","faint")
src << "<font color='red'>You feel [word]</font>"
if(prob(1))
@@ -108,7 +108,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
else if(blood_volume >= BLOOD_VOLUME_BAD)
if(!pale)
pale = 1
update_body()
update_icons_body()
eye_blurry = max(eye_blurry,6)
if(getOxyLoss() < 50 * threshold_coef)
adjustOxyLoss(10 * dmg_coef)
@@ -126,7 +126,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
else //Not enough blood to survive (usually)
if(!pale)
pale = 1
update_body()
update_icons_body()
eye_blurry = max(eye_blurry,6)
Paralyse(3)
adjustToxLoss(3 * dmg_coef)
code/modules/organs/organ_external.dm
+4 -4
View File
@@ -673,7 +673,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if (!(status & ORGAN_DEAD))
status |= ORGAN_DEAD
owner << "<span class='notice'>You can't feel your [name] anymore...</span>"
owner.update_body(1)
owner.update_icons_body()
for (var/obj/item/organ/external/child in children)
child.germ_level += 110 //Burst of infection from a parent organ becoming necrotic
@@ -1110,11 +1110,11 @@ Note that amputating the affected organ does in fact remove the infection from t
if(src.robotic >= ORGAN_ROBOT)
return
src.status |= ORGAN_MUTATED
if(owner) owner.update_body()
if(owner) owner.update_icons_body()
/obj/item/organ/external/proc/unmutate()
src.status &= ~ORGAN_MUTATED
if(owner) owner.update_body()
if(owner) owner.update_icons_body()
/obj/item/organ/external/proc/get_damage() //returns total damage
return (brute_dam+burn_dam) //could use max_damage?
@@ -1201,7 +1201,7 @@ Note that amputating the affected organ does in fact remove the infection from t
qdel(spark_system)
qdel(src)
victim.update_body()
victim.update_icons_body()
/obj/item/organ/external/proc/disfigure(var/type = "brute")
if (disfigured)