diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 297ba244426..58251caa222 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -1068,6 +1068,22 @@ if("Gem-Encrusted" || "Wizard") parent_helmet = /obj/item/clothing/head/helmet/space/void/wizard parent_suit = /obj/item/clothing/suit/space/void/wizard + //Special or Event suits + if("Vintage Crew") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb + parent_suit = /obj/item/clothing/suit/space/void/refurb + if("Vintage Engineering") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering + parent_suit = /obj/item/clothing/suit/space/void/refurb/engineering + if("Vintage Medical") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical + parent_suit = /obj/item/clothing/suit/space/void/refurb/medical + if("Vintage Marine") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/marine + parent_suit = /obj/item/clothing/suit/space/void/refurb/marine + if("Vintage Officer") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer + parent_suit = /obj/item/clothing/suit/space/void/refurb/officer //BEGIN: Space for additional downstream variants //VOREStation Addition Start if("Director") @@ -1076,6 +1092,21 @@ if("Prototype") parent_helmet = /obj/item/clothing/head/helmet/space/void/merc/prototype parent_suit = /obj/item/clothing/suit/space/void/merc/prototype + if("Talon Crew") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/talon + if("Talon Engineering") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/engineering/talon + if("Talon Medical") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/medical/talon + if("Talon Marine") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/marine/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/marine/talon + if("Talon Officer") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer/talon + parent_suit = /obj/item/clothing/suit/space/void/refurb/officer/talon //VOREStation Addition End //END: downstream variant space diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index a3005b45028..610ea31ed24 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -29,3 +29,42 @@ /obj/machinery/suit_cycler/prototype/Initialize() //No Teshari Sprites species -= SPECIES_TESHARI return ..() + +/obj/machinery/suit_cycler/vintage + name = "Vintage suit cycler" + model_text = "Vintage" + departments = list("Vintage Crew","Vintage Engineering","Vintage Marine","Vintage Medical","Vintage Officer") + +/obj/machinery/suit_cycler/vintage/Initialize() //No Teshari Sprites + species -= SPECIES_TESHARI + return ..() + +/obj/machinery/suit_cycler/vintage/tcrew + name = "Talon crew suit cycler" + model_text = "Talon crew" + req_access = list(access_talon) + departments = list("Talon Crew") + +/obj/machinery/suit_cycler/vintage/tengi + name = "Talon engineer suit cycler" + model_text = "Talon engineer" + req_access = list(access_talon) + departments = list("Talon Engineering") + +/obj/machinery/suit_cycler/vintage/tguard + name = "Talon guard suit cycler" + model_text = "Talon guard" + req_access = list(access_talon) + departments = list("Talon Marine") + +/obj/machinery/suit_cycler/vintage/tmedic + name = "Talon doctor suit cycler" + model_text = "Talon doctor" + req_access = list(access_talon) + departments = list("Talon Medical") + +/obj/machinery/suit_cycler/vintage/tcaptain + name = "Talon captain suit cycler" + model_text = "Talon captain" + req_access = list(access_talon) + departments = list("Talon Officer") \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm new file mode 100644 index 00000000000..8b46a5a740a --- /dev/null +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -0,0 +1,208 @@ +//Refurbished Set +//Voidsuits from old Terran exploration vessels and naval ships. + +//Standard Crewsuit (GRAY) +//Nothing really special here. Some light resists for mostly-non-combat purposes. The rad protection ain't bad? +//The reduced slowdown is an added bonus - something to make it worth considering using if you do find it. +/obj/item/clothing/head/helmet/space/void/refurb + name = "vintage crewman's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one is devoid of any identifying markings or rank indicators." + icon_state = "rig0-vintagecrew" + icon = 'icons/obj/clothing/helmets_vr.dmi' + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + light_overlay = "helmet_light" + sprite_sheets = list( + SPECIES_HUMAN = 'icons/mob/helmet_vr.dmi', + SPECIES_TAJ = 'icons/mob/species/tajaran/helmet_vr.dmi', + SPECIES_SKRELL = 'icons/mob/species/skrell/helmet_vr.dmi', + SPECIES_UNATHI = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_AKULA = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_SERGAL = 'icons/mob/species/unathi/helmet_vr.dmi', + SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet_vr.dmi', + SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet_vr.dmi' + ) + sprite_sheets_obj = list( + SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/helmets_vr.dmi', // Copied from void.dm + SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/helmets_vr.dmi', // Copied from void.dm + SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', // Copied from void.dm + SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', + SPECIES_AKULA = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', + SPECIES_SERGAL = 'icons/obj/clothing/species/unathi/helmets_vr.dmi', + SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/helmets_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/helmets_vr.dmi', + SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/helmets_vr.dmi' + ) + sprite_sheets_refit = list() //have to nullify this as well just to be thorough + +/obj/item/clothing/suit/space/void/refurb + name = "vintage crewman's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one is devoid of any identifying markings or rank indicators." + icon_state = "rig-vintagecrew" + icon = 'icons/obj/clothing/spacesuits_vr.dmi' + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 0.5 + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/storage/briefcase/inflatable, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel + ) + sprite_sheets = list( + SPECIES_HUMAN = 'icons/mob/spacesuit_vr.dmi', + SPECIES_TAJ = 'icons/mob/species/tajaran/suit_vr.dmi', + SPECIES_SKRELL = 'icons/mob/species/skrell/suit_vr.dmi', + SPECIES_UNATHI = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_AKULA = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_SERGAL = 'icons/mob/species/unathi/suit_vr.dmi', + SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit_vr.dmi', + SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit_vr.dmi' + ) + sprite_sheets_obj = list( + SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/spacesuits_vr.dmi', // Copied from void.dm + SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/spacesuits_vr.dmi', // Copied from void.dm + SPECIES_UNATHI = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', // Copied from void.dm + SPECIES_XENOHYBRID = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', + SPECIES_AKULA = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', + SPECIES_SERGAL = 'icons/obj/clothing/species/unathi/spacesuits_vr.dmi', + SPECIES_VULPKANIN = 'icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi', + SPECIES_ZORREN_HIGH = 'icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi', + SPECIES_FENNEC = 'icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi' + ) + +//Engineering Crewsuit (ORANGE, RING) +//This is probably the most appealing to get your hands on for basic protection and the specialist stuff +//Don't expect it to stand up to modern assault/laser rifles, but it'll make you a fair bit tougher against most low-end pistols and SMGs +/obj/item/clothing/head/helmet/space/void/refurb/engineering + name = "vintage engineering voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular seems to be an ode to the Ship of Theseus, but the insulation and radiation proofing are top-notch, and it has several oily stains that seem to be impossible to scrub off." + icon_state = "rig0-vintageengi" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 40, bullet = 20, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 100) + min_pressure_protection = 0 * ONE_ATMOSPHERE + max_pressure_protection = 15 * ONE_ATMOSPHERE + max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + +/obj/item/clothing/suit/space/void/refurb/engineering + name = "vintage engineering voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular seems to be an ode to the Ship of Theseus, but the insulation and radiation proofing are top-notch. The chestplate bears the logo of an old shipyard - though you don't recognize the name." + icon_state = "rig-vintageengi" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1 + armor = list(melee = 40, bullet = 20, laser = 20, energy = 5, bomb = 35, bio = 100, rad = 100) + min_pressure_protection = 0 * ONE_ATMOSPHERE + max_pressure_protection = 15 * ONE_ATMOSPHERE + max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/device/t_scanner, + /obj/item/weapon/rcd, + /obj/item/weapon/rcd_ammo, + /obj/item/weapon/storage/toolbox, + /obj/item/weapon/storage/briefcase/inflatable, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/tool, + /obj/item/weapon/weldingtool, + /obj/item/weapon/cell, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel + ) + +//Medical Crewsuit (GREEN, CROSS) +//This thing is basically tissuepaper, but it has very solid rad protection for its age +//It also has the bonus of not slowing you down quite as much as other suits, same as the crew suit +/obj/item/clothing/head/helmet/space/void/refurb/medical + name = "vintage medical voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. The green and white markings indicate this as a medic's suit." + icon_state = "rig0-vintagemedic" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 30, bullet = 15, laser = 15, energy = 5, bomb = 25, bio = 100, rad = 75) + +/obj/item/clothing/suit/space/void/refurb/medical + name = "vintage medical voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. The green and white markings indicate this as a medic's suit." + icon_state = "rig-vintagemedic" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 0.5 + armor = list(melee = 30, bullet = 15, laser = 15, energy = 5, bomb = 25, bio = 100, rad = 75) + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/storage/firstaid, + /obj/item/device/healthanalyzer, + /obj/item/stack/medical, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/cell + ) + +//Marine Crewsuit (BLUE, SHIELD) +//Really solid, balance between Sec and Sec EVA, but it has slightly worse shock protection +/obj/item/clothing/head/helmet/space/void/refurb/marine + name = "vintage marine's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. The blue markings indicate this as the marine/guard variant, likely from a merchant ship." + icon_state = "rig0-vintagemarine" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 40, bullet = 35, laser = 35, energy = 5, bomb = 40, bio = 100, rad = 50) + siemens_coefficient = 0.8 + +/obj/item/clothing/suit/space/void/refurb/marine + name = "vintage marine's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer marines swear by these old things, even if new powered hardsuits have more features and better armor. The blue markings indicate this as the marine/guard variant, likely from a merchant ship." + icon_state = "rig-vintagemarine" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1 + armor = list(melee = 40, bullet = 35, laser = 35, energy = 5, bomb = 40, bio = 100, rad = 50) + siemens_coefficient = 0.8 + allowed = list(/obj/item/weapon/gun, + /obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/melee, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/handcuffs, + /obj/item/ammo_magazine, + /obj/item/weapon/cell + ) + +//Officer Crewsuit (GOLD, X) +//The best of the bunch - at the time, this would have been almost cutting edge +//Now it's good, but it's badly outclassed by the hot shit that the TSCs and such can get +/obj/item/clothing/head/helmet/space/void/refurb/officer + name = "vintage officer's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This variant appears to be an officer's, and has the best protection of all the old models." + icon_state = "rig0-vintageofficer" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 50, bullet = 45, laser = 45, energy = 10, bomb = 30, bio = 100, rad = 60) + siemens_coefficient = 0.7 + +/obj/item/clothing/suit/space/void/refurb/officer + name = "vintage officer's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This variant appears to be an officer's, and has the best protection of all the old models." + icon_state = "rig-vintageofficer" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1 + armor = list(melee = 50, bullet = 45, laser = 45, energy = 10, bomb = 30, bio = 100, rad = 60) + siemens_coefficient = 0.7 + allowed = list(/obj/item/weapon/gun, + /obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/melee, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/handcuffs, + /obj/item/ammo_magazine, + /obj/item/weapon/cell + ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm new file mode 100644 index 00000000000..2a49229d0aa --- /dev/null +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -0,0 +1,40 @@ +/obj/item/clothing/head/helmet/space/void/refurb/talon + name = "talon pilot's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one belongs to the ship's pilot." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/talon + name = "talon pilot's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one belongs to the ship's pilot." + +/obj/item/clothing/head/helmet/space/void/refurb/engineering/talon + name = "talon engineering voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular must be several decades old, but the insulation and radiation proofing are top-notch. Don't mind the grease marks." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/engineering/talon + name = "talon engineering voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. This one in particular must be several decades old, but the insulation and radiation proofing are top-notch. The chestplate has a simple gear logo on it." + +/obj/item/clothing/head/helmet/space/void/refurb/medical/talon + name = "talon medical voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/medical/talon + name = "talon medical voidsuit" + +/obj/item/clothing/head/helmet/space/void/refurb/marine/talon + name = "talon marine's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. The blue markings indicate this as the marine/guard variant." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/marine/talon + name = "talon marine's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer marines swear by these old things, even if new powered hardsuits have more features and better armor. The blue markings indicate this as the marine/guard variant." + +/obj/item/clothing/head/helmet/space/void/refurb/officer/talon + name = "talon officer's voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/officer/talon + name = "talon officer's voidsuit" \ No newline at end of file diff --git a/icons/mob/helmet_vr.dmi b/icons/mob/helmet_vr.dmi new file mode 100644 index 00000000000..b7b5c6d059a Binary files /dev/null and b/icons/mob/helmet_vr.dmi differ diff --git a/icons/mob/spacesuit_vr.dmi b/icons/mob/spacesuit_vr.dmi new file mode 100644 index 00000000000..2f2ead49f52 Binary files /dev/null and b/icons/mob/spacesuit_vr.dmi differ diff --git a/icons/mob/species/skrell/helmet_vr.dmi b/icons/mob/species/skrell/helmet_vr.dmi new file mode 100644 index 00000000000..022e89e36af Binary files /dev/null and b/icons/mob/species/skrell/helmet_vr.dmi differ diff --git a/icons/mob/species/skrell/suit_vr.dmi b/icons/mob/species/skrell/suit_vr.dmi new file mode 100644 index 00000000000..e83e21639d6 Binary files /dev/null and b/icons/mob/species/skrell/suit_vr.dmi differ diff --git a/icons/mob/species/tajaran/helmet_vr.dmi b/icons/mob/species/tajaran/helmet_vr.dmi new file mode 100644 index 00000000000..8f6f5b2d828 Binary files /dev/null and b/icons/mob/species/tajaran/helmet_vr.dmi differ diff --git a/icons/mob/species/tajaran/suit_vr.dmi b/icons/mob/species/tajaran/suit_vr.dmi new file mode 100644 index 00000000000..c7608880c43 Binary files /dev/null and b/icons/mob/species/tajaran/suit_vr.dmi differ diff --git a/icons/mob/species/unathi/helmet_vr.dmi b/icons/mob/species/unathi/helmet_vr.dmi new file mode 100644 index 00000000000..4c17114730f Binary files /dev/null and b/icons/mob/species/unathi/helmet_vr.dmi differ diff --git a/icons/mob/species/unathi/suit_vr.dmi b/icons/mob/species/unathi/suit_vr.dmi new file mode 100644 index 00000000000..0516cfbac22 Binary files /dev/null and b/icons/mob/species/unathi/suit_vr.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet_vr.dmi b/icons/mob/species/vulpkanin/helmet_vr.dmi new file mode 100644 index 00000000000..5b422f8ccf7 Binary files /dev/null and b/icons/mob/species/vulpkanin/helmet_vr.dmi differ diff --git a/icons/mob/species/vulpkanin/suit_vr.dmi b/icons/mob/species/vulpkanin/suit_vr.dmi new file mode 100644 index 00000000000..a8836a5a6e2 Binary files /dev/null and b/icons/mob/species/vulpkanin/suit_vr.dmi differ diff --git a/icons/obj/clothing/helmets_vr.dmi b/icons/obj/clothing/helmets_vr.dmi new file mode 100644 index 00000000000..f635aae9606 Binary files /dev/null and b/icons/obj/clothing/helmets_vr.dmi differ diff --git a/icons/obj/clothing/spacesuits_vr.dmi b/icons/obj/clothing/spacesuits_vr.dmi new file mode 100644 index 00000000000..1b3beadd977 Binary files /dev/null and b/icons/obj/clothing/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/skrell/helmets_vr.dmi b/icons/obj/clothing/species/skrell/helmets_vr.dmi new file mode 100644 index 00000000000..df9fbceaa2b Binary files /dev/null and b/icons/obj/clothing/species/skrell/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/skrell/spacesuits_vr.dmi b/icons/obj/clothing/species/skrell/spacesuits_vr.dmi new file mode 100644 index 00000000000..65106106341 Binary files /dev/null and b/icons/obj/clothing/species/skrell/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/tajaran/helmets_vr.dmi b/icons/obj/clothing/species/tajaran/helmets_vr.dmi new file mode 100644 index 00000000000..a7de0471a50 Binary files /dev/null and b/icons/obj/clothing/species/tajaran/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/tajaran/spacesuits_vr.dmi b/icons/obj/clothing/species/tajaran/spacesuits_vr.dmi new file mode 100644 index 00000000000..f505178f3d5 Binary files /dev/null and b/icons/obj/clothing/species/tajaran/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/unathi/helmets_vr.dmi b/icons/obj/clothing/species/unathi/helmets_vr.dmi new file mode 100644 index 00000000000..d311c427ae0 Binary files /dev/null and b/icons/obj/clothing/species/unathi/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/unathi/spacesuits_vr.dmi b/icons/obj/clothing/species/unathi/spacesuits_vr.dmi new file mode 100644 index 00000000000..cbe2998f16e Binary files /dev/null and b/icons/obj/clothing/species/unathi/spacesuits_vr.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/helmets_vr.dmi b/icons/obj/clothing/species/vulpkanin/helmets_vr.dmi new file mode 100644 index 00000000000..cf561b831c9 Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/helmets_vr.dmi differ diff --git a/icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi b/icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi new file mode 100644 index 00000000000..e2b68e09619 Binary files /dev/null and b/icons/obj/clothing/species/vulpkanin/spacesuits_vr.dmi differ diff --git a/maps/tether/submaps/offmap/talon.dm b/maps/tether/submaps/offmap/talon.dm index 2324d2ddc17..df12eafbaf8 100644 --- a/maps/tether/submaps/offmap/talon.dm +++ b/maps/tether/submaps/offmap/talon.dm @@ -263,8 +263,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/weapon/melee/telebaton, /obj/item/device/flash, /obj/item/device/radio/headset/talon, - /obj/item/clothing/head/helmet/space/void/captain/talon, - /obj/item/clothing/suit/space/void/captain/talon, + /obj/item/clothing/head/helmet/space/void/refurb/officer/talon, + /obj/item/clothing/suit/space/void/refurb/officer/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/command/taloncap @@ -295,8 +295,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/weapon/storage/belt/security, /obj/item/device/radio/headset/talon, /obj/item/clothing/accessory/solgov/department/security/marine, - /obj/item/clothing/head/helmet/space/void/security/talon, - /obj/item/clothing/suit/space/void/security/talon, + /obj/item/clothing/head/helmet/space/void/refurb/marine/talon, + /obj/item/clothing/suit/space/void/refurb/marine/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/security/talonguard @@ -320,8 +320,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/storage/toggle/fr_jacket, /obj/item/clothing/shoes/white, /obj/item/device/radio/headset/talon, - /obj/item/clothing/head/helmet/space/void/medical/talon, - /obj/item/clothing/suit/space/void/medical/talon, + /obj/item/clothing/head/helmet/space/void/refurb/medical/talon, + /obj/item/clothing/suit/space/void/refurb/medical/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/medical/talonmed @@ -347,8 +347,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/mask/gas, /obj/item/taperoll/atmos, /obj/item/weapon/tank/emergency/oxygen/engi, - /obj/item/clothing/head/helmet/space/void/atmos/talon, - /obj/item/clothing/suit/space/void/atmos/talon, + /obj/item/clothing/head/helmet/space/void/refurb/engineering/talon, + /obj/item/clothing/suit/space/void/refurb/engineering/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/engineering/taloneng @@ -373,8 +373,8 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/shoes/boots/jackboots/toeless, /obj/item/device/radio/headset/talon, /obj/item/device/flashlight/color/orange, - /obj/item/clothing/head/helmet/space/void/pilot/talon, - /obj/item/clothing/suit/space/void/pilot/talon, + /obj/item/clothing/head/helmet/space/void/refurb/talon, + /obj/item/clothing/suit/space/void/refurb/talon, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, /obj/item/device/gps/explorer/talonpilot diff --git a/maps/tether/submaps/offmap/talon1.dmm b/maps/tether/submaps/offmap/talon1.dmm index 940a54493e5..4ec9125235b 100644 --- a/maps/tether/submaps/offmap/talon1.dmm +++ b/maps/tether/submaps/offmap/talon1.dmm @@ -3616,9 +3616,7 @@ /area/talon/deckone/brig) "gt" = ( /obj/effect/floor_decal/borderfloor, -/obj/machinery/suit_cycler/security{ - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tguard, /turf/simulated/floor/tiled/steel, /area/talon/deckone/brig) "gu" = ( @@ -5392,10 +5390,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/suit_cycler/engineering{ - name = "Atmospherics suit cycler"; - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tengi, /turf/simulated/floor/tiled/techmaint, /area/talon/deckone/starboard_eng) "jz" = ( @@ -7565,9 +7560,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/talon/deckone/bridge_hallway) "ZU" = ( -/obj/machinery/suit_cycler/medical{ - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tmedic, /turf/simulated/floor/tiled/white, /area/talon/deckone/medical) "ZV" = ( diff --git a/maps/tether/submaps/offmap/talon2.dmm b/maps/tether/submaps/offmap/talon2.dmm index 86b9c3669ff..d5a49f1f1b3 100644 --- a/maps/tether/submaps/offmap/talon2.dmm +++ b/maps/tether/submaps/offmap/talon2.dmm @@ -2355,6 +2355,7 @@ dir = 8; pixel_y = 0 }, +/obj/machinery/suit_cycler/vintage/tengi, /turf/simulated/floor/wood, /area/talon/decktwo/eng_room) "ea" = ( @@ -2410,9 +2411,7 @@ dir = 8; pixel_x = 0 }, -/obj/machinery/suit_cycler/pilot{ - req_access = list(301) - }, +/obj/machinery/suit_cycler/vintage/tcrew, /turf/simulated/floor/wood, /area/talon/decktwo/pilot_room) "eh" = ( @@ -3238,6 +3237,7 @@ dir = 4; pixel_y = 0 }, +/obj/machinery/suit_cycler/vintage/tmedic, /turf/simulated/floor/wood, /area/talon/decktwo/med_room) "fC" = ( @@ -3278,6 +3278,7 @@ dir = 8; pixel_x = 0 }, +/obj/machinery/suit_cycler/vintage/tguard, /turf/simulated/floor/wood, /area/talon/decktwo/sec_room) "fG" = ( @@ -4864,6 +4865,10 @@ }, /turf/simulated/floor/reinforced/airless, /area/talon/maintenance/decktwo_solars) +"nR" = ( +/obj/machinery/suit_cycler/vintage/tcaptain, +/turf/simulated/floor/wood, +/area/talon/decktwo/cap_room) "ol" = ( /obj/structure/sign/poster{ icon_state = ""; @@ -14615,7 +14620,7 @@ ap aC az SU -aM +nR WZ aM bu diff --git a/vorestation.dme b/vorestation.dme index 0d4628499fd..c8b53109d7d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1878,6 +1878,8 @@ #include "code\modules\clothing\spacesuits\rig\suits\robotics.dm" #include "code\modules\clothing\spacesuits\rig\suits\station.dm" #include "code\modules\clothing\spacesuits\rig\suits\station_vr.dm" +#include "code\modules\clothing\spacesuits\void\event.dm" +#include "code\modules\clothing\spacesuits\void\event_vr.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm"