Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
This commit is contained in:
@@ -164,12 +164,7 @@
|
||||
update_controls()
|
||||
|
||||
/mob/living/simple_animal/bot/floorbot/proc/empty_tiles()
|
||||
var/atom/Tsec = drop_location()
|
||||
|
||||
while(specialtiles > initial(tiletype.max_amount))
|
||||
new tiletype(Tsec,initial(tiletype.max_amount))
|
||||
specialtiles -= initial(tiletype.max_amount)
|
||||
new tiletype(Tsec,specialtiles)
|
||||
new tiletype(drop_location(), specialtiles)
|
||||
specialtiles = 0
|
||||
tiletype = null
|
||||
|
||||
@@ -378,8 +373,7 @@
|
||||
if(prob(50))
|
||||
drop_part(robot_arm, Tsec)
|
||||
|
||||
var/obj/item/stack/tile/plasteel/T = new (Tsec)
|
||||
T.amount = 1
|
||||
new /obj/item/stack/tile/plasteel(Tsec, 1)
|
||||
|
||||
do_sparks(3, TRUE, src)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user