From f99204a3b7e9a0f7a2cc70049f4db578930e704e Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:18:43 +1300 Subject: [PATCH] ert extravaganza (#18022) --- aurorastation.dme | 9 +- code/datums/ert/corporate.dm | 22 +++ code/datums/ert/nanotrasen.dm | 10 - code/datums/ert/outsider.dm | 12 ++ code/datums/outfits/ert/coalition.dm | 179 ++++++++++++++++++ code/datums/outfits/ert/hephaestus_ert.dm | 95 ++++++++++ .../clothing/spacesuits/rig/suits/combat.dm | 3 + .../responseteams/corporate/hephaestus.dm | 31 +++ .../responseteams/{ => corporate}/nt_ert.dm | 0 .../human/responseteams/corporate/scc_ert.dm | 33 ++++ .../human/responseteams/human/coalition.dm | 65 +++++++ .../changelogs/RustingWithYou - emergency.yml | 41 ++++ 12 files changed, 488 insertions(+), 12 deletions(-) create mode 100644 code/datums/ert/corporate.dm delete mode 100644 code/datums/ert/nanotrasen.dm create mode 100644 code/datums/outfits/ert/coalition.dm create mode 100644 code/datums/outfits/ert/hephaestus_ert.dm create mode 100644 code/modules/ghostroles/spawner/human/responseteams/corporate/hephaestus.dm rename code/modules/ghostroles/spawner/human/responseteams/{ => corporate}/nt_ert.dm (100%) create mode 100644 code/modules/ghostroles/spawner/human/responseteams/corporate/scc_ert.dm create mode 100644 code/modules/ghostroles/spawner/human/responseteams/human/coalition.dm create mode 100644 html/changelogs/RustingWithYou - emergency.yml diff --git a/aurorastation.dme b/aurorastation.dme index da509905290..82e15b4b985 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -371,7 +371,7 @@ #include "code\datums\discord\webhook.dm" #include "code\datums\elements\_element.dm" #include "code\datums\elements\empprotection.dm" -#include "code\datums\ert\nanotrasen.dm" +#include "code\datums\ert\corporate.dm" #include "code\datums\ert\outsider.dm" #include "code\datums\ert\responseteam.dm" #include "code\datums\ert\tcfl.dm" @@ -404,9 +404,11 @@ #include "code\datums\outfits\outfit_admin.dm" #include "code\datums\outfits\outfit_antag.dm" #include "code\datums\outfits\ert\ap_eridani.dm" +#include "code\datums\outfits\ert\coalition.dm" #include "code\datums\outfits\ert\deathsquad.dm" #include "code\datums\outfits\ert\elyra.dm" #include "code\datums\outfits\ert\fsf.dm" +#include "code\datums\outfits\ert\hephaestus_ert.dm" #include "code\datums\outfits\ert\iac.dm" #include "code\datums\outfits\ert\kataphract.dm" #include "code\datums\outfits\ert\kosmostrelki.dm" @@ -2048,10 +2050,13 @@ #include "code\modules\ghostroles\spawner\human\responseteams\deathsquad.dm" #include "code\modules\ghostroles\spawner\human\responseteams\iac.dm" #include "code\modules\ghostroles\spawner\human\responseteams\mercenary.dm" -#include "code\modules\ghostroles\spawner\human\responseteams\nt_ert.dm" #include "code\modules\ghostroles\spawner\human\responseteams\response_team.dm" #include "code\modules\ghostroles\spawner\human\responseteams\syndicate.dm" #include "code\modules\ghostroles\spawner\human\responseteams\tcfl.dm" +#include "code\modules\ghostroles\spawner\human\responseteams\corporate\hephaestus.dm" +#include "code\modules\ghostroles\spawner\human\responseteams\corporate\nt_ert.dm" +#include "code\modules\ghostroles\spawner\human\responseteams\corporate\scc_ert.dm" +#include "code\modules\ghostroles\spawner\human\responseteams\human\coalition.dm" #include "code\modules\ghostroles\spawner\human\responseteams\human\elyra.dm" #include "code\modules\ghostroles\spawner\human\responseteams\human\fsf.dm" #include "code\modules\ghostroles\spawner\human\responseteams\tajara\kosmostrelki.dm" diff --git a/code/datums/ert/corporate.dm b/code/datums/ert/corporate.dm new file mode 100644 index 00000000000..2136f1512d3 --- /dev/null +++ b/code/datums/ert/corporate.dm @@ -0,0 +1,22 @@ +/datum/responseteam/scc + name = "SCC ERT" + chance = 20 + spawner = /datum/ghostspawner/human/ert/scc + possible_space_sector = list(ALL_TAU_CETI_SECTORS) + +/datum/responseteam/nanotrasen + name = "NanoTrasen ERT" + chance = 20 + spawner = /datum/ghostspawner/human/ert/nanotrasen + possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI) + +/datum/responseteam/hephaestus + name = "Hephaestus ERT" + chance = 20 + spawner = /datum/ghostspawner/human/ert/hephaestus + possible_space_sector = list(SECTOR_BURZSIA, SECTOR_UUEOAESA, SECTOR_TAU_CETI) + +/datum/responseteam/deathsquad + name = "SCC Asset Protection" + spawner = /datum/ghostspawner/human/ert/deathsquad + chance = 1 diff --git a/code/datums/ert/nanotrasen.dm b/code/datums/ert/nanotrasen.dm deleted file mode 100644 index e188e34c7d8..00000000000 --- a/code/datums/ert/nanotrasen.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/responseteam/nanotrasen - name = "NanoTrasen ERT" - chance = 20 - spawner = /datum/ghostspawner/human/ert/nanotrasen - possible_space_sector = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI) - -/datum/responseteam/deathsquad - name = "SCC Asset Protection" - spawner = /datum/ghostspawner/human/ert/deathsquad - chance = 1 diff --git a/code/datums/ert/outsider.dm b/code/datums/ert/outsider.dm index 56314cd8da3..ddded3e92af 100644 --- a/code/datums/ert/outsider.dm +++ b/code/datums/ert/outsider.dm @@ -47,3 +47,15 @@ chance = 15 spawner = /datum/ghostspawner/human/ert/elyra possible_space_sector = list(SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_VALLEY_HALE, SECTOR_AEMAQ) + +/datum/responseteam/coalition + name = "Coalition Rangers" + chance = 15 + spawner = /datum/ghostspawner/human/ert/coalition + possible_space_sector = list(SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_LIBERTYS_CRADLE, SECTOR_BADLANDS) + +/datum/responseteam/konyang + name = "Konyang Aerospace Force" + chance = 15 + spawner = /datum/ghostspawner/human/ert/konyang + possible_space_sector = list(SECTOR_HANEUNIM) diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm new file mode 100644 index 00000000000..fa3b0890aae --- /dev/null +++ b/code/datums/outfits/ert/coalition.dm @@ -0,0 +1,179 @@ +/datum/outfit/admin/ert/coalition + name = "Coalition Ranger ERT" + uniform = /obj/item/clothing/under/tactical + shoes = /obj/item/clothing/shoes/magboots + gloves = /obj/item/clothing/gloves/combat + l_ear = /obj/item/device/radio/headset/distress + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + id = /obj/item/card/id/ert + head = /obj/item/clothing/head/helmet/space/void/coalition + suit = /obj/item/clothing/suit/space/void/coalition + mask = /obj/item/clothing/mask/gas + back = /obj/item/tank/jetpack/carbondioxide + suit_store = /obj/item/gun/projectile/automatic/rifle/shorty + belt = /obj/item/storage/belt/military + belt_contents = list( + /obj/item/ammo_magazine/c762 = 3, + /obj/item/ammo_magazine/c45m = 2, + /obj/item/material/knife/tacknife = 1, + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1 + ) + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/projectile/colt = 1) + +/datum/outfit/admin/ert/coalition/get_id_access() + return list(access_distress, access_external_airlocks, access_coalition, access_coalition_navy) + +/datum/outfit/admin/ert/coalition/medic + name = "Coalition Medic" + belt = /obj/item/storage/belt/medical/first_responder/combat + back = /obj/item/storage/backpack/satchel/med + glasses = /obj/item/clothing/glasses/hud/health + gloves = /obj/item/clothing/gloves/latex + + backpack_contents = list( + /obj/item/storage/firstaid/combat = 1, + /obj/item/ammo_magazine/c45m = 3, + /obj/item/storage/firstaid/adv = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/device/healthanalyzer = 1, + /obj/item/stack/medical/advanced/bruise_pack = 1, + /obj/item/stack/medical/advanced/ointment = 1, + /obj/item/material/knife/tacknife = 1 + ) + + belt_contents = list( + /obj/item/reagent_containers/hypospray/cmo = 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/bicaridine = 1, + /obj/item/reagent_containers/glass/bottle/thetamycin = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1 + ) + +/datum/outfit/admin/ert/coalition/sapper + name = "Coalition Sapper" + back = /obj/item/storage/backpack/duffel/eng + belt = /obj/item/storage/belt/utility/very_full + gloves = /obj/item/clothing/gloves/yellow + suit_store = /obj/item/gun/projectile/shotgun/pump/combat + backpack_contents = list( + /obj/item/plastique = 3, + /obj/item/storage/box/shotgunshells = 1, + /obj/item/ammo_magazine/c45m = 3, + /obj/item/handcuffs/ziptie = 1, + /obj/item/clothing/glasses/welding/superior = 1, + /obj/item/grenade/frag = 2 + ) + + belt_contents = null + +/datum/outfit/admin/ert/coalition/leader + name = "Coalition Team Leader" + head = null + suit = null + gloves = null + shoes = /obj/item/clothing/shoes/combat + mask = /obj/item/clothing/mask/gas/tactical + back = /obj/item/rig/gunslinger/equipped/ert + suit_store = /obj/item/tank/oxygen + l_hand = /obj/item/gun/projectile/automatic/rifle/shorty + belt_contents = list( + /obj/item/ammo_magazine/plasma = 3, + /obj/item/ammo_magazine/c45m = 2, + /obj/item/material/knife/tacknife = 1, + /obj/item/grenade/frag = 1, + /obj/item/grenade/flashbang = 1 + ) + +/datum/outfit/admin/ert/konyang + name = "KASF Emergency Responder" + uniform = /obj/item/clothing/under/rank/konyang/space + suit = /obj/item/clothing/suit/space/void/sol/konyang + head = /obj/item/clothing/head/helmet/space/void/sol/konyang + shoes = /obj/item/clothing/shoes/magboots + back = /obj/item/tank/jetpack/carbondioxide + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + l_ear = /obj/item/device/radio/headset/distress + gloves = /obj/item/clothing/gloves/swat/ert + mask = /obj/item/clothing/mask/gas/tactical + suit_store = /obj/item/gun/projectile/automatic/rifle/konyang/k556 + accessory = /obj/item/clothing/accessory/holster/hip + accessory_contents = /obj/item/gun/projectile/pistol/sol + belt = /obj/item/storage/belt/military + id = /obj/item/card/id/ert + + belt_contents = list( + /obj/item/ammo_magazine/a556/k556 = 2, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/handcuffs/ziptie = 2, + /obj/item/grenade/frag = 1, + /obj/item/melee/energy/sword/knife/sol = 1 + ) + +/datum/outfit/admin/ert/konyang/get_id_access() + return list(access_distress, access_external_airlocks, access_coalition, access_coalition_navy, access_konyang_police) + +/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(H.isSynthetic()) + H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back) + +/datum/outfit/admin/ert/konyang/medic + name = "KASF Medic" + belt = /obj/item/storage/belt/medical/first_responder/combat + back = /obj/item/storage/backpack/satchel/med + glasses = /obj/item/clothing/glasses/hud/health + gloves = /obj/item/clothing/gloves/latex + + belt_contents = list( + /obj/item/reagent_containers/hypospray/cmo = 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/bicaridine = 1, + /obj/item/reagent_containers/glass/bottle/thetamycin = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1 + ) + + backpack_contents = list( + /obj/item/storage/firstaid/combat = 1, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/storage/firstaid/adv = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/device/healthanalyzer = 1, + /obj/item/stack/medical/advanced/bruise_pack = 1, + /obj/item/stack/medical/advanced/ointment = 1, + /obj/item/melee/energy/sword/knife/sol = 1 + ) + +/datum/outfit/admin/ert/konyang/sapper + name = "KASF Sapper" + back = /obj/item/storage/backpack/industrial + belt = /obj/item/storage/belt/utility/very_full + gloves = /obj/item/clothing/gloves/yellow + suit_store = /obj/item/gun/projectile/automatic/rifle/shotgun/konyang + accessory = /obj/item/clothing/accessory/storage/brown_vest + accessory_contents = list( + /obj/item/plastique = 5, + /obj/item/ammo_magazine/konyang_shotgun = 2 + ) + backpack_contents = list( + /obj/item/ammo_magazine/mc9mm = 3, + /obj/item/gun/projectile/pistol/sol = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/clothing/glasses/welding/superior = 1, + /obj/item/grenade/frag = 2 + ) + + belt_contents = null + +/datum/outfit/admin/ert/konyang/leader + name = "KASF Officer" + uniform = /obj/item/clothing/under/rank/konyang/space/officer diff --git a/code/datums/outfits/ert/hephaestus_ert.dm b/code/datums/outfits/ert/hephaestus_ert.dm new file mode 100644 index 00000000000..69b2a744e75 --- /dev/null +++ b/code/datums/outfits/ert/hephaestus_ert.dm @@ -0,0 +1,95 @@ +/datum/outfit/admin/ert/hephaestus + name = "Hephaestus Asset Protection" + uniform = /obj/item/clothing/under/rank/security/heph + shoes = /obj/item/clothing/shoes/magboots + back = /obj/item/storage/backpack/satchel/heph + suit = /obj/item/clothing/suit/space/void/hephaestus + head = /obj/item/clothing/head/helmet/space/void/hephaestus + belt = /obj/item/storage/belt/military + l_ear = /obj/item/device/radio/headset/distress + id = /obj/item/card/id/hephaestus + mask = /obj/item/clothing/mask/gas/tactical + glasses = /obj/item/clothing/glasses/night + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + suit_store = /obj/item/gun/projectile/shotgun/pump/combat + + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/projectile/sec/lethal) + belt_contents = list( + /obj/item/shield/energy = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/melee/baton/loaded = 1, + /obj/item/grenade/flashbang = 2, + /obj/item/ammo_magazine/c45m = 2 + ) + + backpack_contents = list( + /obj/item/gun/projectile/sec/lethal = 1, + /obj/item/storage/box/shotgunammo = 1, + /obj/item/storage/box/shotgunshells = 1 + ) + + id_iff = IFF_HEPH + +/datum/outfit/admin/ert/hephaestus/get_id_access() + return get_distress_access() + +/datum/outfit/admin/ert/hephaestus/medic + name = "Hephaestus Medic" + belt = /obj/item/storage/belt/medical/first_responder/combat + glasses = /obj/item/clothing/glasses/hud/health + gloves = /obj/item/clothing/gloves/latex + species_gloves = list( + SPECIES_UNATHI = /obj/item/clothing/gloves/latex/unathi + ) + backpack_contents = list( + /obj/item/storage/firstaid/combat = 1, + /obj/item/ammo_magazine/c45m = 3, + /obj/item/storage/firstaid/adv = 1, + /obj/item/handcuffs/ziptie = 1, + /obj/item/device/healthanalyzer = 1, + /obj/item/stack/medical/advanced/bruise_pack = 1, + /obj/item/stack/medical/advanced/ointment = 1, + /obj/item/melee/baton/loaded = 1, + /obj/item/shield/energy = 1, + /obj/item/gun/projectile/sec/lethal = 1, + /obj/item/storage/box/shotgunammo = 1, + /obj/item/storage/box/shotgunshells = 1 + ) + + belt_contents = list( + /obj/item/reagent_containers/hypospray/cmo = 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/bicaridine = 1, + /obj/item/reagent_containers/glass/bottle/thetamycin = 1, + /obj/item/reagent_containers/glass/bottle/dermaline = 1, + /obj/item/reagent_containers/glass/bottle/perconol = 1 + ) + +/datum/outfit/admin/ert/hephaestus/engi + name = "Hephaestus Engineer" + back = /obj/item/storage/backpack/duffel/heph + belt = /obj/item/storage/belt/utility/very_full + gloves = /obj/item/clothing/gloves/yellow + species_gloves = list( + SPECIES_UNATHI = /obj/item/clothing/gloves/yellow/specialu + ) + + backpack_contents = list( + /obj/item/plastique = 3, + /obj/item/ammo_magazine/c45m = 3, + /obj/item/handcuffs/ziptie = 1, + /obj/item/melee/baton/loaded = 1, + /obj/item/clothing/glasses/welding/superior = 1, + /obj/item/gun/projectile/sec/lethal = 1, + /obj/item/storage/box/shotgunammo = 1, + /obj/item/storage/box/shotgunshells = 1 + ) + belt_contents = null + +/datum/outfit/admin/ert/hephaestus/leader + name = "Hephaestus Squad Leader" + uniform = /obj/item/clothing/under/rank/captain/hephaestus diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 7ccd823694c..5d218da0eb5 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -202,6 +202,9 @@ /obj/item/rig_module/mounted/taser ) +/obj/item/rig/gunslinger/equipped/ert + req_access = list(access_distress) + /obj/item/rig/gunslinger/ninja initial_modules = list( diff --git a/code/modules/ghostroles/spawner/human/responseteams/corporate/hephaestus.dm b/code/modules/ghostroles/spawner/human/responseteams/corporate/hephaestus.dm new file mode 100644 index 00000000000..0d8fee244c0 --- /dev/null +++ b/code/modules/ghostroles/spawner/human/responseteams/corporate/hephaestus.dm @@ -0,0 +1,31 @@ +/datum/ghostspawner/human/ert/hephaestus + name = "Hephaestus Industries Asset Protection" + short_name = "hephert" + desc = "A responder from a Hephaestus Industries asset protection squad." + max_count = 2 + welcome_message = "You are a member of a Hephaestus heavy asset protection squad. You have recieved a distress call, and been dispatched to investigate. Obey your commander's orders." + outfit = /datum/outfit/admin/ert/hephaestus + possible_species = list(SPECIES_HUMAN, SPECIES_UNATHI) + +/datum/ghostspawner/human/ert/hephaestus/medical + name = "Hephaestus Industries Medical Specialist" + short_name = "hephmed" + desc = "A medical specialist from a Hephaestus Industries asset protection squad." + max_count = 1 + outfit = /datum/outfit/admin/ert/hephaestus/medic + +/datum/ghostspawner/human/ert/hephaestus/engineer + name = "Hephaestus Industries Engineering Specialist" + short_name = "hepheng" + desc = "An engineering specialist from a Hephaestus Industries asset protection squad." + max_count = 1 + outfit = /datum/outfit/admin/ert/hephaestus/engi + +/datum/ghostspawner/human/ert/hephaestus/leader + name = "Hephaestus Industries Squad Leader" + short_name = "hephlead" + desc = "The commander of a Hephaestus Industries asset protection squad." + max_count = 1 + outfit = /datum/outfit/admin/ert/hephaestus/leader + welcome_message = "You are the commander of a Hephaestus heavy asset protection squad. You have recieved a distress call, and been dispatched to investigate. Lead your team." + diff --git a/code/modules/ghostroles/spawner/human/responseteams/nt_ert.dm b/code/modules/ghostroles/spawner/human/responseteams/corporate/nt_ert.dm similarity index 100% rename from code/modules/ghostroles/spawner/human/responseteams/nt_ert.dm rename to code/modules/ghostroles/spawner/human/responseteams/corporate/nt_ert.dm diff --git a/code/modules/ghostroles/spawner/human/responseteams/corporate/scc_ert.dm b/code/modules/ghostroles/spawner/human/responseteams/corporate/scc_ert.dm new file mode 100644 index 00000000000..a8bb410331e --- /dev/null +++ b/code/modules/ghostroles/spawner/human/responseteams/corporate/scc_ert.dm @@ -0,0 +1,33 @@ +/datum/ghostspawner/human/ert/scc + name = "SCC Responder" + short_name = "sccert" + desc = "A Stellar Corporate Conglomerate emergency responder." + welcome_message = "You are part of an SCC asset protection squad, sent in response to a distress call. Obey your commander and safeguard SCC assets." + max_count = 2 + outfit = /datum/outfit/admin/ert/scc + mob_name_prefix = "Tpr. " + possible_species = list(SPECIES_HUMAN) //no one made an scc skrellmet + spawnpoints = list("NTERTSpawn") + +/datum/ghostspawner/human/ert/scc/engineer + name = "SCC Engineering Specialist" + short_name = "scceng" + desc = "An engineering specialist of the Stellar Corporate Conglomerate ERT." + max_count = 1 + mob_name_prefix = "S/Tpr. " + outfit = /datum/outfit/admin/ert/scc/engineer + +/datum/ghostspawner/human/ert/scc/medic + name = "SCC Medical Specialist" + short_name = "sccmed" + desc = "A medical specialist of the Stellar Corporate Conglomerate ERT." + max_count = 1 + outfit = /datum/outfit/admin/ert/scc/medic + +/datum/ghostspawner/human/ert/scc/commander + name = "SCC ERT Commander" + short_name = "scclead" + desc = "The commander of the Stellar Corporate Conglomerate ERT." + max_count = 1 + mob_name_prefix = "L/Tpr. " + outfit = /datum/outfit/admin/ert/scc/commander diff --git a/code/modules/ghostroles/spawner/human/responseteams/human/coalition.dm b/code/modules/ghostroles/spawner/human/responseteams/human/coalition.dm new file mode 100644 index 00000000000..b089377ba14 --- /dev/null +++ b/code/modules/ghostroles/spawner/human/responseteams/human/coalition.dm @@ -0,0 +1,65 @@ +/datum/ghostspawner/human/ert/coalition + name = "Coalition Ranger" + short_name = "cocr" + max_count = 3 + desc = "Rank and file of the Frontier Ranger response team." + welcome_message = "You are a Ranger with the Frontier Protection Bureau. Your vessel has recieved a distress signal, and you were sent to investigate. Obey the orders of your commander." + outfit = /datum/outfit/admin/ert/coalition + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD) + +/datum/ghostspawner/human/ert/coalition/medic + name = "Coalition Ranger Medic" + short_name = "cocm" + max_count = 1 + desc = "Medical specialist of the Frontier Ranger response team." + outfit = /datum/outfit/admin/ert/coalition/medic + +/datum/ghostspawner/human/ert/coalition/engineer + name = "Coalition Ranger Sapper" + short_name = "coce" + max_count = 1 + desc = "Sapper and engineering specialist of the Frontier Ranger response team." + outfit = /datum/outfit/admin/ert/coalition/sapper + +/datum/ghostspawner/human/ert/coalition/leader + name = "Coalition Ranger Squad Leader" + short_name = "cocl" + max_count = 1 + desc = "Commander of the Frontier Ranger response team." + welcome_message = "You are the commander of a Frontier Ranger patrol vessel. While on patrol, your ship received a distress signal and you were sent to investigate. Lead your team." + outfit = /datum/outfit/admin/ert/coalition/leader + +/datum/ghostspawner/human/ert/konyang + name = "Konyang Aerospace Force Crewman" + short_name = "konc" + desc = "Rank and file of the Konyang Aerospace Force" + welcome_message = "You are a crewman with the Konyang Aerospace Force. You have recieved a distress signal and been dispatched to investigate. Obey your commander." + outfit = /datum/outfit/admin/ert/konyang + max_count = 3 + mob_name_prefix = "PO3. " + possible_species = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_IPC, SPECIES_IPC_BISHOP, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_SHELL, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU) + +/datum/ghostspawner/human/ert/konyang/medic + name = "Konyang Aerospace Force Medic" + short_name = "konm" + desc = "Medical specialist of the Konyang Aerospace Force." + mob_name_prefix = "PO2. " + outfit = /datum/outfit/admin/ert/konyang/medic + max_count = 1 + +/datum/ghostspawner/human/ert/konyang/sapper + name = "Konyang Aerospace Force Sapper" + short_name = "kons" + desc = "Sapper and engineering specialist of the Konyang Aerospace Force." + mob_name_prefix = "PO1. " + outfit = /datum/outfit/admin/ert/konyang/sapper + max_count = 1 + +/datum/ghostspawner/human/ert/konyang/leader + name = "Konyang Aerospace Force Squad Leader" + short_name = "konl" + desc = "Commander of the Konyang Aerospace Force response team." + welcome_message = "You are an officer of the Konyang Aerospace Force. While on patrol, your ship received a distress signal and you were sent to investigate. Lead your team." + mob_name_prefix = "LT. " + outfit = /datum/outfit/admin/ert/konyang/leader + max_count = 1 diff --git a/html/changelogs/RustingWithYou - emergency.yml b/html/changelogs/RustingWithYou - emergency.yml new file mode 100644 index 00000000000..14c34dcc5e1 --- /dev/null +++ b/html/changelogs/RustingWithYou - emergency.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds new ERTs for Hephaestus, the SCC, Coalition Rangers and Konyang."