From 36ac833590c071ab10c54e5dcaf9183926ace318 Mon Sep 17 00:00:00 2001 From: CliffracerX Date: Wed, 16 Oct 2024 21:27:49 -0400 Subject: [PATCH 1/2] Xeno RR Nerfs: no more vore, no more gibs fucks sakes tg --- .../mob/living/carbon/alien/adult/adult.dm | 7 +++++-- .../living/carbon/alien/special/alien_embryo.dm | 15 +++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index ce95c0e6ce5a7..dd790fc4b953b 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -112,7 +112,8 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( /// The mob needs to be consumable, as decided by [/mob/living/carbon/alien/adult/proc/can_consume] /// Returns FALSE if the attempt never even started, TRUE otherwise /mob/living/carbon/alien/adult/proc/devour_lad(atom/movable/candidate, devour_time = 13.5 SECONDS) - setDir(get_dir(src, candidate)) + /// DOPPLER SHIFT REMOVAL BEGIN + /*setDir(get_dir(src, candidate)) if(!can_consume(candidate)) return FALSE var/mob/living/lucky_winner = candidate @@ -138,7 +139,9 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( span_userdanger("[lucky_winner] devours you!")) log_combat(src, lucky_winner, "devoured") melting_pot.consume_thing(lucky_winner) - return TRUE + return TRUE*/ + /// DOPPLER SHIFT REMOVAL END + return FALSE /mob/living/carbon/alien/adult/get_butt_sprite() return icon('icons/mob/butts.dmi', BUTT_SPRITE_XENOMORPH) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index f4b0fffb7a085..377370d2f6f7b 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -134,15 +134,18 @@ new_xeno.remove_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_IMMOBILIZED, TRAIT_NO_TRANSFORM), type) new_xeno.RemoveInvisibility(type) - if(gib_on_success) + /// DOPPLER SHIFT REMOVAL BEGIN + /*if(gib_on_success) new_xeno.visible_message(span_danger("[new_xeno] bursts out of [owner] in a shower of gore!"), span_userdanger("You exit [owner], your previous host."), span_hear("You hear organic matter ripping and tearing!")) owner.investigate_log("has been gibbed by an alien larva.", INVESTIGATE_DEATHS) owner.gib(DROP_ORGANS|DROP_BODYPARTS) - else - new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_userdanger("You exit [owner], your previous host.")) - owner.log_message("had an alien larva within them escape (without being gibbed).", LOG_ATTACK, log_globally = FALSE) - owner.adjustBruteLoss(40) - owner.cut_overlay(overlay) + else*/ + /// DOPPLER SHIFT REMOVAL END, EDIT BEGIN (REMOVING INDENTS) + new_xeno.visible_message(span_danger("[new_xeno] wriggles out of [owner]!"), span_userdanger("You exit [owner], your previous host.")) + owner.log_message("had an alien larva within them escape (without being gibbed).", LOG_ATTACK, log_globally = FALSE) + owner.adjustBruteLoss(40) + owner.cut_overlay(overlay) + /// DOPPLER SHIFT EDIT END qdel(src) From 8fdec0306ede20564de299fc52d2ad01f38353e9 Mon Sep 17 00:00:00 2001 From: CliffracerX Date: Thu, 17 Oct 2024 14:07:23 -0400 Subject: [PATCH 2/2] devour lad is now left alone --- .../mob/living/carbon/alien/adult/adult.dm | 21 ++++++++++--------- .../modules/mob/living/carbon/alien/organs.dm | 6 ++++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index dd790fc4b953b..f56a79e026ce4 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -94,26 +94,29 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( ADD_TRAIT(pulling, TRAIT_FLOORED, CHOKEHOLD_TRAIT) /mob/living/carbon/alien/adult/mouse_drop_receive(atom/dropping, mob/user, params) - if(devour_lad(dropping)) - return + /// DOPPLER SHIFT REMOVAL BEGN + /*if(devour_lad(dropping)) + return*/ + /// DOPPLER SHIFT REMOVAL END return ..() /// Returns FALSE if we're not allowed to eat it, true otherwise /mob/living/carbon/alien/adult/proc/can_consume(atom/movable/poor_soul) - if(!isliving(poor_soul) || pulling != poor_soul) + /// DOPPLER SHIFT REMOVAL BEGIN + /*if(!isliving(poor_soul) || pulling != poor_soul) return FALSE if(incapacitated || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS) return FALSE if(get_dir(src, poor_soul) != dir) // Gotta face em 4head - return FALSE - return TRUE + return FALSE*/ + /// DOPPLER SHIFT REMOVAL END + return FALSE /// DOPPLER SHIFT EDIT: NEVER ALLOW THIS, NOT EVEN WITH ADMINBUS. /// Attempts to devour the passed in thing in devour_time seconds /// The mob needs to be consumable, as decided by [/mob/living/carbon/alien/adult/proc/can_consume] /// Returns FALSE if the attempt never even started, TRUE otherwise /mob/living/carbon/alien/adult/proc/devour_lad(atom/movable/candidate, devour_time = 13.5 SECONDS) - /// DOPPLER SHIFT REMOVAL BEGIN - /*setDir(get_dir(src, candidate)) + setDir(get_dir(src, candidate)) if(!can_consume(candidate)) return FALSE var/mob/living/lucky_winner = candidate @@ -139,9 +142,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( span_userdanger("[lucky_winner] devours you!")) log_combat(src, lucky_winner, "devoured") melting_pot.consume_thing(lucky_winner) - return TRUE*/ - /// DOPPLER SHIFT REMOVAL END - return FALSE + return TRUE /mob/living/carbon/alien/adult/get_butt_sprite() return icon('icons/mob/butts.dmi', BUTT_SPRITE_XENOMORPH) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index ac9fd81cf976b..90b617a969388 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -199,12 +199,14 @@ thing.acid_act(75, 10) /obj/item/organ/internal/stomach/alien/proc/consume_thing(atom/movable/thing) - RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(content_moved)) + /// DOPPLER SHIFT REMOVAL BEGIN - we take no chances. + /*RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(content_moved)) RegisterSignal(thing, COMSIG_QDELETING, PROC_REF(content_deleted)) if(isliving(thing)) RegisterSignal(thing, COMSIG_LIVING_DEATH, PROC_REF(content_died)) stomach_contents += thing - thing.forceMove(owner || src) // We assert that if we have no owner, we will not be nullspaced + thing.forceMove(owner || src)*/ // We assert that if we have no owner, we will not be nullspaced + /// DOPPLER SHIFT REMOVAL BEGIN /obj/item/organ/internal/stomach/alien/proc/content_died(atom/movable/source) SIGNAL_HANDLER