diff --git a/code/datums/uplink/hardsuits_and_modules.dm b/code/datums/uplink/hardsuits_and_modules.dm index 5c277a8aade..47bb9ac444c 100644 --- a/code/datums/uplink/hardsuits_and_modules.dm +++ b/code/datums/uplink/hardsuits_and_modules.dm @@ -72,7 +72,7 @@ telecrystal_cost = 8 bluecrystal_cost = 8 path = /obj/item/rig/combat - desc = "A sleek and dangerous hardsuit for active combat. This one is a Stellar Corporate Conglomerate design in color scheme and make. Only wearable by humans and skrell." + desc = "A sleek and dangerous hardsuit for active combat. This one is a Stellar Corporate Conglomerate design in color scheme and make. Wearable by humans, skrell, tajara, unathi and IPC." /datum/uplink_item/item/hardsuit_modules/suit/sol name = "Solarian Vampire Hardsuit" diff --git a/code/game/objects/items/weapons/circuitboards/rig.dm b/code/game/objects/items/weapons/circuitboards/rig.dm index a87b2774cae..4d7917b37d0 100644 --- a/code/game/objects/items/weapons/circuitboards/rig.dm +++ b/code/game/objects/items/weapons/circuitboards/rig.dm @@ -43,9 +43,11 @@ /obj/item/circuitboard/rig_assembly/combat/hazard name = "hazard hardsuit central circuit board" + origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/rig_assembly/combat/targeting/hazard name = "hazard hardsuit control and targeting board" + origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) /obj/item/circuitboard/rig_assembly/combat/combat name = "combat hardsuit central circuit board" diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index f889073f1b7..c6fa1584682 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -3,7 +3,7 @@ desc = "A sleek and dangerous hardsuit for active combat. This one is a Stellar Corporate Conglomerate design in color scheme and make." icon = 'icons/obj/item/clothing/rig/combat.dmi' icon_state = "combat_rig" - icon_supported_species_tags = list("skr") + icon_supported_species_tags = list("skr", "taj", "unat", "ipc") suit_type = "combat hardsuit" armor = list( MELEE = ARMOR_MELEE_MAJOR, @@ -25,7 +25,7 @@ allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT - species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL) + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_TAJARA, BODYTYPE_UNATHI, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) /obj/item/clothing/head/helmet/space/rig/combat light_overlay = "helmet_light_dual_cyan" diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index f11b2bfe6f8..ab362a17340 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -362,7 +362,7 @@ icon_supported_species_tags = list("ipc", "skr", "taj", "una") armor = list( MELEE = ARMOR_MELEE_MAJOR, - BULLET = ARMOR_BALLISTIC_PISTOL, + BULLET = ARMOR_BALLISTIC_MEDIUM, LASER = ARMOR_LASER_MEDIUM, ENERGY = ARMOR_ENERGY_RESISTANT, BOMB = ARMOR_BOMB_PADDED, diff --git a/code/modules/research/designs/circuit/hardsuit_circuits.dm b/code/modules/research/designs/circuit/hardsuit_circuits.dm index 33dc2212f52..bf0784c958a 100644 --- a/code/modules/research/designs/circuit/hardsuit_circuits.dm +++ b/code/modules/research/designs/circuit/hardsuit_circuits.dm @@ -36,12 +36,12 @@ /datum/design/circuit/hardsuit/hazard name = "Hazard Hardsuit Central Circuit Board" - req_tech = list(TECH_DATA = 4) + req_tech = list(TECH_DATA = 3) build_path = /obj/item/circuitboard/rig_assembly/combat/hazard /datum/design/circuit/hardsuit/hazard_target name = "Hazard Hardsuit Control And Targeting Board" - req_tech = list(TECH_DATA = 4, TECH_COMBAT = 3) + req_tech = list(TECH_DATA = 3, TECH_COMBAT = 3) build_path = /obj/item/circuitboard/rig_assembly/combat/targeting/hazard /datum/design/circuit/hardsuit/combat diff --git a/code/modules/research/designs/mechfab/hardsuit/rigs.dm b/code/modules/research/designs/mechfab/hardsuit/rigs.dm index 99a879adce0..c6bb4987280 100644 --- a/code/modules/research/designs/mechfab/hardsuit/rigs.dm +++ b/code/modules/research/designs/mechfab/hardsuit/rigs.dm @@ -54,7 +54,7 @@ name = "Hazard Hardsuit Control Module" desc = "An assembly for a security hardsuit designed for prolonged EVA in dangerous environments." build_path = /obj/item/rig_assembly/combat/hazard - req_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 3) + req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 3, TECH_MAGNET = 3, TECH_POWER = 3, TECH_COMBAT = 3) materials = list(DEFAULT_WALL_MATERIAL = 26500, MATERIAL_GLASS = 12500, MATERIAL_SILVER = 3500, MATERIAL_GOLD = 5500, MATERIAL_LEAD = 3500) /datum/design/rig/combat diff --git a/html/changelogs/RigChanges.yml b/html/changelogs/RigChanges.yml new file mode 100644 index 00000000000..0d2a325d808 --- /dev/null +++ b/html/changelogs/RigChanges.yml @@ -0,0 +1,8 @@ +author: TheGreyWolf, Noble Row + +delete-after: True + +changes: + - rscadd: "The combat hardsuit now work for unathi, tajara and IPC too." + - rscadd: "The hazard rig tech level was lowered, allowing it to be made at roundstart." + - rscadd: "The hazard rig ballistic protection was buffed to be the same as the security voidsuit." diff --git a/icons/obj/item/clothing/rig/combat.dmi b/icons/obj/item/clothing/rig/combat.dmi index 6dc9ebf157b..ffb67789ebf 100644 Binary files a/icons/obj/item/clothing/rig/combat.dmi and b/icons/obj/item/clothing/rig/combat.dmi differ