cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-06 07:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2022-07-12 13:40:14 -03:00
parent 6f06329e4d 2bae82bf30
commit c439263757
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/assembly/holder.dm
View File

@@ -17,7 +17,6 @@
/obj/item/assembly_holder/IsAssemblyHolder()
return TRUE
/obj/item/assembly_holder/proc/assemble(obj/item/assembly/A, obj/item/assembly/A2, mob/user)
attach(A,user)
attach(A2,user)
@@ -32,6 +31,8 @@
else
A.forceMove(src)
A.holder = src
// bandaid: please don't try to be picked up while we're still in the assembly
A.interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP
A.toggle_secure()
if(!a_left)
a_left = A
@@ -103,9 +104,11 @@
to_chat(user, "<span class='notice'>You disassemble [src]!</span>")
if(a_left)
a_left.on_detach()
a_left.interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP
a_left = null
if(a_right)
a_right.on_detach()
a_right.interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP
a_right = null
qdel(src)
return TRUE