From 575ac1018aaaf1d1d0e23cd5782726cc8cf4e4f8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 2 Apr 2020 14:59:19 -0400 Subject: [PATCH] Voidsuit Additions - Adds a Captain's voidsuit for the Captain, replaces the old Colony Director armor. - Adds a Prototype Voidsuit. Currently has mercenary voidsuit stats and does not spawn in anywhere. - Adds new cyclers for the new voidsuits. --- code/game/machinery/suit_storage_unit.dm | 25 ++++++++++++++++ code/game/machinery/suit_storage_unit_vr.dm | 14 ++++++++- .../clothing/spacesuits/void/military_vr.dm | 29 ++++++++++++++++++- maps/tether/tether-03-surface3.dmm | 5 ++-- 4 files changed, 69 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index b4850d0fc45..b893b381727 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -1165,6 +1165,31 @@ suit.item_state = "rig-pilot2" suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG" suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG" + //VOREStation Addition Start + if("Captain") + if(helmet) + helmet.name = "captain voidsuit helmet" + helmet.icon_state = "capvoid" + helmet.item_state = "capvoid" + if(suit) + suit.name = "captain voidsuit" + suit.icon_state = "capsuit_void" + suit.item_state = "capsuit_void" + suit.item_state_slots[slot_r_hand_str] = "wiz_voidsuit" + suit.item_state_slots[slot_l_hand_str] = "wiz_voidsuit" + if("Prototype") + if(helmet) + helmet.name = "prototype voidsuit helmet" + helmet.icon_state = "hosproto" + helmet.item_state = "hosproto" + if(suit) + suit.name = "prototype voidsuit" + suit.icon_state = "hosproto_void" + suit.item_state = "hosproto_void" + suit.item_state_slots[slot_r_hand_str] = "sec_voidsuitTG" + suit.item_state_slots[slot_l_hand_str] = "sec_voidsuitTG" + //VOREStation Addition End + if(helmet) helmet.name = "refitted [helmet.name]" diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index b3e7c78fd0f..6df525b6674 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,5 +1,5 @@ /obj/machinery/suit_cycler - departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot") + departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Captain","Prototype") species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_VULPKANIN) // Old Exploration is too WIP to use right now @@ -9,3 +9,15 @@ /obj/machinery/suit_cycler/pilot req_access = list(access_pilot) + +/obj/machinery/suit_cycler/captain + name = "Captain suit cycler" + model_text = "Captain" + req_access = list(access_captain) + departments = list("Captain") + +/obj/machinery/suit_cycler/prototype + name = "Prototype suit cycler" + model_text = "Prototype" + req_access = list(access_cent_specops) + departments = list("Prototype") diff --git a/code/modules/clothing/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm index c954daa09de..006b107067c 100644 --- a/code/modules/clothing/spacesuits/void/military_vr.dm +++ b/code/modules/clothing/spacesuits/void/military_vr.dm @@ -1,3 +1,28 @@ +/obj/item/clothing/head/helmet/space/void/captain + name = "\improper director helmet" + desc = "A special helmet designed for work in a hazardous, low pressure environment. This model sacrifices mobility for even more armor." + icon_state = "capvoid" + item_state_slots = list(slot_r_hand_str = "sec_helm", slot_l_hand_str = "sec_helm") + armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) + +/obj/item/clothing/suit/space/void/captain + name = "\improper director armor" + desc = "A special suit that protects against hazardous, low pressure environments. This model sacrifices mobility for even more armor." + icon_state = "capsuit_void" + item_state_slots = list(slot_r_hand_str = "sec_voidsuit", slot_l_hand_str = "sec_voidsuit") + 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" + desc = "A special helmet designed for work in a hazardous, low pressure environment. This is an advanced model commonly used by militaries and emergency response." + icon_state = "hosproto" + +/obj/item/clothing/suit/space/void/merc/prototype + name = "\improper prototype voidsuit" + desc = "A special suit that protects against hazardous, low pressure environments. This is an advanced model commonly used by militaries and emergency response." + icon_state = "hosproto_void" + /obj/item/clothing/head/helmet/space/void/merc/odst name = "\improper ODST Helmet" desc = "\"... we are glad to plunge feet first into hell in the knowledge that we will rise.\"" @@ -7,6 +32,7 @@ icon = 'icons/obj/clothing/hats_vr.dmi' icon_override = 'icons/mob/head_vr.dmi' light_overlay = "helmet_light_dual" + species_restricted = null /*/obj/item/clothing/head/helmet/space/void/merc/odst/jertheace // Given to Acacius during an event. Save this for use in events. name = "\improper Ace's ODST Helmet" @@ -23,4 +49,5 @@ item_state = "odst" item_state_slots = null icon = 'icons/obj/clothing/suits_vr.dmi' - icon_override = 'icons/mob/suit_vr.dmi' \ No newline at end of file + icon_override = 'icons/mob/suit_vr.dmi' + species_restricted = null diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 2df8cec96e6..6b80c5f0164 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -6880,6 +6880,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/suit_cycler/captain, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aln" = ( @@ -31217,8 +31218,6 @@ /obj/structure/table/rack, /obj/item/weapon/tank/jetpack/oxygen, /obj/item/clothing/mask/gas, -/obj/item/clothing/suit/armor/captain, -/obj/item/clothing/head/helmet/space/capspace, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 @@ -31233,6 +31232,8 @@ dir = 8; health = 1e+006 }, +/obj/item/clothing/head/helmet/space/void/captain, +/obj/item/clothing/suit/space/void/captain, /turf/simulated/floor/wood, /area/crew_quarters/captain) "bag" = (