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

now young spiders get extra damage by fly swatter (#82010)

Browse Source 
## About The Pull Request

Closes https://github.com/tgstation/tgstation/issues/81981

## Why It's Good For The Game

Allows flyswatter to act as we would imagine. Takes 1 to 4 hits
depending on its type. Makes list static so we don't have to make it
every flyswatter.

## Changelog

🆑
fix: now young spiders get extra damage by fly swatter
/🆑

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
Bilbo367
2024-03-15 18:48:08 +00:00
committed by GitHub
co-authored by Jacquerel san7890
parent 2d780e34ed
commit 065d2b4184
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+16 -14
View File
@@ -791,26 +791,28 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
hitsound = 'sound/effects/snap.ogg'
w_class = WEIGHT_CLASS_SMALL
/// Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
var/list/splattable
var/static/list/splattable
/// Things in this list which take a lot more damage from the fly swatter, but not be necessarily killed by it.
var/list/strong_against
var/static/list/strong_against
/// How much extra damage the fly swatter does against mobs it is strong against
var/extra_strength_damage = 24
/obj/item/melee/flyswatter/Initialize(mapload)
. = ..()
splattable = typecacheof(list(
/mob/living/basic/ant,
/mob/living/basic/butterfly,
/mob/living/basic/cockroach,
/mob/living/basic/spider/growing/spiderling,
/mob/living/basic/bee,
/obj/effect/decal/cleanable/ants,
/obj/item/queen_bee,
))
strong_against = typecacheof(list(
/mob/living/basic/spider/giant,
))
if (isnull(splattable))
splattable = typecacheof(list(
/mob/living/basic/ant,
/mob/living/basic/butterfly,
/mob/living/basic/cockroach,
/mob/living/basic/spider/growing/spiderling,
/mob/living/basic/bee,
/obj/effect/decal/cleanable/ants,
/obj/item/queen_bee,
))
if (isnull(strong_against))
strong_against = typecacheof(list(
/mob/living/basic/spider,
))
/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)