diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm index 93f6af6eb5a..409b1ef9bd7 100644 --- a/code/modules/admin/verbs/vox_raiders.dm +++ b/code/modules/admin/verbs/vox_raiders.dm @@ -16,10 +16,7 @@ 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/device/chameleon(src), slot_l_store) - var/obj/item/weapon/crossbow/W = new(src) - W.cell = new /obj/item/weapon/cell/crap(W) - W.cell.charge = 500 - equip_to_slot_or_del(W, slot_r_hand) + equip_to_slot_or_del(new /obj/item/weapon/gun/dartgun/vox/raider, slot_r_hand) if(2) // Vox engineer! equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/pressure(src), slot_wear_suit) @@ -28,7 +25,9 @@ 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/pickaxe/plasmacutter(src), slot_r_hand) + var/obj/item/weapon/storage/pneumatic/W = new(src) + W.tank = new /obj/item/weapon/tank/nitrogen(W) + equip_to_slot_or_del(W, slot_r_hand) if(3) // Vox saboteur! equip_to_slot_or_del(new /obj/item/clothing/suit/space/vox/carapace(src), slot_wear_suit) @@ -37,8 +36,9 @@ 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) - var/obj/item/weapon/storage/pneumatic/W = new(src) - W.tank = new /obj/item/weapon/tank/nitrogen(W) + var/obj/item/weapon/crossbow/W = new(src) + W.cell = new /obj/item/weapon/cell/crap(W) + W.cell.charge = 500 equip_to_slot_or_del(W, slot_r_hand) if(4) // Vox medic! @@ -49,7 +49,7 @@ equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray(src), slot_l_store) equip_to_slot_or_del(new /obj/item/weapon/circular_saw(src), slot_l_hand) - equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/toxin(src), slot_r_hand) + equip_to_slot_or_del(new /obj/item/weapon/gun/dartgun/vox/medical, slot_r_hand) equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vox(src), slot_wear_mask) equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(src), slot_back) diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index 5481dc22a15..c69f9895775 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -54,6 +54,8 @@ var/obj/item/weapon/reagent_containers/glass/beaker/vial/B = new(src) B.reagents.add_reagent(chem, 25) beakers += B + cartridge = new /obj/item/weapon/dart_cartridge(src) + update_icon() /obj/item/weapon/gun/dartgun/examine() set src in view()