diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 58251caa222..abbf229cac2 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -657,6 +657,15 @@ model_text = "Pilot" departments = list("Pilot Blue","Pilot") +/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() + species -= SPECIES_TESHARI + return ..() + /obj/machinery/suit_cycler/attack_ai(mob/user as mob) return attack_hand(user) @@ -766,7 +775,7 @@ //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.") - departments = list("Engineering","Mining","Medical","Security","Atmospherics","HAZMAT","Construction","Biohazard","Crowd Control","Security EVA","Emergency Medical Response","^%###^%$", "Charring") + 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 emagged = 1 diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm index 8b46a5a740a..35a153f5d85 100644 --- a/code/modules/clothing/spacesuits/void/event.dm +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -8,40 +8,14 @@ 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) @@ -54,29 +28,6 @@ /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 @@ -205,4 +156,4 @@ /obj/item/weapon/handcuffs, /obj/item/ammo_magazine, /obj/item/weapon/cell - ) \ No newline at end of file + ) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 9835c37d8ca..07f4090386b 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 7c1425e07cd..3a62b0b0559 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 7a95007bd7a..b16391d08b3 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 9a5d4ec447e..ba0d05c28be 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 4f8010b259d..edca8f2790a 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 7dba50ef6be..c3b9f3896f5 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 10cf92dcf47..b9cd1410f71 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 2d2d0a434bc..3149eb2a22b 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 07ba37fd83d..30a96788da3 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 2ee7110282c..d53f8e70780 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 6512b42d6eb..9a76e3e570a 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 3874dac941b..572cd18d106 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 89f359a4a9d..a1b4dee3a4f 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 e8ab73eadf8..069141c2a9a 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 01bc6e4650e..928c0cd5330 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ