diff --git a/code/modules/cargo/supplypacks/voidsuits.dm b/code/modules/cargo/supplypacks/voidsuits.dm index f865e5665f2b..9cf2f443098f 100644 --- a/code/modules/cargo/supplypacks/voidsuits.dm +++ b/code/modules/cargo/supplypacks/voidsuits.dm @@ -395,3 +395,60 @@ container_type = /obj/structure/closet/crate/secure/nanotrasen container_name = "Mining cryosuit crate" access = ACCESS_SUPPLY_MINE + +//ODST Suits + +/datum/supply_pack/voidsuits/odst + name = "Hephaestus Icarus Combat Suits" + contains = list( + /obj/item/clothing/suit/space/void/odst = 2, + /obj/item/clothing/head/helmet/space/void/odst = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/tank/oxygen = 2 + ) + cost = 40 + container_type = /obj/structure/closet/crate/secure/heph + container_name = "Icarus Combat Suit crate" + +/datum/supply_pack/voidsuits/odst_med + name = "Hephaestus Icarus Medic Suits" + contains = list( + /obj/item/clothing/suit/space/void/odst_med = 2, + /obj/item/clothing/head/helmet/space/void/odst_med = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/tank/oxygen = 2 + ) + cost = 60 + container_type = /obj/structure/closet/crate/secure/heph + container_name = "Hephaestheus Icarus Medic crate" + access = ACCESS_MEDICAL_EQUIPMENT + +/datum/supply_pack/voidsuits/odst_eng + name = "Hephaestus Icarus Engineer Suits" + contains = list( + /obj/item/clothing/suit/space/void/odst_eng = 2, + /obj/item/clothing/head/helmet/space/void/odst_eng = 2, + /obj/item/clothing/mask/breath = 2, + /obj/item/clothing/shoes/magboots = 2, + /obj/item/tank/oxygen = 2 + ) + cost = 40 + container_type = /obj/structure/closet/crate/secure/heph + container_name = "Hephaestheus Icarus Engineer crate" + access = ACCESS_ENGINEERING_ENGINE + +/datum/supply_pack/voidsuits/odst_exp + name = "Hephaestus Icarus Frontier Suits" + contains = list( + /obj/item/clothing/suit/space/void/odst_exp = 2, + /obj/item/clothing/head/helmet/space/void/odst_exp = 2, + /obj/item/clothing/mask/breath = 3, + /obj/item/clothing/shoes/magboots = 3, + /obj/item/tank/oxygen = 3 + ) + cost = 50 + container_type = /obj/structure/closet/crate/secure/heph + container_name = "Hephaestheus Icarus Frontier crate" + access = ACCESS_GENERAL_EXPLORER diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index 84d6c50b2110..ce0633dcfaa4 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -91,3 +91,121 @@ armor_type = /datum/armor/merc/space/clown allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) siemens_coefficient = 0.6 + +//Four below avalible through cargo + +/obj/item/clothing/head/helmet/space/void/odst + name = "hephaestus icarus helmet" + desc = "One of the few combat-grade helmets avalible in the frontier, and the poster-child of Hephaestus Industries." + icon_state = "odst" + armor_type = /datum/armor/station/secsuit + siemens_coefficient = 0.6 + camera_networks = list(NETWORK_EXPLO_HELMETS) + species_restricted = null + +/obj/item/clothing/suit/space/void/odst + icon_state = "odst" + name = "hephaestus icarus suit" + desc = "One of the few combat-grade suits avalible in the frontier, and the poster-child of Hephaestus Industries. Comes equipped with a wrist-bound oxygen timer." + slowdown = 1 + w_class = ITEMSIZE_NORMAL + armor_type = /datum/armor/station/secsuit + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.6 + species_restricted = null + +/obj/item/clothing/head/helmet/space/void/odst_med + name = "hephaestus icarus medic helmet" + desc = "Part of the Icarus Medic suit." + icon_state = "odst_mil" + armor_type = /datum/armor/exploration/space + siemens_coefficient = 0.6 + camera_networks = list(NETWORK_EXPLO_HELMETS) + species_restricted = null + +/obj/item/clothing/suit/space/void/odst_med + icon_state = "odst_corps" + name = "hephaestus icarus medic suit" + desc = "A standard Icarus line suit that has been repourposed to protect from heavier biohazards." + slowdown = 1 + w_class = ITEMSIZE_NORMAL + armor_type = /datum/armor/exploration/space + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.6 + species_restricted = null + +/obj/item/clothing/head/helmet/space/void/odst_eng + name = "hephaestus icarus engineer helmet" + desc = "Part of the Icarus Engineer suit." + icon_state = "odst_orange" + armor_type = /datum/armor/engineering/space + siemens_coefficient = 0.6 + camera_networks = list(NETWORK_EXPLO_HELMETS) + species_restricted = null + +/obj/item/clothing/suit/space/void/odst_eng + icon_state = "odst_orange" + name = "hephaestus icarus engineer suit" + desc = "Favoured suit of deep-space engineers, comfortable and comparable to suits avalible to NanoTrasen Engineers. Comes equipped with a wrist-bound oxygen timer." + slowdown = 1 + w_class = ITEMSIZE_NORMAL + armor_type = /datum/armor/engineering/space + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.6 + species_restricted = null + +/obj/item/clothing/head/helmet/space/void/odst_exp + name = "hephaestus icarus frontier helmet" + desc = "Part of the Icarus Frontier suit." + icon_state = "odst_purple" + armor_type = /datum/armor/exploration/space + siemens_coefficient = 0.6 + camera_networks = list(NETWORK_EXPLO_HELMETS) + species_restricted = null + +/obj/item/clothing/suit/space/void/odst_exp + icon_state = "odst_purple" + name = "hephaestus icarus frontier suit" + desc = "Cheaper version of the main Icarus line, often marketed to Frontier settlements. Perfect for Expeditions." + slowdown = 1 + w_class = ITEMSIZE_NORMAL + armor_type = /datum/armor/exploration/space + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.6 + species_restricted = null + +// Admin spawn only, Necropolis Industries event gear + +/obj/item/clothing/head/helmet/space/void/odst_necro + name = "necropolis operations helmet" + desc = "Part of the Operations suit. Equipped with IFF sensors that send information directly to the user's implants." + icon_state = "odst_red" + item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndie_helm", SLOT_ID_LEFT_HAND = "syndie_helm") + armor_type = /datum/armor/merc/space + siemens_coefficient = 0.6 + camera_networks = list(NETWORK_MERCENARY) + species_restricted = null + +/obj/item/clothing/suit/space/void/odst_necro + icon_state = "odst_red" + name = "necropolis operations suit" + desc = "The main suit used by Necropolis Industries security division, a heavily modified Hephaestus Icarus suit emblazoned with the Necropolis logo on the left shoulder. Equipped with direct connections to the user's implants and prosthetics, making it function as a second skin." + item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndie_voidsuit", SLOT_ID_LEFT_HAND = "syndie_voidsuit") + slowdown = 0.4 + w_class = ITEMSIZE_NORMAL + armor_type = /datum/armor/merc/space + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.6 + species_restricted = null + +/obj/item/clothing/suit/space/void/odst_necromed + icon_state = "odst_red_mil" + name = "necropolis field medic suit" + desc = "The main suit used by Necropolis Industries security division, a heavily modified Hephaestheus Icarus suit emblazoned with the Necropolis logo on the left shoulder and a blue cross on the right arm. Equipped with direct connections to the user's implants and prosthetics, making it function as a second skin." + item_state_slots = list(SLOT_ID_RIGHT_HAND = "syndie_voidsuit", SLOT_ID_LEFT_HAND = "syndie_voidsuit") + slowdown = 0.4 + w_class = ITEMSIZE_NORMAL + armor_type = /datum/armor/merc/space + allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + siemens_coefficient = 0.6 + species_restricted = null diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 494c4cb2f972..fca8bdd5af87 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits.dmi b/icons/mob/clothing/suits.dmi index 511828c94d62..674ac69a077d 100644 Binary files a/icons/mob/clothing/suits.dmi and b/icons/mob/clothing/suits.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index d6c5ffdfc757..c703eb86c0f8 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 77d1b04a479f..80ed0f4cfe19 100644 Binary files a/icons/obj/clothing/spacesuits.dmi and b/icons/obj/clothing/spacesuits.dmi differ