mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Fixing compile errors (#9)
This commit is contained in:
@@ -73,6 +73,8 @@
|
||||
// Works similarly to worn sprite_sheets, except the alternate sprites are used when the clothing/refit_for_species() proc is called.
|
||||
var/list/sprite_sheets_obj = list()
|
||||
|
||||
var/icon_override = null //Used to override hardcoded clothing dmis in human clothing pr
|
||||
|
||||
/obj/item/Destroy()
|
||||
if(ismob(loc))
|
||||
var/mob/m = loc
|
||||
@@ -110,7 +112,7 @@
|
||||
else
|
||||
return
|
||||
|
||||
/obj/item/verb/move_to_top()
|
||||
/obj/item/verb/move_to_top(obj/item/I in range(1))
|
||||
set name = "Move To Top"
|
||||
set category = "Object"
|
||||
|
||||
|
||||
@@ -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."
|
||||
|
||||
Reference in New Issue
Block a user