shiptest-ss13 · FalloutFalcon · Oct 5, 2024 · Jan 13, 2023 · Jan 13, 2023 · Jan 13, 2023
diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm
@@ -1246,12 +1246,12 @@
 /area/ship/security)
 "om" = (
 /obj/structure/rack,
-/obj/item/pickaxe/drill/jackhammer/old,
 /obj/effect/turf_decal/borderfloorblack,
 /obj/item/pickaxe/mini,
 /obj/item/pickaxe/mini,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/west,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "on" = (

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -378,14 +378,14 @@
 	name = "salvage technician's locker";
 	req_access = list(48)
 	},
-/obj/item/pickaxe/drill/jackhammer/old,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/mining_scanner,
 /obj/item/storage/belt/utility,
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/under/rank/cargo/miner,
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/glasses/meson,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/port)
 "dC" = (
@@ -1678,6 +1678,7 @@
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/glasses/meson/engine,
 /obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "qO" = (
@@ -4111,14 +4112,14 @@
 	name = "salvage technician's locker";
 	req_access = list(48)
 	},
-/obj/item/pickaxe/drill/jackhammer/old,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/mining_scanner,
 /obj/item/storage/belt/utility,
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/under/rank/cargo/miner,
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/glasses/meson,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/starboard)
 "Qc" = (

diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -1661,6 +1661,7 @@
 /obj/item/clothing/head/hardhat/ngr/foreman,
 /obj/item/tank/jetpack/suit,
 /obj/item/storage/pistolcase/stechkin,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/carpet/red,
 /area/ship/cargo/office)
 "BB" = (
@@ -3159,10 +3160,7 @@
 	dir = 4
 	},
 /obj/structure/rack,
-/obj/item/pickaxe/drill/jackhammer/old{
-	pixel_y = 10
-	},
-/obj/item/pickaxe/drill/jackhammer/old,
+/obj/item/gear_pack/anglegrinder,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/storage)
 "Yv" = (

diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -172,6 +172,8 @@
 #define COMSIG_ATOM_CROWBAR_ACT "atom_crowbar_act"
 ///from base of atom/analyser_act(): (mob/living/user, obj/item/I)
 #define COMSIG_ATOM_ANALYSER_ACT "atom_analyser_act"
+///from base of atom/deconstruct_act(): (mob/living/user, obj/item/I)
+#define COMSIG_ATOM_DECONSTRUCT_ACT "atom_deconstruct_act"
 	#define COMPONENT_BLOCK_TOOL_ATTACK (1<<0)
 ///called when teleporting into a protected turf: (channel, turf/origin)
 #define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport"

diff --git a/code/__DEFINES/tools.dm b/code/__DEFINES/tools.dm
@@ -14,6 +14,7 @@
 #define TOOL_DRILL "drill"
 #define TOOL_SCALPEL "scalpel"
 #define TOOL_SAW "saw"
+#define TOOL_DECONSTRUCT "deconstruct"
 
 // If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
 // tool sound is only played when op is started. If not, it's played twice.

diff --git a/code/datums/action.dm b/code/datums/action.dm
@@ -253,6 +253,9 @@
 /datum/action/item_action/toggle_mister
 	name = "Toggle Mister"
 
+/datum/action/item_action/toggle_attachment
+	name = "Toggle Attachment"
+
 /datum/action/item_action/activate_injector
 	name = "Activate Injector"
 

diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm
@@ -8,8 +8,8 @@
 	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS 		// Only one of the component can exist on an item
 	var/wielded = FALSE 							/// Are we holding the two handed item properly
 	var/force_multiplier = 0						/// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded
-	var/force_wielded = 0	 						/// The force of the item when weilded
-	var/force_unwielded = 0		 					/// The force of the item when unweilded
+	var/force_wielded = 0	 						/// The force of the item when wielded
+	var/force_unwielded = 0		 					/// The force of the item when unwielded
 	var/wieldsound = FALSE 							/// Play sound when wielded
 	var/unwieldsound = FALSE 						/// Play sound when unwielded
 	var/attacksound = FALSE							/// Play sound on attack when wielded

diff --git a/code/datums/elements/tool_bang.dm b/code/datums/elements/tool_bang.dm
@@ -0,0 +1,40 @@
+/**
+ * Tool bang bespoke element
+ *
+ * Bang the user when using this tool
+ */
+/datum/element/tool_bang
+	element_flags = ELEMENT_BESPOKE
+	id_arg_index = 2
+	/// Strength of the bang
+	var/bang_strength
+
+/datum/element/tool_bang/Attach(datum/target, bang_strength)
+	. = ..()
+	if(!isitem(target))
+		return ELEMENT_INCOMPATIBLE
+
+	src.bang_strength = bang_strength
+
+	RegisterSignal(target, COMSIG_TOOL_IN_USE, PROC_REF(prob_bang))
+	RegisterSignal(target, COMSIG_TOOL_START_USE, PROC_REF(bang))
+
+/datum/element/tool_bang/Detach(datum/source, force)
+	. = ..()
+	UnregisterSignal(source, list(COMSIG_TOOL_IN_USE, COMSIG_TOOL_START_USE))
+
+/datum/element/tool_bang/proc/prob_bang(datum/source, mob/living/user)
+	SIGNAL_HANDLER
+
+	if(prob(90))
+		return
+	bang(source, user)
+
+/datum/element/tool_bang/proc/bang(datum/source, mob/living/user)
+	SIGNAL_HANDLER
+
+	if(user && get_dist(get_turf(source), get_turf(user)) <= 1)
+		if(istype(user, /mob/living/carbon))
+			var/mob/living/carbon/carbon = user
+			carbon.soundbang_act(min(bang_strength,1), 0, 1, 5)
+
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -1280,6 +1280,8 @@
 			. |= welder_act(user, I)
 		if(TOOL_ANALYZER)
 			. |= analyzer_act(user, I)
+		if(TOOL_DECONSTRUCT)
+			. |= deconstruct_act(user, I)
 	if(. & COMPONENT_BLOCK_TOOL_ATTACK)
 		return TRUE
 
@@ -1322,6 +1324,10 @@
 /atom/proc/analyzer_act(mob/living/user, obj/item/I)
 	return SEND_SIGNAL(src, COMSIG_ATOM_ANALYSER_ACT, user, I)
 
+///Deconstruct act
+/atom/proc/deconstruct_act(mob/living/user, obj/item/I)
+	return SEND_SIGNAL(src, COMSIG_ATOM_DECONSTRUCT_ACT, user, I)
+
 ///Generate a tag for this atom
 /atom/proc/GenerateTag()
 	return

diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
@@ -13,14 +13,22 @@
 		. += "It has \a [circuit] installed."
 
 
-/obj/structure/frame/deconstruct(disassembled = TRUE)
+/obj/structure/frame/deconstruct(disassembled = TRUE, scrapped = FALSE)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal(loc, 5)
-		if(circuit)
+		if(circuit && !scrapped)
 			circuit.forceMove(loc)
 			circuit = null
 	qdel(src)
 
+/obj/structure/frame/deconstruct_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(!I.tool_start_check(user, amount=0))
+		return FALSE
+	if(I.use_tool(src, user, 3 SECONDS, volume=0))
+		to_chat(user, "<span class='warning'>You cut apart \the [src].</span>", "<span class='notice'>You cut apart \the [src].</span>")
+		deconstruct()
+		return TRUE
 
 /obj/structure/frame/machine
 	name = "machine frame"

diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
@@ -79,6 +79,14 @@
 				return
 	return ..()
 
+/obj/structure/barricade/wooden/deconstruct_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(!I.tool_start_check(user, amount=0))
+		return FALSE
+	if (I.use_tool(src, user, 2 SECONDS, volume=0))
+		to_chat(user, "<span class='warning'>You cut apart [src].</span>")
+		deconstruct()
+		return TRUE
 
 /obj/structure/barricade/wooden/crude
 	name = "crude plank barricade"

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
@@ -1243,6 +1243,21 @@
 				return
 		INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2)
 
+/obj/machinery/door/airlock/deconstruct_act(mob/living/user, obj/item/I)
+	. = ..()
+	if(!I.tool_start_check(user, amount=0))
+		return FALSE
+	var/decon_time = 5 SECONDS
+	if(welded)
+		decon_time += 5 SECONDS
+	if(locked)
+		decon_time += 5 SECONDS
+	if(seal)
+		decon_time += 15 SECONDS
+	if (I.use_tool(src, user, decon_time, volume=100))
+		to_chat(user, "<span class='warning'>You cut open the [src].</span>")
+		deconstruct(FALSE, user)
+		return TRUE
 
 /obj/machinery/door/airlock/open(forced=0)
 	if(operating || welded || locked || seal || !wires)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -2,6 +2,8 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
 
 GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons/effects/welding_effect.dmi', "welding_sparks", GASFIRE_LAYER, ABOVE_LIGHTING_PLANE))
 
+GLOBAL_DATUM_INIT(cutting_effect, /mutable_appearance, mutable_appearance('icons/effects/cutting_effect.dmi', "cutting_effect", GASFIRE_LAYER, ABOVE_LIGHTING_PLANE))
+
 GLOBAL_DATUM_INIT(cleaning_bubbles, /mutable_appearance, mutable_appearance('icons/effects/effects.dmi', "bubbles", ABOVE_MOB_LAYER, GAME_PLANE))
 
 GLOBAL_VAR_INIT(rpg_loot_items, FALSE)