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

Implement remove_item_from_storage properly, syndi toolbox tool color update

Browse Source
This commit is contained in:
Markolie
2015-09-16 01:54:34 +02:00
parent 2098933ee4
commit 0741669bd6
7 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/holder.dm
+8 -5
View File
@@ -35,13 +35,16 @@
if((!D)||(!D2)) return 0
if((!isassembly(D))||(!isassembly(D2))) return 0
if((D:secured)||(D2:secured)) return 0
if(user)
user.remove_from_mob(D)
user.remove_from_mob(D2)
if(!D.remove_item_from_storage(src))
if(user)
user.remove_from_mob(D)
D.loc = src
if(!D2.remove_item_from_storage(src))
if(user)
user.remove_from_mob(D2)
D2.loc = src
D:holder = src
D2:holder = src
D.loc = src
D2.loc = src
a_left = D
a_right = D2
name = "[D.name]-[D2.name] assembly"
code/modules/paperwork/paperbin.dm
+4 -4
View File
@@ -36,12 +36,12 @@
else if(istype(over_object, /obj/screen))
switch(over_object.name)
if("r_hand")
if(!M.unEquip(src))
return
if(!remove_item_from_storage(M))
M.unEquip(src)
M.put_in_r_hand(src)
if("l_hand")
if(!M.unEquip(src))
return
if(!remove_item_from_storage(M))
M.unEquip(src)
M.put_in_l_hand(src)
add_fingerprint(M)