Merge pull request #5230 from Superlagg/get-your-pants-on-were-going-…

…on-an-adwrenchure Adds a cool wrench (for one person)
ARF-SS13 · Jun 1, 2024 · 63148f9 · 63148f9
2 parents cb18c71 + 0edb273
commit 63148f9
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 6 deletions.
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
@@ -30,6 +30,7 @@
 	usesound = 'sound/weapons/empty.ogg'
 	var/datum/integrated_io/selected_io = null  //functional for integrated circuits.
 	var/mode = 0
+	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/multitool/chaplain
 	name = "\improper hypertool"

diff --git a/code/game/objects/items/melee/f13twohanded.dm b/code/game/objects/items/melee/f13twohanded.dm
@@ -546,13 +546,14 @@
 	throwforce = 15
 	throwforce_on = 30
 	attack_speed = CLICK_CD_MELEE
-	var/emp_radius = 1
+	var/emp_amount = 5
 
-///obj/item/melee/transforming/energy/axe/protonaxe/afterattack(atom/A, mob/living/user, proximity)   //As it turns out, everything about this cool gimmick is broken.
-//	. = ..()
-//	if(!active)
-//		return
-//	empulse_using_range(A, emp_radius, log=0) //fox go a (A)
+/obj/item/melee/transforming/energy/axe/protonaxe/afterattack(atom/A, mob/living/user, proximity)   //As it turns out, everything about this cool gimmick is broken.
+	. = ..()
+	if(!active || !ismovable(A))
+		return
+	A.emp_act(emp_amount)
+	// empulse_using_range(A, emp_radius, log=0) //fox go a (A)
 
 //dan kelly is a nerd NO YOU ARE!!!
 

diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
@@ -26,6 +26,7 @@
 
 	wound_bonus = -10
 	bare_wound_bonus = 5
+	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/crowbar/attack(mob/living/M, mob/living/user)
 	if(user.a_intent == INTENT_HARM)

diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
@@ -26,6 +26,7 @@
 	reskinnable_component = null
 	wound_bonus = -10
 	bare_wound_bonus = 5
+	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/screwdriver/attack(mob/living/M, mob/living/user)
 	if(user.a_intent == INTENT_HARM)

diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
@@ -38,6 +38,7 @@
 	toolspeed = 1
 	wound_bonus = 0
 	bare_wound_bonus = 5
+	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/weldingtool/Initialize()
 	. = ..()

diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
@@ -23,6 +23,7 @@
 	tool_behaviour = TOOL_WIRECUTTER
 	toolspeed = 1
 	armor = ARMOR_VALUE_GENERIC_ITEM
+	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/wirecutters/attack(mob/living/M, mob/living/user)
 	if(user.a_intent == INTENT_HARM)

diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
@@ -24,6 +24,7 @@
 	armor = ARMOR_VALUE_GENERIC_ITEM
 	wound_bonus = -10
 	bare_wound_bonus = 5
+	weapon_special_component = /datum/component/weapon_special/single_turf
 
 /obj/item/wrench/attack(mob/living/M, mob/living/user)
 	if(user.a_intent == INTENT_HARM)
@@ -69,6 +70,14 @@
 		to_chat(user, span_notice("You were interrupted."))
 		praying = FALSE
 
+/obj/item/wrench/afterattack(atom/A, mob/living/user, proximity)
+	. = ..()
+	if(!proximity || !wielded || IS_STAMCRIT(user))
+		return
+	if(istype(A, /obj/structure) || istype(A, /obj/machinery))
+		var/obj/W = A
+		W.take_damage(force, BRUTE, "melee", 0, attacked_by = user)
+
 /obj/item/wrench/cyborg
 	name = "automatic wrench"
 	desc = "An advanced robotic wrench. Can be found in construction cyborgs."
@@ -165,3 +174,32 @@
 	item_state = "wrench"
 	toolspeed = 0.1
 	reskinnable_component = /datum/component/reskinnable/wrench
+
+// Sledgehammer			Keywords: Damage 25/45, Blacksmithing
+/obj/item/wrench/sledgehammer
+	name = "buster wrench"
+	desc = "An unusually large wrench that appears equally adept at bashing skulls and turning bolts. Why it has to be so damn big is anyone's guess, but you can't deny that it feels satisfying to swing."
+	item_state = "altevian-wrench"
+	slot_flags = INV_SLOTBIT_BELT | INV_SLOTBIT_BACK
+
+	icon = 'icons/obj/revwrench.dmi'
+	icon_state = "altevian-wrench"
+	wielded_icon = "altevian-wrench"
+	mob_overlay_icon = 'icons/obj/revwrenchback.dmi'
+	lefthand_file = 'icons/obj/revwrenchleft.dmi'
+	righthand_file = 'icons/obj/revwrenchright.dmi'
+	toolspeed = 1
+	force = 30
+	throwforce = 20 // Huge hammers aren't that great for throwing
+	sharpness = SHARP_NONE
+	attack_verb = list("bashed", "pounded", "bludgeoned", "pummeled", "thrashed")
+	force_wielded = 70
+	force_unwielded = 30
+	attack_speed = CLICK_CD_MELEE * 1.8 //14.4
+
+/obj/item/wrench/sledgehammer/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/jousting/sledge)
+
+
+
diff --git a/icons/obj/revwrench.dmi b/icons/obj/revwrench.dmi
diff --git a/icons/obj/revwrenchback.dmi b/icons/obj/revwrenchback.dmi
diff --git a/icons/obj/revwrenchleft.dmi b/icons/obj/revwrenchleft.dmi
diff --git a/icons/obj/revwrenchright.dmi b/icons/obj/revwrenchright.dmi
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -1330,6 +1330,18 @@
 	new /obj/item/ammo_box/c9mm(src)
 	new /obj/item/melee/powered/ripper/dull(src)
 
+/datum/gear/donator/kits/RevolverEloise
+	name = "A Bigass Wrench"
+	path = /obj/item/storage/box/large/custom_kit/RevolverEloise
+	ckeywhitelist = list("RevolverEloise")
+
+/obj/item/storage/box/large/custom_kit/RevolverEloise
+	name = "A box with a bigass wrench in it"
+	desc = "*notices toolbox* OwO what's this?"
+
+/obj/item/storage/box/large/custom_kit/RevolverEloise/PopulateContents()
+	new /obj/item/wrench/sledgehammer(src)
+
 /datum/gear/donator/kits/roachwitharoach
 	name = "Desert Kit"
 	path = /obj/item/storage/box/large/custom_kit/roachwitharoach