cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrates Surgery Tools, Nuke Kits, and Nuke Cores to the New Attack Chain (#30442)

Browse Source 
* super

* Update theft_items.dm

* Update theft_items.dm

* Update outfit_debug.dm

* Update code/game/objects/items/theft_items.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
CRUNCH
2025-10-17 18:58:35 +01:00
committed by GitHub
parent 027146fee1
commit 3210d12d56
3 changed files with 141 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/tools.dm
+20 -8
View File
@@ -10,6 +10,7 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=1;biotech=1"
tool_behaviour = TOOL_RETRACTOR
new_attack_chain = TRUE
/obj/item/retractor/Initialize(mapload)
. = ..()
@@ -35,6 +36,7 @@
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "pinched")
tool_behaviour = TOOL_HEMOSTAT
new_attack_chain = TRUE
/obj/item/hemostat/Initialize(mapload)
. = ..()
@@ -60,6 +62,7 @@
origin_tech = "materials=1;biotech=1"
attack_verb = list("burnt")
tool_behaviour = TOOL_CAUTERY
new_attack_chain = TRUE
/obj/item/cautery/Initialize(mapload)
. = ..()
@@ -67,9 +70,11 @@
RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/cautery/attack__legacy__attackchain(mob/living/target, mob/living/user)
if(!cigarette_lighter_act(user, target))
return ..()
/obj/item/cautery/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(cigarette_lighter_act(user, target))
return ITEM_INTERACT_COMPLETE
return ..()
/obj/item/cautery/cigarette_lighter_act(mob/living/user, mob/living/target, obj/item/direct_attackby_item)
var/obj/item/clothing/mask/cigarette/cig = ..()
@@ -108,6 +113,7 @@
origin_tech = "materials=1;biotech=1"
attack_verb = list("drilled")
tool_behaviour = TOOL_DRILL
new_attack_chain = TRUE
/obj/item/surgicaldrill/Initialize(mapload)
. = ..()
@@ -146,6 +152,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
tool_behaviour = TOOL_SCALPEL
new_attack_chain = TRUE
/obj/item/scalpel/Initialize(mapload)
. = ..()
@@ -154,14 +161,12 @@
RegisterSignal(src, COMSIG_BIT_ATTACH, PROC_REF(add_bit))
RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/scalpel/suicide_act(mob/user)
to_chat(viewers(user), pick("<span class='suicide'>[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>",
"<span class='suicide'>[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>",
"<span class='suicide'>[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!</span>"))
return BRUTELOSS
/obj/item/scalpel/augment
desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
toolspeed = 0.5
@@ -178,9 +183,11 @@
hitsound = 'sound/weapons/sear.ogg'
materials = list(MAT_METAL = 2000, MAT_GLASS = 1000)
/obj/item/scalpel/laser/attack__legacy__attackchain(mob/living/carbon/target, mob/living/user)
if(!cigarette_lighter_act(user, target))
return ..()
/obj/item/scalpel/laser/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(cigarette_lighter_act(user, target))
return ITEM_INTERACT_COMPLETE
return ..()
/obj/item/scalpel/laser/cigarette_lighter_act(mob/living/user, mob/living/target, obj/item/direct_attackby_item)
var/obj/item/clothing/mask/cigarette/cig = ..()
@@ -246,6 +253,7 @@
origin_tech = "biotech=1;combat=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")
tool_behaviour = TOOL_SAW
new_attack_chain = TRUE
/obj/item/circular_saw/Initialize(mapload)
. = ..()
@@ -271,6 +279,7 @@
throwforce = 1.0
origin_tech = "materials=1;biotech=1"
tool_behaviour = TOOL_BONEGEL
new_attack_chain = TRUE
/obj/item/bonegel/Initialize(mapload)
. = ..()
@@ -292,6 +301,7 @@
origin_tech = "materials=1;biotech=1"
w_class = WEIGHT_CLASS_SMALL
tool_behaviour = TOOL_FIXOVEIN
new_attack_chain = TRUE
/obj/item/fix_o_vein/Initialize(mapload)
. = ..()
@@ -317,6 +327,7 @@
attack_verb = list("attacked", "hit", "bludgeoned")
origin_tech = "materials=1;biotech=1"
tool_behaviour = TOOL_BONESET
new_attack_chain = TRUE
/obj/item/bonesetter/Initialize(mapload)
. = ..()
@@ -337,6 +348,7 @@
attack_verb = list("slapped")
/// How effective this is at preventing infections during surgeries.
var/surgery_effectiveness = 0.9
new_attack_chain = TRUE
/obj/item/surgical_drapes/Initialize(mapload)
. = ..()