cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 22:46:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10404 from mwerezak/stack-fix

Browse Source 
Material stack related fixes
This commit is contained in:
PsiOmegaDelta
2015-08-08 09:56:25 +02:00
parent f829a9fe6c fc7e89380e
commit c560bd8d79
44 changed files with 217 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/bot/floorbot.dm
+10 -9
View File
@@ -249,15 +249,16 @@
target = null
repairing = 0
update_icons()
else if(istype(A, /obj/item/stack/material/steel) && amount + 3 < maxAmount)
var/obj/item/stack/material/steel/M = A
visible_message("<span class='notice'>[src] begins to make tiles.</span>")
repairing = 1
update_icons()
if(do_after(50))
if(M)
M.use(1)
addTiles(4)
else if(istype(A, /obj/item/stack/material) && amount + 4 <= maxAmount)
var/obj/item/stack/material/M = A
if(M.get_material_name() == DEFAULT_WALL_MATERIAL)
visible_message("<span class='notice'>[src] begins to make tiles.</span>")
repairing = 1
update_icons()
if(do_after(50))
if(M)
M.use(1)
addTiles(4)
/mob/living/bot/floorbot/explode()
turn_off()
code/modules/mob/living/silicon/robot/robot_items.dm
+1 -1
View File
@@ -37,7 +37,7 @@
for(var/obj/I in contents)
for(var/mob/M in I.contents)
M.death()
if(istype(I,/obj/item/stack/material))//Only deconsturcts one sheet at a time instead of the entire stack
if(istype(I,/obj/item/stack/material))//Only deconstructs one sheet at a time instead of the entire stack
var/obj/item/stack/material/S = I
if(S.get_amount() > 1)
S.use(1)