From 8848a51fe89956526f4a6e01a8820bbfa55f9a5d Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sat, 11 Jul 2015 03:26:41 +1200 Subject: [PATCH 1/2] Fixed dropping modules on conveyor belts --- code/modules/recycling/conveyor2.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 2244e98bf10..32d6652e9d3 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -95,8 +95,9 @@ // attack with item, place item on conveyor /obj/machinery/conveyor/attackby(var/obj/item/I, mob/user) if(isrobot(user)) return //Carn: fix for borgs dropping their modules on conveyor belts - user.drop_item() - if(I && I.loc) I.loc = src.loc + if(I.loc != user) return // This should stop mounted modules ending up outside the module. + + user.drop_item(src) return // attack with hand, move pulled object onto conveyor From 09f502f8d733591aee64993348c4ccb19a73944d Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sat, 11 Jul 2015 03:01:03 +1200 Subject: [PATCH 2/2] Fixed spriteless item in xenoarch loot drop --- code/modules/mining/mine_turfs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index c56bcde6423..dc4e4694584 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -336,8 +336,8 @@ R.amount = rand(5,25) if(2) - var/obj/item/stack/tile/R = new(src) - R.amount = rand(1,5) + var/obj/item/stack/tile/plasteel/R = new(src) + R.amount = rand(5,25) if(3) var/obj/item/stack/sheet/metal/R = new(src)