diff --git a/aurorastation.dme b/aurorastation.dme index 183c2d30fe2..5a4fc6a03c6 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -402,6 +402,7 @@ #include "code\datums\outfits\ert\kosmostrelki.dm" #include "code\datums\outfits\ert\mercenary.dm" #include "code\datums\outfits\ert\nt_ert.dm" +#include "code\datums\outfits\ert\scc_ert.dm" #include "code\datums\outfits\ert\syndicate.dm" #include "code\datums\outfits\ert\tcfl.dm" #include "code\datums\outfits\event\outfit_events.dm" diff --git a/code/datums/outfits/ert/scc_ert.dm b/code/datums/outfits/ert/scc_ert.dm new file mode 100644 index 00000000000..301f99a88f3 --- /dev/null +++ b/code/datums/outfits/ert/scc_ert.dm @@ -0,0 +1,51 @@ +/datum/outfit/admin/ert/scc + name = "ERT Security Specialist (SCC)" + + uniform = /obj/item/clothing/under/rank/security + belt = /obj/item/storage/belt/military + shoes = /obj/item/clothing/shoes/swat + accessory = /obj/item/clothing/accessory/storage/black_vest + id = /obj/item/card/id/ert/scc + back = /obj/item/rig/ert/scc/security + + l_ear = /obj/item/device/radio/headset/ert + + belt_contents = list( + /obj/item/handcuffs = 2, + /obj/item/shield/riot/tact = 1, + /obj/item/ammo_magazine/a556 = 2, + /obj/item/ammo_magazine/a556/ap = 1 + ) + +/datum/outfit/admin/ert/scc/get_id_access() + return get_all_station_access() | get_centcom_access("Emergency Response Team") + +/datum/outfit/admin/ert/scc/engineer + name = "ERT Engineering Specialist (SCC)" + + belt = /obj/item/storage/belt/utility/full + back = /obj/item/rig/ert/scc/engineer + + belt_contents = null + +/datum/outfit/admin/ert/scc/medic + name = "ERT Medical Specialist (SCC)" + + belt = /obj/item/storage/belt/medical/first_responder/combat + back = /obj/item/rig/ert/scc/medical + r_hand = /obj/item/storage/firstaid/combat + + belt_contents = list( + /obj/item/reagent_containers/hypospray/combat/empty = 1, + /obj/item/reagent_containers/glass/bottle/inaprovaline = 1, + /obj/item/reagent_containers/glass/bottle/antitoxin = 1, + /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, + /obj/item/reagent_containers/glass/bottle/butazoline = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1 + ) + +/datum/outfit/admin/ert/scc/commander + name = "ERT Commander (SCC)" + + back = /obj/item/rig/ert/scc diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index dcb135c74e4..9e78e0d08eb 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -477,6 +477,9 @@ var/const/NO_EMAG_ACT = -50 access = get_all_station_access() + get_centcom_access("Emergency Response Team") ..() +/obj/item/card/id/ert/scc + name = "\improper SCC Emergency Response Team identification card" + /obj/item/card/id/asset_protection name = "\improper NanoTrasen Asset Protection identification card" icon_state = "centcom" @@ -633,4 +636,4 @@ var/const/NO_EMAG_ACT = -50 /obj/item/card/id/away_site access = list(access_generic_away_site, access_external_airlocks) -#undef ID_CARD_UNSET \ No newline at end of file +#undef ID_CARD_UNSET diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index eab382679e0..b9e3434c12a 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -333,6 +333,7 @@ if("Cancel") return if("ERT") + outfit_catagories["SCC-ERT"] = typesof(/datum/outfit/admin/ert/scc) outfit_catagories["NT-ERT"] = typesof(/datum/outfit/admin/ert/nanotrasen) outfit_catagories["Deathsquad"] = typesof(/datum/outfit/admin/deathsquad) outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/ert/legion) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index 19ccdb5c266..fbcf8e190dd 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -118,8 +118,62 @@ ) allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL +/obj/item/rig/ert/scc + name = "\improper SCC ERT-C hardsuit control module" + desc = "A suit worn by the commander of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring." + suit_type = "SCC ERT commander" + icon = 'icons/clothing/rig/scc_ert/commander.dmi' + icon_state = "scc_rig" + icon_supported_species_tags = null + species_restricted = list(BODYTYPE_HUMAN) + + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_RIFLE, + energy = ARMOR_ENERGY_SMALL, + bomb = ARMOR_BOMB_RESISTANT, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) + + initial_modules = list( + /obj/item/rig_module/ai_container, + /obj/item/rig_module/vision/nvg, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/storage + ) + +/obj/item/rig/ert/scc/engineer + name = "\improper SCC ERT-E hardsuit control module" + desc = "A suit worn by the engineer of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring." + suit_type = "SCC ERT engineer" + icon = 'icons/clothing/rig/scc_ert/engineer.dmi' + icon_state = "scc_rig" + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_UTILITY + +/obj/item/rig/ert/scc/medical + name = "\improper SCC ERT-M hardsuit control module" + desc = "A suit worn by the medical specialist of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring." + suit_type = "SCC ERT medic" + icon = 'icons/clothing/rig/scc_ert/medic.dmi' + icon_state = "scc_rig" + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL + +/obj/item/rig/ert/scc/security + name = "\improper SCC ERT-S hardsuit control module" + desc = "A suit worn by the security specialist of an Emergency Response Team sent to crisis situations by the Stellar Corporate Conglomerate. This one features SCC colouring." + suit_type = "SCC ERT security" + icon = 'icons/clothing/rig/scc_ert/security.dmi' + icon_state = "scc_rig" + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL + /obj/item/rig/ert/assetprotection - name = "heavy asset protection suit control module" + name = "\improper heavy asset protection suit control module" desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armored and space ready." suit_type = "heavy asset protection" icon = 'icons/clothing/rig/asset_protection.dmi' @@ -166,4 +220,4 @@ icon_state = "apotheosis" req_access = list() - req_one_access = list() \ No newline at end of file + req_one_access = list() diff --git a/html/changelogs/scc-erthardsuits-io-util.yml b/html/changelogs/scc-erthardsuits-io-util.yml new file mode 100644 index 00000000000..6b2d0434690 --- /dev/null +++ b/html/changelogs/scc-erthardsuits-io-util.yml @@ -0,0 +1,7 @@ +author: io-util + +delete-after: True + +changes: + - rscadd: "Added new SCC ERT Hardsuits for event and admin use." + - imageadd: "Added new sprites, made by Kyres, for the SCC ERT hardsuits." diff --git a/icons/clothing/rig/scc_ert/commander.dmi b/icons/clothing/rig/scc_ert/commander.dmi new file mode 100644 index 00000000000..0e41298d3fc Binary files /dev/null and b/icons/clothing/rig/scc_ert/commander.dmi differ diff --git a/icons/clothing/rig/scc_ert/engineer.dmi b/icons/clothing/rig/scc_ert/engineer.dmi new file mode 100644 index 00000000000..36f67dc68f1 Binary files /dev/null and b/icons/clothing/rig/scc_ert/engineer.dmi differ diff --git a/icons/clothing/rig/scc_ert/medic.dmi b/icons/clothing/rig/scc_ert/medic.dmi new file mode 100644 index 00000000000..abbd9320e79 Binary files /dev/null and b/icons/clothing/rig/scc_ert/medic.dmi differ diff --git a/icons/clothing/rig/scc_ert/security.dmi b/icons/clothing/rig/scc_ert/security.dmi new file mode 100644 index 00000000000..fbb05e4cc21 Binary files /dev/null and b/icons/clothing/rig/scc_ert/security.dmi differ