cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Spamming the weld on a robotic part no longer drains the fuel with no benefit [MDB IGNORE] (#26033)

Browse Source 
* Spamming the weld on a robotic part no longer drains the fuel with no benefit (#80801)

See name, spamming the self repair will no longer empty your welding
tool faster than a clown emptying the captain's office.

* This... should work

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-01-08 19:59:06 +00:00
committed by GitHub
co-authored by Waterpig Useroth
parent 0585ed154e
commit 09c56f903f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/tools/weldingtool.dm
+6 -4
View File
@@ -145,14 +145,16 @@
if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting))
return NONE
if(!use_tool(attacked_humanoid, user, 0, volume=50, amount=1))
return ITEM_INTERACT_BLOCKING
var/use_delay = 0
if(user == attacked_humanoid)
user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid]'s [affecting.name]."),
span_notice("You start fixing some of the dents on [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name]."))
if(!do_after(user, self_delay, attacked_humanoid)) // SKYRAT EDIT CHANGE - ORIGINAL: if(!do_after(user, 5 SECONDS, attacked_humanoid))
return ITEM_INTERACT_BLOCKING
use_delay = 5 SECONDS
if(!use_tool(attacked_humanoid, user, use_delay, volume=50, amount=1))
return ITEM_INTERACT_BLOCKING
// SKYRAT EDIT ADDITION START
if(!do_after(user, other_delay, attacked_humanoid))
return ITEM_INTERACT_BLOCKING
modular_skyrat/master_files/code/game/objects/items/tools/weldingtool.dm
-2
View File
@@ -1,6 +1,4 @@
/obj/item/weldingtool
/// How long it takes to weld someone else's robotic limbs.
var/self_delay = 5 SECONDS
/// How long it takes to weld your own robotic limbs.
var/other_delay = 1 SECONDS