diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index abbf229cac2..ead7eaaf963 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -658,9 +658,30 @@ departments = list("Pilot Blue","Pilot") /obj/machinery/suit_cycler/vintage - name = "Vintage suit cycler" + name = "Vintage Crew suit cycler" model_text = "Vintage" - departments = list("Vintage Crew","Vintage Engineering","Vintage Marine","Vintage Medical","Vintage Officer") + departments = list("Vintage Crew") + req_access = null + +/obj/machinery/suit_cycler/vintage/pilot + name = "Vintage Pilot suit cycler" + model_text = "Vintage Pilot" + departments = list("Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)") + +/obj/machinery/suit_cycler/vintage/medsci + name = "Vintage MedSci suit cycler" + model_text = "Vintage MedSci" + departments = list("Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)") + +/obj/machinery/suit_cycler/vintage/rugged + name = "Vintage Ruggedized suit cycler" + model_text = "Vintage Ruggedized" + departments = list("Vintage Engineering","Vintage Marine","Vintage Officer","Vintage Mercenary") + +/obj/machinery/suit_cycler/vintage/omni + name = "Vintage Master suit cycler" + model_text = "Vintage Master" + departments = list("Vintage Crew","Vintage Engineering","Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)","Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)","Vintage Marine","Vintage Officer","Vintage Mercenary") /obj/machinery/suit_cycler/vintage/Initialize() species -= SPECIES_TESHARI @@ -775,8 +796,13 @@ //Clear the access reqs, disable the safeties, and open up all paintjobs. to_chat(user, "You run the sequencer across the interface, corrupting the operating protocols.") +<<<<<<< HEAD departments = list("Engineering","Mining","Medical","Security","Atmospherics","HAZMAT","Construction","Biohazard","Crowd Control","Security EVA","Emergency Medical Response","^%###^%$", "Charring","Vintage Crew","Vintage Engineering","Vintage Marine","Vintage Medical","Vintage Officer") species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_VULPKANIN) //VORESTATION EDIT +======= + departments = list("Engineering","Mining","Medical","Security","Atmospherics","HAZMAT","Construction","Biohazard","Crowd Control","Security EVA","Emergency Medical Response","^%###^%$", "Charring") + species = list(SPECIES_HUMAN,SPECIES_TAJ,SPECIES_SKRELL,SPECIES_UNATHI, SPECIES_TESHARI) +>>>>>>> 99523da... Vintage Voidsuits Expansion (#7266) emagged = 1 safeties = 0 @@ -1084,7 +1110,10 @@ 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") + if("Vintage Medical (Bubble Helm)") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical/alt + parent_suit = /obj/item/clothing/suit/space/void/refurb/medical + if("Vintage Medical (Closed Helm)") parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/medical parent_suit = /obj/item/clothing/suit/space/void/refurb/medical if("Vintage Marine") @@ -1093,6 +1122,21 @@ if("Vintage Officer") parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/officer parent_suit = /obj/item/clothing/suit/space/void/refurb/officer + if("Vintage Pilot (Bubble Helm)") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/pilot + parent_suit = /obj/item/clothing/suit/space/void/refurb/pilot + if("Vintage Pilot (Closed Helm)") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/pilot/alt + parent_suit = /obj/item/clothing/suit/space/void/refurb/pilot + if("Vintage Research (Bubble Helm)") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/research/alt + parent_suit = /obj/item/clothing/suit/space/void/refurb/research + if("Vintage Research (Closed Helm)") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/research + parent_suit = /obj/item/clothing/suit/space/void/refurb/research + if("Vintage Mercenary") + parent_helmet = /obj/item/clothing/head/helmet/space/void/refurb/mercenary + parent_suit = /obj/item/clothing/suit/space/void/refurb/mercenary //BEGIN: Space for additional downstream variants //VOREStation Addition Start if("Director") diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm index 35a153f5d85..5e68414a330 100644 --- a/code/modules/clothing/spacesuits/void/event.dm +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -62,10 +62,14 @@ /obj/item/weapon/storage/briefcase/inflatable, /obj/item/device/gps, /obj/item/device/radio/beacon, + /obj/item/device/robotanalyzer, + /obj/item/device/geiger, /obj/item/weapon/tool, /obj/item/weapon/weldingtool, /obj/item/weapon/cell, /obj/item/weapon/pickaxe, + /obj/item/device/measuring_tape, + /obj/item/device/lightreplacer, /obj/item/weapon/shovel ) @@ -79,6 +83,11 @@ 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/head/helmet/space/void/refurb/medical/alt + name = "vintage medical voidsuit bubble 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 on this model has been expanded to the full bubble design to improve visibility. Wouldn't want to lose a scalpel in someone's abdomen because your visor fogged over!" + icon_state = "rig0-vintagepilot" + /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." @@ -91,6 +100,9 @@ /obj/item/device/suit_cooling_unit, /obj/item/weapon/storage/firstaid, /obj/item/device/healthanalyzer, + /obj/item/device/robotanalyzer, + /obj/item/device/mass_spectrometer, + /obj/item/device/halogen_counter, /obj/item/stack/medical, /obj/item/device/gps, /obj/item/device/radio/beacon, @@ -120,9 +132,14 @@ /obj/item/weapon/tank, /obj/item/device/suit_cooling_unit, /obj/item/weapon/melee, + /obj/item/weapon/grenade, + /obj/item/device/flash, /obj/item/device/gps, /obj/item/device/radio/beacon, /obj/item/weapon/handcuffs, + /obj/item/device/hailer, + /obj/item/device/holowarrant, + /obj/item/device/megaphone, /obj/item/ammo_magazine, /obj/item/weapon/cell ) @@ -151,9 +168,130 @@ /obj/item/weapon/tank, /obj/item/device/suit_cooling_unit, /obj/item/weapon/melee, + /obj/item/weapon/grenade, + /obj/item/device/flash, /obj/item/device/gps, /obj/item/device/radio/beacon, /obj/item/weapon/handcuffs, + /obj/item/device/hailer, + /obj/item/device/holowarrant, + /obj/item/device/megaphone, /obj/item/ammo_magazine, /obj/item/weapon/cell ) + +//Pilot Crewsuit (ROYAL BLUE, I) +//The lightest weight of the lot, but protection is about the same as the crew variant's. It has an extra helmet variant for those who prefer that design. +/obj/item/clothing/head/helmet/space/void/refurb/pilot + name = "vintage pilot's voidsuit bubble 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 standard pilot model has a nice clear bubble helmet that doesn't fog up easily and has much better visibility, at the cost of relatively poor protection." + icon_state = "rig0-vintagepilot" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 25, bullet = 20, laser = 20, energy = 5, bomb = 20, bio = 100, rad = 50) + siemens_coefficient = 0.9 + +//fluff alt-variant helmet, no changes to protection or anything despite the desc (and it wouldn't matter unless you found a base-type since armor values aren't transferred during refits) +/obj/item/clothing/head/helmet/space/void/refurb/pilot/alt + name = "vintage pilot's voidsuit helmet" + desc = "For pilots who don't like the increased fracture vulnerability of the huge visor, overrides exist in certain cyclers that allow pilots to use the conventional helmet design. It's a little more claustrophobic, but some find the all-round protection to be worth the loss in visibility." + icon_state = "rig0-vintagepilotalt" + +/obj/item/clothing/suit/space/void/refurb/pilot + name = "vintage 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. The royal blue markings indicate this is the pilot's variant; low protection but ultra-lightweight." + icon_state = "rig-vintagepilot" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 0.25 + armor = list(melee = 25, bullet = 20, laser = 20, energy = 5, bomb = 20, bio = 100, rad = 50) + siemens_coefficient = 0.9 + 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, + ) + +//Scientist Crewsuit (PURPLE, O) +//Baseline values are slightly worse than the gray crewsuit, but it has significantly better Energy protection and is the only other suit with 100% rad immunity besides the engi suit +/obj/item/clothing/head/helmet/space/void/refurb/research + name = "vintage research 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 purple markings indicate this as a scientist's helmet. Got your crowbar handy?" + icon_state = "rig0-vintagescientist" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 25, bullet = 10, laser = 10, energy = 50, bomb = 10, bio = 100, rad = 100) + siemens_coefficient = 0.8 + +/obj/item/clothing/head/helmet/space/void/refurb/research/alt + name = "vintage research voidsuit bubble 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 version has been refitted with the distinctive bubble design to increase visibility, so that you can see what you're sciencing better!" + icon_state = "rig0-vintagepilot" + +/obj/item/clothing/suit/space/void/refurb/research + name = "vintage research 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 purple markings indicate this as a scientist's suit. Keep your eyes open for ropes." + icon_state = "rig-vintagescientist" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 0.5 + armor = list(melee = 25, bullet = 10, laser = 10, energy = 50, bomb = 10, bio = 100, rad = 100) + siemens_coefficient = 0.8 + 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/device/gps, + /obj/item/device/radio/beacon, + /obj/item/device/ano_scanner, + /obj/item/device/depth_scanner, + /obj/item/device/xenoarch_multi_tool, + /obj/item/device/measuring_tape, + /obj/item/device/reagent_scanner, + /obj/item/device/robotanalyzer, + /obj/item/device/analyzer, + /obj/item/device/cataloguer, + /obj/item/device/universal_translator, + /obj/item/weapon/tool/crowbar, + /obj/item/stack/marker_beacon, + /obj/item/stack/flag, + /obj/item/weapon/clipboard, + /obj/item/weapon/cell + ) + +//Mercenary Crewsuit (RED, CROSS) +//The best of the best, this should be ultra-rare +/obj/item/clothing/head/helmet/space/void/refurb/mercenary + name = "vintage mercenary 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 red markings indicate this as the mercenary variant. The company ID has been scratched off." + icon_state = "rig0-vintagemerc" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 55, bullet = 45, laser = 45, energy = 25, bomb = 50, bio = 100, rad = 50) + siemens_coefficient = 0.6 + +/obj/item/clothing/suit/space/void/refurb/mercenary + name = "vintage mercenary 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 mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. The company ID has been scratched off." + icon_state = "rig-vintagemerc" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + slowdown = 1.5 //the tradeoff for being hot shit almost on par with a crimson suit is that it slows you down even more + armor = list(melee = 55, bullet = 45, laser = 45, energy = 25, bomb = 50, bio = 100, rad = 50) + siemens_coefficient = 0.6 + 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/weapon/grenade, + /obj/item/device/flash, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/handcuffs, + /obj/item/device/hailer, + /obj/item/device/holowarrant, + /obj/item/device/megaphone, + /obj/item/ammo_magazine, + /obj/item/device/spaceflare, + /obj/item/device/powersink, + /obj/item/device/radio_jammer, + /obj/item/weapon/cell + ) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 07f4090386b..f241ee11e82 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/spacesuit.dmi b/icons/mob/spacesuit.dmi index 3a62b0b0559..aa6d753ef88 100644 Binary files a/icons/mob/spacesuit.dmi and b/icons/mob/spacesuit.dmi differ diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi index b16391d08b3..b35e996d8ad 100644 Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/species/skrell/suit.dmi index ba0d05c28be..e72ef3e002d 100644 Binary files a/icons/mob/species/skrell/suit.dmi and b/icons/mob/species/skrell/suit.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index edca8f2790a..54ef3ec4362 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index c3b9f3896f5..f9677e5e898 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index b9cd1410f71..eb0165e3e51 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 3149eb2a22b..a05c73928ea 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 30a96788da3..31ec945739e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/spacesuits.dmi b/icons/obj/clothing/spacesuits.dmi index d53f8e70780..71bd5463f78 100644 Binary files a/icons/obj/clothing/spacesuits.dmi and b/icons/obj/clothing/spacesuits.dmi differ diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/obj/clothing/species/skrell/hats.dmi index 9a76e3e570a..a69a4e51dd1 100644 Binary files a/icons/obj/clothing/species/skrell/hats.dmi and b/icons/obj/clothing/species/skrell/hats.dmi differ diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/obj/clothing/species/skrell/suits.dmi index 572cd18d106..01ccf8f8d01 100644 Binary files a/icons/obj/clothing/species/skrell/suits.dmi and b/icons/obj/clothing/species/skrell/suits.dmi differ diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi index a1b4dee3a4f..362fae9f46b 100644 Binary files a/icons/obj/clothing/species/tajaran/hats.dmi and b/icons/obj/clothing/species/tajaran/hats.dmi differ diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi index 069141c2a9a..d935a4096cf 100644 Binary files a/icons/obj/clothing/species/tajaran/suits.dmi and b/icons/obj/clothing/species/tajaran/suits.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi index 928c0cd5330..08abbe309a6 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ