cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

IPCs are affected by Jestosterone now (#26840)

Browse Source 
* Makes IPCs affected by Jestosterone

* Make Jestosterone affect human and IPCs

* human and carbon were the wrong way

* Hopefully this successfully checks for an organic

* Actually makes the check for Organic work

* Removed unneeded variable define

* Added some comments to make the code clearer

* Forgot a bit on a comment

* Stops Vox from taking damage that's for IPC

* Moves a comment one space

* Wrong variable for the pasted check

* Apply suggestions from code review

Removes a probably unneeded comment and moves another to the relevant line.

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

Checks for ability to take Toxin damage instead of organic-ness.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Suggested change failed check, temp change.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

Makes it check for ability to apply tox instead of synthetic-ness, is good.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

Removes likely unneeded comments.

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

---------

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
WenlockTheBritishHobo
2024-10-08 15:37:02 +00:00
committed by GitHub
co-authored by 1080pCat Contrabang
parent 9aa3ecb98b
commit 1eaae15237
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/misc_reagents.dm
+7 -3
View File
@@ -453,6 +453,7 @@
id = "jestosterone"
description = "Jestosterone is an odd chemical compound that induces a variety of annoying side-effects in the average person. It also causes mild intoxication, and is toxic to mimes."
color = "#ff00ff" //Fuchsia, pity we can't do rainbow here
process_flags = ORGANIC | SYNTHETIC
taste_description = "a funny flavour"
/datum/reagent/jestosterone/on_new()
@@ -475,14 +476,14 @@
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)
/datum/reagent/jestosterone/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
if(prob(10))
M.emote("giggle")
if(!M.mind)
return ..() | update_flags
if(M.mind.assigned_role == "Clown")
update_flags |= M.adjustBruteLoss(-1.5 * REAGENTS_EFFECT_MULTIPLIER) //Screw those pesky clown beatings!
update_flags |= M.adjustBruteLoss(-1.5 * REAGENTS_EFFECT_MULTIPLIER, robotic = TRUE) //Screw those pesky clown beatings!
else
M.AdjustDizzy(20 SECONDS, 0, 100 SECONDS)
M.Druggy(30 SECONDS)
@@ -502,7 +503,10 @@
"You feel like telling a pun.")
to_chat(M, "<span class='warning'>[pick(clown_message)]</span>")
if(M.mind.assigned_role == "Mime")
update_flags |= M.adjustToxLoss(1.5 * REAGENTS_EFFECT_MULTIPLIER)
if(M.dna.species.tox_mod <= 0) // If they can't take tox damage, make them take burn damage
update_flags |= M.adjustFireLoss(1.5 * REAGENTS_EFFECT_MULTIPLIER, robotic = TRUE)
else
update_flags |= M.adjustToxLoss(1.5 * REAGENTS_EFFECT_MULTIPLIER)
return ..() | update_flags
/datum/reagent/jestosterone/on_mob_delete(mob/living/M)