Skip to content

Commit

Permalink
Adds the ability for humans to shove xenos (cmss13-devs#7183)
Browse files Browse the repository at this point in the history
# About the pull request
humans can now shove xenos. more of a fluff feature than anything
serious.
lesser drones, facehuggers and larvae of ALLIED hives can be shoved down
with a 85% chance

# Explain why it's good for the game

disarm intent results in punching which is a lot more of an aggressive
response than the intent implies. this shoving stuff is mostly for use
with corrupted hives, as a more amicable way to get them to piss off in
lieu of delivering uppercuts.

the knockdown for the larva and stuff is just something that lets
marines have a gaffe at their expense, since their own hive can always
stun them i think marines should have the courtesy of being able to
bully them a little as well. could also function as a way to stop bad
behavior instead of just killing them on the spot

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

( my recording software is a bit glitchy so the sound cuts off :/ )


https://github.com/user-attachments/assets/3cc1bafb-5e1d-4fc9-93d3-aebfe6cd276c




</details>


# Changelog
:cl:
add: Marines can now (pathetically attempt to) shove xenos.
/:cl:
  • Loading branch information
VileBeggar authored Oct 6, 2024
1 parent 39b9d36 commit 7654631
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,21 @@

M.start_pulling(src)

else
if(INTENT_DISARM)
M.animation_attack_on(src)
M.flick_attack_overlay(src, "disarm")
//friendly lessers, huggers and larva can be pushed around
if(M.ally_of_hivenumber(hivenumber) && mob_size < MOB_SIZE_XENO_SMALL && prob(85))
playsound(loc, 'sound/weapons/alien_knockdown.ogg', 25, 1)
M.visible_message(SPAN_DANGER("[M] shoves [src]!"), null, null, 5, CHAT_TYPE_COMBAT_ACTION)
apply_effect(1, WEAKEN)
return

var/shove_sound = pick('sound/weapons/punchmiss.ogg', 'sound/weapons/thudswoosh.ogg')
playsound(loc, shove_sound, 25, 1, 7)
visible_message(SPAN_DANGER("[M] tries to shove [src]!"), null, null, 5, CHAT_TYPE_COMBAT_ACTION)

if(INTENT_HARM)
var/datum/unarmed_attack/attack = M.species.unarmed
if(!attack.is_usable(M)) attack = M.species.secondary_unarmed
if(!attack.is_usable(M))
Expand Down

0 comments on commit 7654631

Please sign in to comment.