mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
standardizes default unfasten wrench (#65425)
I'll do more in the future but I'll limit myself to this because I'm tired, bored, and don't want to make so many PRs touching the same things that I have to deal with conflicts each time one is merged. Just as an example, screwdriver's gotta be done as well, does the exact same thing wrenches do, I believe. Standardizes (and touches) each time default_unfasten_wrench is used. Fixes tool logs, since it relies on tool acts to exist, I'm trying to move as many tool acts to its proper proc. Like a spiritual successor to the tool superpack PRs. Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
@@ -46,6 +46,13 @@
|
||||
reagents.remove_all()
|
||||
charge_ignited = FALSE
|
||||
|
||||
/obj/structure/cannon/wrench_act(mob/living/user, obj/item/tool)
|
||||
. = ..()
|
||||
if(!anchorable_cannon)
|
||||
return FALSE
|
||||
default_unfasten_wrench(user, tool)
|
||||
return TOOL_ACT_TOOLTYPE_SUCCESS
|
||||
|
||||
/obj/structure/cannon/attackby(obj/item/used_item, mob/user, params)
|
||||
if(charge_ignited)
|
||||
balloon_alert(user, "it's gonna fire!")
|
||||
@@ -100,9 +107,6 @@
|
||||
powder_keg.reagents.trans_id_to(src, /datum/reagent/fuel, amount = charge_size)
|
||||
balloon_alert(user, "[src] loaded with welding fuel")
|
||||
return
|
||||
if(anchorable_cannon && used_item.tool_behaviour == TOOL_WRENCH)
|
||||
if(default_unfasten_wrench(user, used_item, time = 2 SECONDS))
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/structure/cannon/trash
|
||||
|
||||
Reference in New Issue
Block a user