cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix and refactor of chainsaws (#28893)

Browse Source 
* code improvements

* linters

* oh

* Update spellblade.dm

* Update spellblade.dm

* Update melee.dm

* melee's death

* update paths

* Update code/game/objects/items/weapons/melee/melee.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* fix icon states

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
kyunkyunkyun
2025-07-23 17:32:47 +00:00
committed by GitHub
co-authored by Luc
parent 175cfa60a1
commit 75202c986e
20 changed files with 628 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/encased.dm
-2
View File
@@ -12,7 +12,6 @@
TOOL_SAW = 100,
/obj/item/hatchet = 90,
/obj/item/chainsaw = 90, // Chainsaws were actually invented to replace manual bonesaws. Obvously *these* chainsaws aren't exactly designed for that, but then again, neither is a hatchet or a set of wirecutters.
/obj/item/butcher_chainsaw = 90,
TOOL_WIRECUTTER = 35 // Silly goose!
)
@@ -20,7 +19,6 @@
TOOL_SAW = 'sound/surgery/saw.ogg',
/obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
/obj/item/chainsaw = 'sound/weapons/chainsaw.ogg',
/obj/item/butcher_chainsaw = 'sound/weapons/chainsaw.ogg',
TOOL_WIRECUTTER = 'sound/surgery/scalpel1.ogg'
)
code/modules/surgery/generic.dm
-2
View File
@@ -21,7 +21,6 @@
/obj/item/melee/energy = 6,
/obj/item/pen/edagger = 6,
/obj/item/chainsaw = 1,
/obj/item/butcher_chainsaw = 1
)
preop_sound = 'sound/surgery/scalpel1.ogg'
@@ -327,7 +326,6 @@
allowed_tools = list(
TOOL_SAW = 100,
/obj/item/chainsaw = 100, // It's pretty good at doing this outside of surgery tbh...
/obj/item/butcher_chainsaw = 100,
/obj/item/hatchet = 90,
/obj/item/melee/arm_blade = 75,
/obj/item/claymore = 75,
code/modules/surgery/organs_internal.dm
+1 -4
View File
@@ -689,8 +689,7 @@
TOOL_SAW = 100,
/obj/item/melee/energy/sword/cyborg/saw = 100,
/obj/item/hatchet = 90,
/obj/item/chainsaw/ = 90,
/obj/item/butcher_chainsaw = 90,
/obj/item/chainsaw = 90,
TOOL_WIRECUTTER = 35
)
@@ -698,7 +697,6 @@
TOOL_SAW = 'sound/surgery/saw.ogg',
/obj/item/hatchet = 'sound/surgery/scalpel1.ogg',
/obj/item/chainsaw = 'sound/weapons/chainsaw.ogg',
/obj/item/butcher_chainsaw = 'sound/weapons/chainsaw.ogg',
TOOL_WIRECUTTER = 'sound/surgery/scalpel1.ogg'
)
@@ -743,7 +741,6 @@
/obj/item/melee/energy = 6,
/obj/item/pen/edagger = 6,
/obj/item/chainsaw = 1,
/obj/item/butcher_chainsaw = 1
)
preop_sound = 'sound/surgery/scalpel1.ogg'