Skip to content

Commit

Permalink
Xeno RR Nerfs: no more vore, no more gibs
Browse files Browse the repository at this point in the history
fucks sakes tg
  • Loading branch information
CliffracerX committed Oct 17, 2024
1 parent 4b23327 commit 36ac833
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
7 changes: 5 additions & 2 deletions code/modules/mob/living/carbon/alien/adult/adult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
15 changes: 9 additions & 6 deletions code/modules/mob/living/carbon/alien/special/alien_embryo.dm
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)
owner.cut_overlay(overlay)
/// DOPPLER SHIFT EDIT END
qdel(src)


Expand Down

0 comments on commit 36ac833

Please sign in to comment.