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

Life improvements: Part 1 (#13912)

Browse Source
This commit is contained in:
mikomyazaki
2022-05-18 14:22:43 +02:00
committed by GitHub
parent c854cd149c
commit dae76e0558
34 changed files with 109 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+4 -4
View File
@@ -104,13 +104,13 @@
if(alien == IS_VAURCA && H.species.has_organ[BP_FILTRATION_BIT])
metabolism = REM * 20 //vaurcae metabolise phoron faster than other species - good for them if their filter isn't broken.
var/obj/item/organ/vaurca/filtrationbit/F = H.internal_organs_by_name[BP_FILTRATION_BIT]
var/obj/item/organ/internal/vaurca/filtrationbit/F = H.internal_organs_by_name[BP_FILTRATION_BIT]
if(isnull(F))
..()
else if(F.is_broken())
..()
else if(H.species.has_organ[BP_PHORON_RESERVE])
var/obj/item/organ/vaurca/preserve/P = H.internal_organs_by_name[BP_PHORON_RESERVE]
var/obj/item/organ/internal/vaurca/preserve/P = H.internal_organs_by_name[BP_PHORON_RESERVE]
if(isnull(P))
return
else if(P.is_broken())
@@ -712,12 +712,12 @@
if(ishuman(M) && !berserked)
H.berserk_start()
berserked = TRUE
else if(ishuman(M) && berserked)
else if(ishuman(M) && berserked)
H.berserk_process()
M.add_chemical_effect(CE_BERSERK, 1)
if(M.a_intent != I_HURT)
M.a_intent_change(I_HURT)
/decl/reagent/toxin/spectrocybin/final_effect(mob/living/carbon/human/H, datum/reagents/holder)
. = ..()
if(istype(H) && H.chem_doses[type] >= get_overdose(H, holder = holder))