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

Jump to bottom

MP gaming #4698

Closed
wants to merge 1 commit into from
Closed

MP gaming #4698

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
15 changes: 11 additions & 4 deletions code/modules/projectiles/ammo_datums.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2274,10 +2274,17 @@
shell_speed = AMMO_SPEED_TIER_1 // Slightly faster
hit_effect_color = "#FFFF00"

/datum/ammo/energy/taser/on_hit_mob(mob/M, obj/projectile/P)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.disable_special_items() // Disables scout cloak
/datum/ammo/energy/taser/on_hit_mob(mob/morbius, obj/projectile/P)
Copy link
Contributor

Choose a reason for hiding this comment

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

This new var name is not better. Change both of them

if(ishuman(morbius))
var/mob/living/carbon/human/humanus = morbius
humanus.disable_special_items() // Disables scout cloak
if(!isyautja(humanus) && !issynth(humanus))
humanus.make_jittery(40)

if(isxeno(morbius))
var/mob/living/carbon/xenomorph/xenoids = morbius
xenoids.apply_effect(2, SLOW)
xenoids.xeno_jitter(1 SECONDS)

/datum/ammo/energy/taser/precise
name = "precise taser bolt"
Expand Down
Loading