Skip to content

Commit

Permalink
devour lad is now left alone
Browse files Browse the repository at this point in the history
  • Loading branch information
CliffracerX committed Oct 17, 2024
1 parent 36ac833 commit 8fdec03
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
21 changes: 11 additions & 10 deletions code/modules/mob/living/carbon/alien/adult/adult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions code/modules/mob/living/carbon/alien/organs.dm
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

0 comments on commit 8fdec03

Please sign in to comment.