diff --git a/_maps/deprecated/Ruins/forgottenship.dmm b/_maps/deprecated/Ruins/forgottenship.dmm index a692377b9a76..ccc0042f2280 100644 --- a/_maps/deprecated/Ruins/forgottenship.dmm +++ b/_maps/deprecated/Ruins/forgottenship.dmm @@ -420,7 +420,7 @@ /obj/structure/closet/crate/secure/gear{ req_one_access_txt = "150" }, -/obj/item/clothing/suit/space/hardsuit/cybersun, +, /turf/open/floor/pod/dark, /area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "bB" = ( diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 1cdcec95d05f..de5874c98d38 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -319,8 +319,8 @@ //Syndicate hardsuit /obj/item/clothing/head/helmet/space/hardsuit/syndi name = "blood-red hardsuit helmet" - desc = "A dual-mode advanced helmet designed for work in special operations. It is in EVA mode. Property of Gorlex Marauders." - alt_desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." + desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in EVA mode. Produced by the Gorlex Marauders." + alt_desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in combat mode. Produced by the Gorlex Marauders." icon_state = "hardsuit1-syndi" item_state = "syndie_helm" hardsuit_type = "syndi" @@ -407,12 +407,11 @@ /obj/item/clothing/suit/space/hardsuit/syndi name = "blood-red hardsuit" - desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in EVA mode. Property of Gorlex Marauders." - alt_desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." + desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in EVA mode. Produced by the Gorlex Marauders." + alt_desc = "A dual-mode advanced hardsuit designed for special combat operations. It is in combat mode. Produced by the Gorlex Marauders." icon_state = "hardsuit1-syndi" item_state = "syndie_hardsuit" hardsuit_type = "syndi" - w_class = WEIGHT_CLASS_NORMAL armor = list("melee" = 40, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90) allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi @@ -443,6 +442,7 @@ jetpack = null armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75) combat_slowdown = 0.5 + jetpack = null //Elite Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite @@ -502,6 +502,64 @@ hardsuit_type = "owl" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/owl +//Cybersun Hardsuit +/obj/item/clothing/suit/space/hardsuit/syndi/cybersun + name = "neutron-star combat hardsuit" + desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in EVA mode. Produced by Cybersun Industries." + alt_desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in combat mode. Produced by Cybersun Industries." + icon_state = "hardsuit1-cybersun" + hardsuit_type = "cybersun" + armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun + supports_variations = VOX_VARIATION + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun + name = "neutron-star combat hardsuit helmet" + desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in EVA mode. Produced by Cybersun Industries." + alt_desc = "Designed with fighting Nanotrasen weapons in mind, the Cybersun combat hardsuit trades ballistic and blunt protection for top grade laser protection. It is in combat mode. Produced by Cybersun Industries." + icon_state = "hardsuit1-cybersun" + hardsuit_type = "cybersun" + armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) + +//Cybersun Medical Techinician Hardsuit +/obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed + name = "cybersun medical technician hardsuit" + desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in EVA mode. Produced by Cybersun Industries." + alt_desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in combat mode. Produced by Cybersun Industries." + icon_state = "hardsuit1-cyberparamed" + hardsuit_type = "cyberparamed" + armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40) + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed + supports_variations = VOX_VARIATION + combat_slowdown = 0.4 + jetpack = null + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed + name = "cybersun medical technician hardsuit helmet" + desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in EVA mode. Produced by Cybersun Industries." + alt_desc = "A stripped down version of the neutron-star hardsuit for use by medical technicians. It is in combat mode. Produced by Cybersun Industries" + icon_state = "hardsuit1-cyberparamed" + hardsuit_type = "cyberparamed" + armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40) + +//Pointman Hardsuit +/obj/item/clothing/suit/space/hardsuit/syndi/inteq + name = "pointman hardsuit" + desc = "One of Inteq's strudiest and finest combat armors. It is in EVA mode. Retrofitted by the IRMG." + alt_desc = "One of Inteq's strudiest and finest combat armors. It is in combat mode. Retrofitted by the IRMG." + icon_state = "hardsuit1-pointman" + hardsuit_type = "pointman" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq + supports_variations = VOX_VARIATION + + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq + name = "pointman hardsuit helmet" + desc = "One of Inteq's strudiest and finest combat armors. It is in EVA mode. Retrofitted by the IRMG." + alt_desc = "One of Inteq's strudiest and finest combat armors. It is in combat mode. Retrofitted by the IRMG." + icon_state = "hardsuit1-pointman" + hardsuit_type = "pointman" + full_retraction = TRUE //Wizard hardsuit /obj/item/clothing/head/helmet/space/hardsuit/wizard diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm index 4a3611dcbdcc..8e3ae585d73d 100644 --- a/code/modules/ruins/spaceruin_code/forgottenship.dm +++ b/code/modules/ruins/spaceruin_code/forgottenship.dm @@ -90,29 +90,6 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) //Cybersun hardsuit -/obj/item/clothing/head/helmet/space/hardsuit/cybersun - name = "Cybersun hardsuit helmet" - desc = "Prototype hardsuit helmet with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else." - icon_state = "cybersun" - item_state = "cybersun" - hardsuit_type = "cybersun" - armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) - strip_delay = 600 - actions_types = list() - - -/obj/item/clothing/suit/space/hardsuit/cybersun - icon_state = "cybersun" - item_state = "cybersun" - hardsuit_type = "cybersun" - name = "Cybersun hardsuit" - desc = "Prototype hardsuit with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else." - armor = list("melee" = 30, "bullet" = 40, "laser" = 55, "energy" = 55, "bomb" = 30, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60) - slowdown = 0 - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cybersun - actions_types = list(/datum/action/item_action/toggle_helmet) - jetpack = /obj/item/tank/jetpack/suit - //Special NT NPCs /mob/living/simple_animal/hostile/nanotrasen/ranged/assault diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 9ba2f5b219db..53b4c5939f68 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi index 08c7741eae97..6e97b33cd1b7 100644 Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 83db437408eb..c705e16ccf63 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi index 688709322f5f..7ab05863bf05 100644 Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ