cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vox gear tweaks. Dartgun buff, removal of tank sounds, addition of multitools.

Browse Source
This commit is contained in:
Zuhayr
2013-07-29 06:43:37 -07:00
parent 919dc1ae25
commit 08ff3df905
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/tanks/tank_types.dm
View File

@@ -29,7 +29,7 @@
..() ..()
if(air_contents.oxygen < 10) if(air_contents.oxygen < 10)
usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>") usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
playsound(usr, 'sound/effects/alert.ogg', 50, 1) //playsound(usr, 'sound/effects/alert.ogg', 50, 1)
/obj/item/weapon/tank/oxygen/yellow /obj/item/weapon/tank/oxygen/yellow
@@ -186,4 +186,4 @@
..() ..()
if(air_contents.nitrogen < 10) if(air_contents.nitrogen < 10)
usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>") usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
playsound(usr, 'sound/effects/alert.ogg', 50, 1) //playsound(usr, 'sound/effects/alert.ogg', 50, 1)

4
code/modules/admin/verbs/vox_raiders.dm
View File

@@ -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/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/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/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) var/obj/item/weapon/storage/pneumatic/W = new(src)
W.tank = new /obj/item/weapon/tank/nitrogen(W) 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/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/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/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! if(4) // Vox medic!
equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit) equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit)

4
code/modules/reagents/dartgun.dm
View File

@@ -28,7 +28,7 @@
var/list/mixing = list() //Containers being used for mixing. var/list/mixing = list() //Containers being used for mixing.
var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts. var/obj/item/weapon/dart_cartridge/cartridge = null //Container of darts.
var/max_beakers = 3 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/container_type = /obj/item/weapon/reagent_containers/glass/beaker/vial
var/list/starting_chems = null var/list/starting_chems = null
@@ -52,7 +52,7 @@
if(starting_chems) if(starting_chems)
for(var/chem in starting_chems) for(var/chem in starting_chems)
var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src) 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 beakers += B
cartridge = new /obj/item/weapon/dart_cartridge(src) cartridge = new /obj/item/weapon/dart_cartridge(src)
update_icon() update_icon()