diff --git a/code/modules/clothing/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm index c3e9b4ccb1..ce3875a3f1 100644 --- a/code/modules/clothing/spacesuits/void/military_vr.dm +++ b/code/modules/clothing/spacesuits/void/military_vr.dm @@ -13,20 +13,15 @@ slowdown = 1.5 armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) -/obj/item/clothing/head/helmet/space/void/merc/prototype - name = "\improper prototype voidsuit helmet" +/obj/item/clothing/head/helmet/space/void/security/prototype + name = "\improper security prototype voidsuit helmet" desc = "A special helmet designed for work in a hazardous, low pressure environment. It's a little ostentatious, but it gets the job done." icon_state = "hosproto" - armor = list(melee = 50, bullet = 25, laser = 25, energy = 5, bomb = 45, bio = 100, rad = 10) - siemens_coefficient = 0.7 -/obj/item/clothing/suit/space/void/merc/prototype - name = "\improper prototype voidsuit" +/obj/item/clothing/suit/space/void/security/prototype + name = "\improper security prototype voidsuit" desc = "A special suit that protects against hazardous, low pressure environments. It's a little ostentatious, but it gets the job done." icon_state = "hosproto_void" - armor = list(melee = 50, bullet = 25, laser = 25, energy = 5, bomb = 45, bio = 100, rad = 10) - allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton) - siemens_coefficient = 0.7 /obj/item/clothing/head/helmet/space/void/merc/odst name = "\improper ODST Helmet" diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 3cb28d9c5e..c24589d762 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -29527,10 +29527,6 @@ /obj/structure/filingcabinet, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"fyi" = ( -/obj/machinery/suit_cycler/prototype, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) "fyN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -30464,29 +30460,6 @@ /obj/machinery/atmospherics/binary/pump/fuel, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/engines) -"kuU" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, -/obj/machinery/door/window/brigdoor/eastleft{ - name = "Protosuit Storage"; - req_access = list(58) - }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/merc/prototype, -/obj/item/clothing/head/helmet/space/void/merc/prototype, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) "kAC" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/security{ @@ -31482,6 +31455,29 @@ }, /turf/simulated/wall/rshull, /area/shuttle/securiship/engines) +"prO" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/item/clothing/shoes/magboots, +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/oxygen, +/obj/machinery/door/window/brigdoor/eastleft{ + name = "Protosuit Storage"; + req_access = list(58) + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/security/prototype, +/obj/item/clothing/head/helmet/space/void/security/prototype, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "psg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -32513,6 +32509,10 @@ }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) +"vxy" = ( +/obj/machinery/suit_cycler/prototype, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "vAP" = ( /obj/item/device/flashlight/lamp, /obj/structure/table/steel, @@ -37142,8 +37142,8 @@ aje aLS aWH aUk -fyi -kuU +vxy +prO anD anW aTO