cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

f

Browse Source
This commit is contained in:
NullFag
2023-03-30 11:42:05 +02:00
parent 6738616181
commit f17ef22ff3
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/spear.dm
View File

@@ -38,13 +38,9 @@
/obj/item/spear/Initialize(mapload) /obj/item/spear/Initialize(mapload)
. = ..() . = ..()
force = force_unwielded force = force_unwielded
//decent in a pinch, but pretty bad.
AddComponent(/datum/component/jousting) AddComponent(/datum/component/jousting)
AddComponent(/datum/component/butchering, \ AddComponent(/datum/component/butchering, speed = 10 SECONDS, effectiveness = 30)
speed = 10 SECONDS, \
effectiveness = 70, \
)
AddComponent(/datum/component/two_handed, \ AddComponent(/datum/component/two_handed, \
force_unwielded = force_unwielded, \ force_unwielded = force_unwielded, \
force_wielded = force_wielded, \ force_wielded = force_wielded, \

8
code/modules/mining/equipment/kinetic_crusher.dm
View File

@@ -32,12 +32,8 @@
/obj/item/kinetic_crusher/Initialize(mapload) /obj/item/kinetic_crusher/Initialize(mapload)
. = ..() . = ..()
AddComponent(/datum/component/butchering, \ AddComponent(/datum/component/butchering, speed = 7 SECONDS, effectiveness = 40)
speed = 6 SECONDS, \ AddComponent(/datum/component/two_handed, force_unwielded = 0, force_wielded = 20)
effectiveness = 110, \
)
//technically it's huge and bulky, but this provides an incentive to use it
AddComponent(/datum/component/two_handed, force_unwielded=0, force_wielded=20)
/obj/item/kinetic_crusher/Destroy() /obj/item/kinetic_crusher/Destroy()
QDEL_LIST(trophies) QDEL_LIST(trophies)