cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3741 from AsV9/electricityman

Browse Source 
Ethereals are now charged up slightly when stunned by batons.
This commit is contained in:
nichlas0010
2018-12-04 18:57:09 +01:00
committed by GitHub
parent 3ae06b8af1 7a760d703c
commit 3c1066233d
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/stunbaton.dm
View File

@@ -118,7 +118,13 @@
user.Paralyze(stunforce*3)
deductcharge(hitcost)
return
//yogs edit begin ---------------------------------
if(status && isethereal(M))
var/mob/living/carbon/human/H = M
var/datum/species/ethereal/E = H.dna?.species
E.adjust_charge(20) //equivalent to hitting a lightbulb 4 times
to_chat(M,"<span class='notice'>You receive some charge from [src].</span>")
//yogs edit end ----------------------------------
if(iscyborg(M))
..()
return

8
code/modules/projectiles/projectile/energy/stun.dm
View File

@@ -24,6 +24,14 @@
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
else if((C.status_flags & CANKNOCKDOWN) && !C.has_trait(TRAIT_STUNIMMUNE))
addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, jitter), 5)
//yogstation edit begin -------------------------------------------
if(ishuman(C))
var/mob/living/carbon/human/H = C
if(isethereal(H))
var/datum/species/ethereal/E = H.dna?.species
E.adjust_charge(20)
to_chat(C,"<span class='notice'>You receive some charge from [src].</span>")
//yogstation edit end ---------------------------------------------
/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
do_sparks(1, TRUE, src)