From 2566168d22d95fdca4c9ed5361a440c4ea7f1a86 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Fri, 2 Sep 2011 00:55:12 +0000 Subject: [PATCH] I returned the Rigs slow down to 2 points. Went though the Autolathe and cleaned its item order up a little. Sinks! Sinks now fill glasses/cups and beaker/buckets 10 units of water at a time. As soon as I can (given how much map update keep springing up every five seconds) I'll add a sink to hydro, and take out the water cooler in the kitchen. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2085 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/autolathe.dm | 24 ++++++++++++------------ code/game/machinery/sink.dm | 8 +++++++- code/modules/chemical/Chemistry-Tools.dm | 1 + code/modules/clothing/spacesuits/rig.dm | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 14f51ed8d60..8871c38463c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -223,15 +223,18 @@ var/global/list/autolathe_recipes = list( \ /* screwdriver removed*/ \ - new /obj/item/weapon/wirecutters(), \ - new /obj/item/weapon/wrench(), \ + new /obj/item/weapon/reagent_containers/glass/bucket(), \ new /obj/item/weapon/crowbar(), \ - new /obj/item/weapon/weldingtool(), \ - new /obj/item/clothing/head/helmet/welding(), \ - new /obj/item/device/multitool(), \ - new /obj/item/weapon/airlock_electronics(), \ new /obj/item/device/flashlight(), \ new /obj/item/weapon/extinguisher(), \ + new /obj/item/device/multitool(), \ + new /obj/item/device/t_scanner(), \ + new /obj/item/weapon/weldingtool(), \ + new /obj/item/weapon/wirecutters(), \ + new /obj/item/weapon/wrench(), \ + new /obj/item/clothing/head/helmet/welding(), \ + new /obj/item/weapon/stock_parts/console_screen(), \ + new /obj/item/weapon/airlock_electronics(), \ new /obj/item/stack/sheet/metal(), \ new /obj/item/stack/sheet/glass(), \ new /obj/item/stack/sheet/r_metal(), \ @@ -241,23 +244,20 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/kitchenknife(), \ new /obj/item/weapon/scalpel(), \ new /obj/item/weapon/circular_saw(), \ - new /obj/item/device/t_scanner(), \ - new /obj/item/weapon/reagent_containers/glass/bucket(), \ new /obj/item/ammo_casing/shotgun/blank(), \ new /obj/item/ammo_casing/shotgun/beanbag(), \ new /obj/item/ammo_magazine/c38(), \ new /obj/item/device/taperecorder(), \ - new /obj/item/weapon/stock_parts/console_screen(), \ ) var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/weapon/flamethrower/full(), \ new /obj/item/device/igniter(), \ new /obj/item/device/timer(), \ - new /obj/item/weapon/rcd(), \ - new /obj/item/device/infra(), \ - new /obj/item/weapon/weldingtool/largetank(), \ new /obj/item/device/infra_sensor(), \ + new /obj/item/device/infra(), \ + new /obj/item/weapon/rcd(), \ + new /obj/item/weapon/weldingtool/largetank(), \ new /obj/item/weapon/handcuffs(), \ new /obj/item/ammo_magazine(), \ new /obj/item/ammo_casing/shotgun(), \ diff --git a/code/game/machinery/sink.dm b/code/game/machinery/sink.dm index 32b318f7a76..4fae5f260bb 100644 --- a/code/game/machinery/sink.dm +++ b/code/game/machinery/sink.dm @@ -33,7 +33,13 @@ attackby(var/obj/item/O as obj, var/mob/user as mob) - if (istype(O, /obj/item/weapon/melee/baton)) + if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks)) + O:reagents.add_reagent("water", 10) + user.visible_message( \ + "\blue [user] fills the [O] using the [src].", \ + "\blue You fill the [O] using the [src].") + return + else if (istype(O, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = O if (B.charges > 0 && B.status == 1) flick("baton_active", src) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index ac73e413622..96ef3670aa4 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -604,6 +604,7 @@ /obj/table, /obj/secure_closet, /obj/closet, + /obj/machinery/sink, /obj/item/weapon/storage, /obj/machinery/atmospherics/unary/cryo_cell, /obj/item/weapon/chem_grenade, diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 96d24bf8d12..4befd2dd88f 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -17,7 +17,7 @@ item_state = "rig_suit" radiation_protection = 0.50 protective_temperature = 5000 //For not dieing near a fire, but still not being great in a full inferno - slowdown = 1.5 + slowdown = 2 armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner)