From 08ff3df9055280d8d58167b2c0357c8d182d4fb8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 29 Jul 2013 06:43:37 -0700 Subject: [PATCH] Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools. --- code/game/objects/items/weapons/tanks/tank_types.dm | 4 ++-- code/modules/admin/verbs/vox_raiders.dm | 4 +++- code/modules/reagents/dartgun.dm | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 1c6c667a89c..5e82cddbdf8 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -29,7 +29,7 @@ ..() if(air_contents.oxygen < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - playsound(usr, 'sound/effects/alert.ogg', 50, 1) + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) /obj/item/weapon/tank/oxygen/yellow @@ -186,4 +186,4 @@ ..() if(air_contents.nitrogen < 10) usr << text("\red The meter on the [src.name] indicates you are almost out of air!") - playsound(usr, 'sound/effects/alert.ogg', 50, 1) \ No newline at end of file + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) \ No newline at end of file diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm index 9313ecd69f7..d226500fa8d 100644 --- a/code/modules/admin/verbs/vox_raiders.dm +++ b/code/modules/admin/verbs/vox_raiders.dm @@ -33,6 +33,7 @@ var/global/vox_tick = 1 equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt) equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE. equip_to_slot_or_del(new /obj/item/weapon/storage/box/emps(src), slot_l_store) + equip_to_slot_or_del(new /obj/item/device/multitool(src), slot_l_hand) var/obj/item/weapon/storage/pneumatic/W = new(src) W.tank = new /obj/item/weapon/tank/nitrogen(W) @@ -44,7 +45,8 @@ var/global/vox_tick = 1 equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(src), slot_belt) equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(src), slot_glasses) // REPLACE WITH CODED VOX ALTERNATIVE. equip_to_slot_or_del(new /obj/item/weapon/card/emag(src), slot_l_store) - equip_to_slot_or_del(new /obj/item/weapon/gun/dartgun/vox/raider, slot_r_hand) + equip_to_slot_or_del(new /obj/item/weapon/gun/dartgun/vox/raider(src), slot_r_hand) + equip_to_slot_or_del(new /obj/item/device/multitool(src), slot_l_hand) if(4) // Vox medic! equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit) diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index c69f9895775..e89792c62c6 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -28,7 +28,7 @@ var/list/mixing = list() //Containers being used for mixing. var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts. var/max_beakers = 3 - var/dart_reagent_amount = 5 + var/dart_reagent_amount = 15 var/container_type = /obj/item/weapon/reagent_containers/glass/beaker/vial var/list/starting_chems = null @@ -52,7 +52,7 @@ if(starting_chems) for(var/chem in starting_chems) var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src) - B.reagents.add_reagent(chem, 25) + B.reagents.add_reagent(chem, 50) beakers += B cartridge = new /obj/item/weapon/dart_cartridge(src) update_icon()