cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes stacks, attempt 2 (#26633)

Browse Source 
* this is hell pain

* fixes merge issues when cutting up various items

* adds early return to attackby
This commit is contained in:
chuga-git
2024-09-10 22:14:01 +00:00
committed by GitHub
parent 35740a27cc
commit f57ebfa1a0
4 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/shards.dm
+2 -10
View File
@@ -66,16 +66,8 @@
. = TRUE
if(!I.use_tool(src, user, volume = I.tool_volume))
return
var/obj/item/stack/sheet/NG = new welded_type(user.loc)
for(var/obj/item/stack/sheet/G in user.loc)
if(!istype(G, welded_type))
continue
if(G == NG)
continue
if(G.amount >= G.max_amount)
continue
G.attackby(NG, user)
to_chat(user, "<span class='notice'>You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.</span>")
var/obj/item/stack/sheet/new_glass = new welded_type(user.loc)
to_chat(user, "<span class='notice'>You add the newly-formed glass to the stack.</span>")
qdel(src)
/obj/item/shard/Crossed(mob/living/L, oldloc)