Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NONMODULAR] Xenomorph RR Nerfs #171

Closed
wants to merge 2 commits into from
Closed

[NONMODULAR] Xenomorph RR Nerfs #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36ac833
Xeno RR Nerfs: no more vore, no more gibs
CliffracerX Oct 17, 2024
8fdec03
devour lad is now left alone
CliffracerX Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions code/modules/mob/living/carbon/alien/adult/adult.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,19 +94,23 @@ 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.
Copy link

@tf-4 tf-4 Oct 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no reason to do this, and even if there were this is still a poor implementation


/// 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]
Expand Down
6 changes: 4 additions & 2 deletions code/modules/mob/living/carbon/alien/organs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 9 additions & 6 deletions code/modules/mob/living/carbon/alien/special/alien_embryo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be something more impactful if the gibbing is removed

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Open to suggestions on this. Ripping out organs and a major bleed wound?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they should probably die and drop organs or something maybe

owner.cut_overlay(overlay)
/// DOPPLER SHIFT EDIT END
qdel(src)


Expand Down
Loading