From d4c61fd1d3ad1ae1fb8c37f6805bbcfed314302a Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Sun, 29 Aug 2010 03:06:13 +0000 Subject: [PATCH] Three small changes - Buckets are now available from autolathes, added generic remote signaller cartridges to the Tool Storage vending machine, adjusted AI status display density to 0 by request of veryinky git-svn-id: http://tgstation13.googlecode.com/svn/trunk@12 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Tools.dm | 3 +++ code/defines/obj/machinery.dm | 4 ++-- code/game/machinery/autolathe.dm | 1 + code/game/machinery/status_display.dm | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index ecb178394e68..3b8eb7306acc 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -865,6 +865,9 @@ icon = 'janitor.dmi' icon_state = "bucket" item_state = "bucket" + m_amt = 200 + g_amt = 0 + amount_per_transfer_from_this = 10 flags = FPRINT | OPENCONTAINER New() diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm index c942d904ad3b..4ef764eae6d0 100644 --- a/code/defines/obj/machinery.dm +++ b/code/defines/obj/machinery.dm @@ -551,9 +551,9 @@ var/wires = 15 /obj/machinery/vending/assist - product_amounts = "5;3;4;1" + product_amounts = "5;3;4;1;4" product_hidden = "/obj/item/device/flashlight;obj/item/device/timer" - product_paths = "/obj/item/device/prox_sensor;/obj/item/device/igniter;/obj/item/device/radio/signaler;/obj/item/weapon/wirecutters" + product_paths = "/obj/item/device/prox_sensor;/obj/item/device/igniter;/obj/item/device/radio/signaler;/obj/item/weapon/wirecutters;/obj/item/weapon/cartridge/signal" product_hideamt = "5;2" /obj/machinery/vending/coffee diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7ae01b3150cd..feab27a47624 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -172,6 +172,7 @@ src.L += new /obj/item/weapon/scalpel(src) src.L += new /obj/item/weapon/circular_saw(src) src.L += new /obj/item/device/t_scanner(src) + src.L += new /obj/item/weapon/reagent_containers/glass/bucket(src) src.LL += new /obj/item/weapon/flamethrower(src) src.LL += new /obj/item/device/igniter(src) src.LL += new /obj/item/device/timer(src) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 453da04b8ab4..e60b09df08b2 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -248,7 +248,7 @@ icon_state = "frame" name = "AI display" anchored = 1 - density = 1 + density = 0 var/mode = 0 // 0 = Blank // 1 = AI emoticon