cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Flyswatter now uses a typecache instead of hardcoded types. Badmins can now make other sorts of swatters with varedits.

Browse Source
This commit is contained in:
Mike Long
2016-07-15 22:53:22 -04:00
parent 33d92a6a87
commit 0df823dafa
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/weaponry.dm
+16 -7
View File
@@ -326,15 +326,24 @@
attack_verb = list("swatted", "smacked")
hitsound = 'sound/effects/snap.ogg'
w_class = 2
//Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
var/list/strong_against
/obj/item/weapon/melee/flyswatter/New()
strong_against = typecacheof(list(
/mob/living/simple_animal/hostile/poison/bees/,
/mob/living/simple_animal/butterfly,
/mob/living/simple_animal/cockroach,
/obj/item/queen_bee/
))
/obj/item/weapon/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
if(istype(target, /mob/living/simple_animal/hostile/poison/bees/) || istype(target, /mob/living/simple_animal/butterfly) || istype(target, /mob/living/simple_animal/cockroach))
var/mob/living/simple_animal/bug = target
new /obj/effect/decal/cleanable/deadcockroach(get_turf(bug))
bug.death(1)
user << "<span class='warning'>You easily splat the [bug].</span>"
else if(istype(target, /obj/item/queen_bee/))
qdel(target)
if(is_type_in_typecache(target, strong_against))
new /obj/effect/decal/cleanable/deadcockroach(get_turf(target))
user << "<span class='warning'>You easily splat the [target].</span>"
if(istype(target, /mob/living/))
var/mob/living/bug = target
bug.death(1)
else
qdel(target)