cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10962 from Fox-McCloud/fixes-stacks

Browse Source 
Fixes Stacks--Again
This commit is contained in:
variableundefined
2019-02-28 20:45:03 +08:00
committed by GitHub
parent 3a20d4c8f9 f133be6760
commit edef1bd11e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+9 -9
View File
@@ -231,16 +231,10 @@
if(amount < used)
return FALSE
amount -= used
if(amount < 1)
if(isrobot(loc))
var/mob/living/silicon/robot/R = loc
if(locate(src) in R.module.modules)
R.module.modules -= src
if(R)
R.unEquip(src, TRUE)
zero_amount()
if(check)
zero_amount()
update_icon()
return 1
return TRUE
/obj/item/stack/proc/get_amount()
return amount
@@ -307,6 +301,12 @@
/obj/item/stack/proc/zero_amount()
if(amount < 1)
if(isrobot(loc))
var/mob/living/silicon/robot/R = loc
if(locate(src) in R.module.modules)
R.module.modules -= src
if(usr)
usr.unEquip(src, TRUE)
qdel(src)
return TRUE
return FALSE