From 3f4039d0278574a7d0fb661caba4c7eeb86c3bd0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 10 Oct 2018 19:02:48 -0400 Subject: [PATCH 1/5] ERT Equipment Redo - Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles - Adds 5mm Assault Rifles, .45 revolvers - Reduces the number of powerful weapon types (energy sniper, combat shotgun) - Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines - Adds a lot of things to the medical and engineering ERT sections - Replaces weapon power cells with self-charging weapon power cells - Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells - Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section - Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy - Adds LMGs to Zulu's armory --- .../items/weapons/storage/firstaid_vr.dm | 4 + code/modules/power/cells/power_cells_vr.dm | 7 + .../reagents/reagent_containers/pill_vr.dm | 8 + maps/tether/tether-10-colony.dmm | 352 +++++++++++------- vorestation.dme | 3 + 5 files changed, 244 insertions(+), 130 deletions(-) create mode 100644 code/game/objects/items/weapons/storage/firstaid_vr.dm create mode 100644 code/modules/power/cells/power_cells_vr.dm create mode 100644 code/modules/reagents/reagent_containers/pill_vr.dm diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm new file mode 100644 index 00000000000..9c4e015a185 --- /dev/null +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -0,0 +1,4 @@ +/obj/item/weapon/storage/pill_bottle/nutriment + name = "bottle of Nutriment pills" + desc = "Contains pills used to feed people." + starts_with = list(/obj/item/weapon/reagent_containers/pill/nutriment = 7) diff --git a/code/modules/power/cells/power_cells_vr.dm b/code/modules/power/cells/power_cells_vr.dm new file mode 100644 index 00000000000..43d4f1ca160 --- /dev/null +++ b/code/modules/power/cells/power_cells_vr.dm @@ -0,0 +1,7 @@ +/obj/item/weapon/cell/recharging + name = "recharging high-capacity power cell" + origin_tech = null + icon_state = "icell" + maxcharge = 10000 + matter = null + self_recharge = TRUE diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm new file mode 100644 index 00000000000..19cc89c669a --- /dev/null +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -0,0 +1,8 @@ +/obj/item/weapon/reagent_containers/pill/nutriment + name = "Nutriment pill" + desc = "Used to feed people on the field. Contains 30 units of Nutriment." + icon_state = "pill6" + +/obj/item/weapon/reagent_containers/pill/iron/New() + ..() + reagents.add_reagent("nutriment", 30) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 656dfeb5be1..8284b673547 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -12,11 +12,11 @@ /turf/unsimulated/wall/planetary/virgo3b, /area/centcom/specops) "ae" = ( -/turf/unsimulated/floor/shuttle_ceiling, /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"; dir = 8 }, +/turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/specops/centcom{ base_turf = /turf/unsimulated/floor/shuttle_ceiling @@ -35,11 +35,11 @@ /turf/unsimulated/wall, /area/centcom/specops) "ai" = ( -/turf/unsimulated/floor/shuttle_ceiling, /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion"; dir = 8 }, +/turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/specops/centcom{ base_turf = /turf/unsimulated/floor/shuttle_ceiling @@ -136,14 +136,12 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/weapon/gun/energy/ionrifle/pistol, +/obj/item/weapon/gun/energy/ionrifle/pistol, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -154,9 +152,6 @@ }, /obj/structure/table/rack, /obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ icon_state = "dark" @@ -170,7 +165,6 @@ /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 @@ -184,16 +178,14 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/ammo_magazine/m545saw/ap, -/obj/item/ammo_magazine/m545saw/ap, -/obj/item/weapon/gun/projectile/automatic/l6_saw, /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -206,6 +198,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/weapon/gun/energy/gun/nuclear, /obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -215,21 +208,20 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -239,18 +231,17 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, -/obj/item/ammo_magazine/m762m, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545/ap, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -260,9 +251,11 @@ dir = 1 }, /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -293,12 +286,14 @@ /area/centcom/specops) "az" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, /obj/structure/window/reinforced{ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/weapon/gun/energy/stunrevolver, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -317,7 +312,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/frags, /obj/item/weapon/storage/box/smokes, /obj/item/weapon/storage/box/smokes, /obj/effect/floor_decal/industrial/outline/yellow, @@ -383,7 +377,16 @@ /obj/item/ammo_casing/rocket, /obj/item/weapon/gun/launcher/rocket, /obj/item/weapon/gun/launcher/rocket, -/obj/item/weapon/gun/launcher/rocket, +/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/weapon/gun/projectile/automatic/l6_saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw, +/obj/item/ammo_magazine/m545saw/ap, +/obj/item/ammo_magazine/m545saw/ap, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -395,33 +398,14 @@ /area/centcom/specops) "aH" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/surgical/circular_saw, -/obj/item/weapon/surgical/surgicaldrill, -/obj/item/weapon/surgical/bonegel{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/weapon/surgical/bonesetter, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/retractor{ - pixel_x = 0; - pixel_y = 6 - }, -/obj/item/weapon/surgical/hemostat{ - pixel_y = 4 - }, -/obj/item/weapon/surgical/cautery{ - pixel_y = 4 - }, -/obj/item/weapon/surgical/FixOVein{ - pixel_x = -6; - pixel_y = 1 - }, /obj/item/stack/nanopaste, /obj/item/weapon/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/mask/surgical, /obj/item/clothing/mask/surgical, +/obj/item/stack/nanopaste, +/obj/item/stack/nanopaste, +/obj/item/weapon/storage/firstaid/surgery, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -449,12 +433,13 @@ /area/centcom/specops) "aK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, +/obj/item/weapon/storage/firstaid/clotting, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/iron, +/obj/item/weapon/storage/pill_bottle/nutriment, +/obj/item/weapon/storage/pill_bottle/nutriment, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -513,6 +498,8 @@ /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, /obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/device/defib_kit/compact/combat/loaded, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -597,8 +584,6 @@ /area/centcom/specops) "aW" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, /obj/item/device/flash, /obj/item/device/flash, /obj/item/clothing/accessory/storage/black_vest, @@ -607,6 +592,14 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/martin, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -629,6 +622,12 @@ /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, /obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_drop_pouches, +/obj/item/clothing/accessory/storage/white_drop_pouches, +/obj/item/clothing/accessory/storage/white_drop_pouches, +/obj/item/clothing/accessory/storage/white_drop_pouches, +/obj/item/clothing/accessory/storage/white_drop_pouches, +/obj/item/clothing/accessory/storage/white_drop_pouches, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -645,8 +644,6 @@ /obj/structure/window/reinforced, /obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -679,8 +676,11 @@ "bd" = ( /obj/structure/table/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, -/obj/item/weapon/gun/projectile/automatic/wt550/lethal, +/obj/item/weapon/gun/projectile/automatic/saber, +/obj/item/ammo_magazine/m9mmR/saber, +/obj/item/ammo_magazine/m9mmR/saber, +/obj/item/ammo_magazine/m9mmR/saber, +/obj/item/ammo_magazine/m9mmR/saber, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -689,7 +689,6 @@ /obj/structure/table/rack, /obj/structure/window/reinforced, /obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -700,12 +699,12 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/ammo_magazine/s357, -/obj/item/ammo_magazine/s357, -/obj/item/ammo_magazine/s357, -/obj/item/ammo_magazine/s357, -/obj/item/weapon/gun/projectile/revolver/mateba, -/obj/item/weapon/gun/projectile/revolver/mateba, +/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/weapon/gun/projectile/revolver/detective45, +/obj/item/ammo_magazine/s45, +/obj/item/ammo_magazine/s45, +/obj/item/ammo_magazine/s45, +/obj/item/ammo_magazine/s45, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -729,11 +728,11 @@ }, /area/centcom/specops) "bh" = ( -/turf/unsimulated/floor/shuttle_ceiling, /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_r"; dir = 8 }, +/turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/specops/centcom{ base_turf = /turf/unsimulated/floor/shuttle_ceiling @@ -869,7 +868,9 @@ /area/centcom/specops) "bn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box, +/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced, /obj/item/device/healthanalyzer/advanced, /turf/unsimulated/floor{ icon_state = "vault"; @@ -962,12 +963,14 @@ /area/centcom/specops) "bu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon/recharge, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1043,20 +1046,7 @@ }, /area/centcom/specops) "bB" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/storage/pill_bottle/tramadol, -/obj/item/weapon/storage/pill_bottle/tramadol, -/obj/item/weapon/storage/pill_bottle/tramadol, -/obj/item/weapon/storage/pill_bottle/dylovene, -/obj/item/weapon/storage/pill_bottle/dylovene, -/obj/item/weapon/storage/pill_bottle/dylovene, -/obj/item/weapon/storage/pill_bottle/dermaline, -/obj/item/weapon/storage/pill_bottle/dermaline, -/obj/item/weapon/storage/pill_bottle/dermaline, -/obj/item/weapon/storage/pill_bottle/spaceacillin, -/obj/item/weapon/storage/pill_bottle/dexalin_plus, -/obj/item/weapon/storage/pill_bottle/dexalin_plus, -/obj/item/weapon/storage/pill_bottle/dexalin_plus, +/obj/machinery/vending/medical, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -1082,7 +1072,6 @@ /obj/item/weapon/storage/belt/medical/emt, /obj/item/weapon/storage/belt/medical/emt, /obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/healthanalyzer/advanced, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -1118,7 +1107,6 @@ /obj/item/weapon/storage/backpack/dufflebag/syndie/med, /obj/item/weapon/storage/backpack/dufflebag/syndie/med, /obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -1491,6 +1479,12 @@ /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, +/obj/item/clothing/accessory/storage/black_drop_pouches, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1641,14 +1635,26 @@ pixel_y = 3 }, /obj/structure/table/steel_reinforced, +/obj/item/stack/rods, +/obj/item/stack/rods, +/obj/item/stack/material/glass/phoronglass, +/obj/item/stack/material/glass/phoronglass, +/obj/item/stack/rods, +/obj/item/stack/rods, /turf/unsimulated/floor{ icon_state = "dark" }, /area/centcom/specops) "cy" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, +/obj/item/weapon/storage/box/survival/comp, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1765,13 +1771,11 @@ /area/centcom/specops) "cM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, -/obj/item/weapon/cell/high, /obj/effect/floor_decal/industrial/outline/blue, +/obj/item/weapon/cell/recharging, +/obj/item/weapon/cell/recharging, +/obj/item/weapon/cell/recharging, +/obj/item/weapon/cell/recharging, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1838,8 +1842,6 @@ /area/centcom/specops) "cT" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/stunrevolver, -/obj/item/weapon/gun/energy/stunrevolver, /obj/item/device/flash, /obj/item/device/flash, /obj/item/clothing/accessory/storage/brown_vest, @@ -1848,6 +1850,14 @@ /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, /obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/brown_drop_pouches, +/obj/item/clothing/accessory/storage/brown_drop_pouches, +/obj/item/clothing/accessory/storage/brown_drop_pouches, +/obj/item/clothing/accessory/storage/brown_drop_pouches, +/obj/item/clothing/accessory/storage/brown_drop_pouches, +/obj/item/clothing/accessory/storage/brown_drop_pouches, +/obj/item/weapon/gun/energy/gun/martin, +/obj/item/weapon/gun/energy/gun/martin, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1957,9 +1967,10 @@ /area/centcom/specops) "dc" = ( /obj/structure/table/rack, -/obj/item/rig_module/grenade_launcher, -/obj/item/rig_module/grenade_launcher, /obj/effect/floor_decal/industrial/outline/blue, +/obj/item/rig_module/rescue_pharm, +/obj/item/rig_module/sprinter, +/obj/item/rig_module/sprinter, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -16792,6 +16803,48 @@ icon_state = "white" }, /area/centcom/medical) +"Ez" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"JC" = ( +/obj/machinery/power/thermoregulator, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"JF" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"Nt" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"OD" = ( +/obj/machinery/power/port_gen/pacman, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) "Rc" = ( /obj/structure/table/glass, /obj/item/device/defib_kit/compact/loaded, @@ -16799,6 +16852,45 @@ icon_state = "white" }, /area/centcom/medical) +"Re" = ( +/obj/structure/table/reinforced, +/obj/item/device/perfect_tele, +/obj/item/device/binoculars, +/obj/item/device/survivalcapsule, +/obj/item/device/survivalcapsule, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"UC" = ( +/obj/structure/table/steel_reinforced, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"Xa" = ( +/obj/machinery/space_heater, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) +"XA" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/smes_coil, +/obj/item/weapon/smes_coil, +/obj/item/device/t_scanner/advanced, +/obj/item/device/t_scanner/advanced, +/obj/item/stack/material/phoron, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) (1,1,1) = {" aa @@ -30333,8 +30425,8 @@ aX aX aX cg -aG -aG +Nt +JF aG cS dm @@ -30617,7 +30709,7 @@ aX aX aX cg -aG +UC cx cH cU @@ -30759,7 +30851,7 @@ aX aX aX cg -aG +XA cy cI cV @@ -30901,7 +30993,7 @@ aX aX aX cg -aG +OD cz cJ cJ @@ -31043,7 +31135,7 @@ aX aX aX cg -aG +Xa cA cK cK @@ -31185,7 +31277,7 @@ bX aX ce ah -aG +JC cA cL cL @@ -31469,7 +31561,7 @@ aX aX aX ah -aG +Ez cB cM cW @@ -33031,7 +33123,7 @@ aX aX aX ah -aG +Re cC cN dh diff --git a/vorestation.dme b/vorestation.dme index b348bd23b28..297177d2181 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1149,6 +1149,7 @@ #include "code\game\objects\items\weapons\storage\briefcase.dm" #include "code\game\objects\items\weapons\storage\fancy.dm" #include "code\game\objects\items\weapons\storage\firstaid.dm" +#include "code\game\objects\items\weapons\storage\firstaid_vr.dm" #include "code\game\objects\items\weapons\storage\internal.dm" #include "code\game\objects\items\weapons\storage\laundry_basket.dm" #include "code\game\objects\items\weapons\storage\lockbox.dm" @@ -2444,6 +2445,7 @@ #include "code\modules\power\antimatter\shielding.dm" #include "code\modules\power\cells\device_cells.dm" #include "code\modules\power\cells\power_cells.dm" +#include "code\modules\power\cells\power_cells_vr.dm" #include "code\modules\power\fusion\_setup.dm" #include "code\modules\power\fusion\fusion_circuits.dm" #include "code\modules\power\fusion\fusion_particle_catcher.dm" @@ -2605,6 +2607,7 @@ #include "code\modules\reagents\reagent_containers\hypospray.dm" #include "code\modules\reagents\reagent_containers\hypospray_vr.dm" #include "code\modules\reagents\reagent_containers\pill.dm" +#include "code\modules\reagents\reagent_containers\pill_vr.dm" #include "code\modules\reagents\reagent_containers\spray.dm" #include "code\modules\reagents\reagent_containers\spray_vr.dm" #include "code\modules\reagents\reagent_containers\syringes.dm" From 0448088965044d18cc624c7a6ae912797c4b9ccf Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 10 Oct 2018 19:55:09 -0400 Subject: [PATCH 2/5] Feedback Changes 1 --- maps/tether/tether-10-colony.dmm | 87 +++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 13 deletions(-) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 8284b673547..e75de29e1dc 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -199,6 +199,7 @@ /obj/item/weapon/gun/energy/gun/nuclear, /obj/item/weapon/gun/energy/gun/nuclear, /obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -413,6 +414,18 @@ /area/centcom/specops) "aI" = ( /obj/structure/closet/crate/medical, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, +/obj/item/weapon/reagent_containers/food/snacks/liquidfood, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -963,14 +976,26 @@ /area/centcom/specops) "bu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, -/obj/item/weapon/cell/device/weapon/recharge, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -1059,6 +1084,10 @@ pixel_y = 2 }, /obj/item/weapon/storage/box/bodybags, +/obj/item/weapon/extinguisher/mini, +/obj/item/weapon/extinguisher/mini, +/obj/item/weapon/extinguisher/mini, +/obj/item/weapon/extinguisher/mini, /turf/unsimulated/floor{ icon_state = "vault"; dir = 5 @@ -1772,10 +1801,18 @@ "cM" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/outline/blue, -/obj/item/weapon/cell/recharging, -/obj/item/weapon/cell/recharging, -/obj/item/weapon/cell/recharging, -/obj/item/weapon/cell/recharging, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, +/obj/item/weapon/cell/hyper, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -16821,6 +16858,30 @@ icon_state = "dark" }, /area/centcom/specops) +"EJ" = ( +/obj/structure/table/rack, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/turf/unsimulated/floor{ + icon_state = "dark" + }, +/area/centcom/specops) "JC" = ( /obj/machinery/power/thermoregulator, /turf/unsimulated/floor{ @@ -31695,7 +31756,7 @@ ac ah aq aG -aG +EJ aG bI ah From 7ca817d0c8f2dd80464d5ae9be8d0a70ed0a1c60 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 12 Oct 2018 20:59:29 -0400 Subject: [PATCH 3/5] I messed up copypasta and forgot to change iron to nutriment --- code/modules/reagents/reagent_containers/pill_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index 19cc89c669a..354a13f70a8 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -3,6 +3,6 @@ desc = "Used to feed people on the field. Contains 30 units of Nutriment." icon_state = "pill6" -/obj/item/weapon/reagent_containers/pill/iron/New() +/obj/item/weapon/reagent_containers/pill/nutriment/New() ..() reagents.add_reagent("nutriment", 30) From 27724a697a9505c50ea66b100cdefba5f9c43f10 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 12 Oct 2018 21:19:31 -0400 Subject: [PATCH 4/5] Removes recharging high capacity Not really motivated to make a new icon.... This is not used anywhere anyway. --- code/modules/power/cells/power_cells_vr.dm | 7 ------- vorestation.dme | 1 - 2 files changed, 8 deletions(-) delete mode 100644 code/modules/power/cells/power_cells_vr.dm diff --git a/code/modules/power/cells/power_cells_vr.dm b/code/modules/power/cells/power_cells_vr.dm deleted file mode 100644 index 43d4f1ca160..00000000000 --- a/code/modules/power/cells/power_cells_vr.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/item/weapon/cell/recharging - name = "recharging high-capacity power cell" - origin_tech = null - icon_state = "icell" - maxcharge = 10000 - matter = null - self_recharge = TRUE diff --git a/vorestation.dme b/vorestation.dme index 297177d2181..5a5c33b66f7 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2445,7 +2445,6 @@ #include "code\modules\power\antimatter\shielding.dm" #include "code\modules\power\cells\device_cells.dm" #include "code\modules\power\cells\power_cells.dm" -#include "code\modules\power\cells\power_cells_vr.dm" #include "code\modules\power\fusion\_setup.dm" #include "code\modules\power\fusion\fusion_circuits.dm" #include "code\modules\power\fusion\fusion_particle_catcher.dm" From deb4c59e7807ed65555edee7b7f47af77fae10c1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 16 Oct 2018 19:11:43 -0400 Subject: [PATCH 5/5] Moves the 9mm pistols to an existing rack --- maps/tether/tether-10-colony.dmm | 38 +++++++++++--------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index e75de29e1dc..52b0d9a3934 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -718,6 +718,18 @@ /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, /obj/item/ammo_magazine/s45, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/weapon/gun/projectile/p92x, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -16858,30 +16870,6 @@ icon_state = "dark" }, /area/centcom/specops) -"EJ" = ( -/obj/structure/table/rack, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/weapon/gun/projectile/p92x, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/turf/unsimulated/floor{ - icon_state = "dark" - }, -/area/centcom/specops) "JC" = ( /obj/machinery/power/thermoregulator, /turf/unsimulated/floor{ @@ -31756,7 +31744,7 @@ ac ah aq aG -EJ +aG aG bI ah