Skip to content

Simple Mob Stuns #875

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

Draft
FartMaster69420 wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −0
Draft

Simple Mob Stuns #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions code/modules/mob/living/simple_mob/simple_mob_vr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@

var/nom_mob = FALSE //If a mob is meant to be hostile for vore purposes but is otherwise not hostile, if true makes certain AI ignore the mob

// RS Edit Start, stuns
var/xeno_stuns = TRUE // Can xenotasers stun this mob? NOTE: This is not for slimes, they have their own code for taser hits. This is for other mobs.
var/taser_hits = 0 // How many times hit?
var/last_stun = 0 // When was the last hit?
// RS Edit End

// Release belly contents before being gc'd!
/mob/living/simple_mob/Destroy()
release_vore_contents()
Expand Down
13 changes: 13 additions & 0 deletions code/modules/xenobio/items/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,20 @@ VORESTATION REMOVAL
S.slimebatoned(firer, round(agony/2))
else
L.Weaken(round(agony/2))
else if(istype(target, /mob/living/simple_mob/)) // RS Edit start, stuns for the xenotaser.
var/mob/living/simple_mob/T = target
var/timediff = world.time - T.last_stun
var/hits_to_stun = T.health / 20
if (T.xeno_stuns)
if(timediff > 15)
T.taser_hits = 1
else
T.taser_hits += 1

if(T.taser_hits >= hits_to_stun)
T.taser_hits = 0
T.Weaken(round(rand(agony * 5, agony * 10)))
T.last_stun = world.time // RS Edit End
if(ishuman(L))
var/mob/living/carbon/human/H = L
if(H.species && H.species.name == SPECIES_PROMETHEAN)
Expand Down