cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mime drink consistency (#26635)

Browse Source 
* Makes Mime and Clown drinks heal IPC Clowns and Mimes too.

Previously, the four Clown and Mime drinks (Banana Juice, Banana HONK, Nothing, and Silencer) only healed organics. This commit should allow said drinks to heal IPCs too.

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

* Pasted wrong code.

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

* Apply suggestions from code review to remove unnecessary code and to pass CI checks.

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Ensures robotic limbs are healed, also pass CI.

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

* Previous commit broke something.

Going to try CRUNCH's suggested changes.

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

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Should pass CI this time.

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

* Put living back in.

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

* Makes Mime Drinks consistent.

Changes Silencer to use the same check as nothing for the special effect.

---------

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
This commit is contained in:
WenlockTheBritishHobo
2024-09-10 00:49:23 +01:00
committed by GitHub
parent 9e6cf97ebf
commit 6257b9a54e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+1 -1
View File
@@ -429,7 +429,7 @@
/datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/carbon/human/M)
var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && (M.job in list("Mime")))
if(ishuman(M) && M.mind && M.mind.miming)
update_flags |= M.adjustBruteLoss(-1, FALSE, robotic = TRUE)
update_flags |= M.adjustFireLoss(-1, FALSE, robotic = TRUE)
return ..() | update_flags