From 2d9eb62e0e035242dfa7dbc2f0a74870a93270da Mon Sep 17 00:00:00 2001 From: Arturlang <24881678+Arturlang@users.noreply.github.com> Date: Sat, 22 Mar 2025 19:37:15 +0200 Subject: [PATCH] patches a blooddrinking holodeck exploit (#3345) ## About The Pull Request patches a blooddrinking holodeck exploit from holodeck stuff ## Why It's Good For The Game holograms having blood is weird ## Proof Of Testing tested ## Changelog :cl: fix: Hologram mobs no longer have blood /:cl: --------- Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> --- code/modules/holodeck/holo_effect.dm | 1 + .../code/modules/antagonists/bloodsucker/powers/feed.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index caa5b425ca4..5bc714fb953 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -65,6 +65,7 @@ // these vars are not really standardized but all would theoretically create stuff on death our_mob.add_traits(list(TRAIT_PERMANENTLY_MORTAL, TRAIT_NO_BLOOD_OVERLAY, TRAIT_NOBLOOD, TRAIT_NOHUNGER), INNATE_TRAIT) + ADD_TRAIT(our_mob, TRAIT_NOBLOOD, INNATE_TRAIT) // BUBBER ADDITION: bloodrinking exploit fix RegisterSignal(our_mob, COMSIG_QDELETING, PROC_REF(handle_mob_delete)) return our_mob diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm index 2e3d992dfd8..2fb642481ea 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm @@ -301,7 +301,7 @@ return FALSE var/mob/living/carbon/human/target_user = target - if(!(target_user.dna?.species) || !(target_user.mob_biotypes & MOB_ORGANIC)) + if(!(target_user.dna?.species) || !(target_user.mob_biotypes & MOB_ORGANIC) || HAS_TRAIT(target_user, TRAIT_NOBLOOD)) if(give_warnings) owner.balloon_alert(owner, "no blood!") return FALSE