cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing compile errors (#9)

Browse Source
This commit is contained in:
Werner
2016-11-18 18:03:27 +02:00
committed by skull132
parent effb9ececf
commit 3e92d63ddf
15 changed files with 311 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/stunbaton.dm
+10 -4
View File
@@ -108,6 +108,12 @@
return ..()
/obj/item/weapon/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
if(status && (CLUMSY in user.mutations) && prob(50))
user << "span class='danger'>You accidentally hit yourself with the [src]!</span>"
user.Weaken(30)
deductcharge(hitcost)
return
if(isrobot(target))
return ..()
@@ -141,11 +147,11 @@
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
//stun effects
L.stun_effect_act(stun, agony, target_zone, src)
target.stun_effect_act(stun, agony, hit_zone, src)
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
msg_admin_attack("[key_name(user)] stunned [key_name(L)] with the [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
if(status)
deductcharge(hitcost)
@@ -183,7 +189,7 @@
attack_verb = list("poked")
slot_flags = null
baton_color = "#FFDF00"
/obj/item/weapon/melee/baton/stunrod
name = "stunrod"
desc = "A more-than-lethal weapon used to deal with high threat situations."