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

[FIX] Cyborg Zipties Will Not be Consumed When Making Wired Rods (#25752)

Browse Source 
* r o d

* Update handcuffs.dm

* Update handcuffs.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update handcuffs.dm

* Update handcuffs.dm

* Update handcuffs.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update handcuffs.dm

* Update code/game/objects/items/weapons/handcuffs.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-06-12 18:56:20 +00:00
committed by GitHub
co-authored by DGamerL
parent 7952f2454f
commit 4b3b64e540
2 changed files with 77 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/rods.dm
+2 -3
View File
@@ -39,13 +39,10 @@ GLOBAL_LIST_INIT(rod_recipes, list (
usesound = 'sound/items/deconstruct.ogg'
merge_type = /obj/item/stack/rods
/obj/item/stack/rods/examine(mob/user)
. = ..()
. += "<span class='notice'>Using rods on a floor plating will install a reinforced floor. You can make reinforced glass by combining rods and normal glass sheets.</span>"
/obj/item/stack/rods/cyborg
energy_type = /datum/robot_storage/energy/rods
is_cyborg = TRUE
@@ -76,9 +73,11 @@ GLOBAL_LIST_INIT(rod_recipes, list (
if(get_amount() < 2)
to_chat(user, "<span class='warning'>You need at least two rods to do this!</span>")
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
var/obj/item/stack/sheet/metal/new_item = new(drop_location())
if(new_item.get_amount() <= 0)
// stack was moved into another one on the pile