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

Shadekin and Xenochimera variable refactor (#17651)

Browse Source 
* gets rid of xenochimera brain var

* whoops

* shadekin too

ye https://i.imgur.com/lNI2AiG.png

* organize

* simplekin too

* yuh

* Refactors xenochimera

progress:
https://i.imgur.com/ssQbRKS.png
https://i.imgur.com/ySBxm0M.png
https://i.imgur.com/3FWPVuP.png

* Update xenochimera.dm

* Update examine_vr.dm

* Update xenochimera.dm

* Update xenochimera.dm
This commit is contained in:
Cameron Lennox
2025-05-12 21:44:25 +02:00
committed by GitHub
parent 77ce94cd2d
commit 2b0853887b
28 changed files with 806 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagents/food_drinks_vr.dm
+15 -12
View File
@@ -101,10 +101,11 @@
M.adjust_nutrition(alt_nutriment_factor * removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (H.feral <=0) //check if they're unferalled
H.feral = 0
var/datum/component/xenochimera/xc = M.get_xenochimera_component()
if(xc && xc.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
xc.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (xc.feral <=0) //check if they're unferalled
xc.feral = 0
to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return."))
log_and_message_admins("is no longer feral.", H)
@@ -466,10 +467,11 @@
M.nutrition += (alt_nutriment_factor * removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) // same check as feral triggers to stop them immediately re-feralling
H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (H.feral <=0) //check if they're unferalled
H.feral = 0
var/datum/component/xenochimera/xc = M.get_xenochimera_component()
if(xc && xc.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) // same check as feral triggers to stop them immediately re-feralling
xc.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (xc.feral <=0) //check if they're unferalled
xc.feral = 0
to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return."))
log_and_message_admins("is no longer feral.", H)
@@ -555,10 +557,11 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
H.feral -= removed * 3 //Should calm them down quick, provided they're actually in a state to STAY calm.
if(H.feral <=0) //Check if they're unferalled
H.feral = 0
var/datum/component/xenochimera/xc = M.get_xenochimera_component()
if(xc && xc.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
xc.feral -= removed * 3 //Should calm them down quick, provided they're actually in a state to STAY calm.
if(xc.feral <=0) //Check if they're unferalled
xc.feral = 0
to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return."))
log_and_message_admins("is no longer feral.", H)