cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes IPC drinking jestosterone (#23517)

Browse Source 
* fix

* cleanup

* revert changes

* another cleanup

* reagents_holder runtime fix

* ci
This commit is contained in:
HelmsDeepState
2024-01-09 12:49:19 +00:00
committed by GitHub
parent 1077514713
commit bcceb23560
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/misc_reagents.dm
+5 -4
View File
@@ -465,12 +465,13 @@
else if(C.mind.assigned_role == "Mime")
to_chat(C, "<span class='warning'>You feel nauseous.</span>")
C.AdjustDizzy(volume STATUS_EFFECT_CONSTANT)
ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
C.AddElement(/datum/element/waddling)
else
to_chat(C, "<span class='warning'>Something doesn't feel right...</span>")
C.AdjustDizzy(volume STATUS_EFFECT_CONSTANT)
if(C.mind.assigned_role != "Clown")
ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
C.AddElement(/datum/element/waddling)
ADD_TRAIT(C, TRAIT_COMIC_SANS, id)
C.AddElement(/datum/element/waddling)
C.AddComponent(/datum/component/squeak, null, null, null, null, null, TRUE, falloff_exponent = 20)
/datum/reagent/jestosterone/on_mob_life(mob/living/carbon/M)
@@ -505,7 +506,7 @@
/datum/reagent/jestosterone/on_mob_delete(mob/living/M)
..()
if(M.mind.assigned_role != "Clown")
if(M.mind?.assigned_role != "Clown")
REMOVE_TRAIT(M, TRAIT_COMIC_SANS, id)
M.RemoveElement(/datum/element/waddling)
qdel(M.GetComponent(/datum/component/squeak))
code/modules/reagents/chemistry/reagents_holder.dm
+6 -1
View File
@@ -716,7 +716,12 @@
cached_reagents += R
R.holder = src
R.volume = amount
R.on_new(data)
if(ishuman(my_atom))
if(can_metabolize(my_atom, R))
R.on_new(data)
else
R.on_new(data)
if(data)
R.data = data