From f35599612853763eeab3a448982ec8198b778015 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 1 Aug 2020 17:53:11 -0300 Subject: [PATCH] Adds megacorps troopers loadout (#9517) --- aurorastation.dme | 1 + code/datums/outfits/event/outfit_megacorps.dm | 128 ++++++++++++++++++ code/modules/admin/verbs/debug.dm | 1 + .../human/responseteams/med_eridani.dm | 2 + html/changelogs/alberyk-loadout.yml | 6 + 5 files changed, 138 insertions(+) create mode 100644 code/datums/outfits/event/outfit_megacorps.dm create mode 100644 html/changelogs/alberyk-loadout.yml diff --git a/aurorastation.dme b/aurorastation.dme index c052a7de593..a2a7ed25954 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -314,6 +314,7 @@ #include "code\datums\outfits\ert\tcfl.dm" #include "code\datums\outfits\event\outfit_killers.dm" #include "code\datums\outfits\event\outfit_lance.dm" +#include "code\datums\outfits\event\outfit_megacorps.dm" #include "code\datums\outfits\event\outfit_nanotrasen.dm" #include "code\datums\outfits\event\outfit_tfcl.dm" #include "code\datums\radio\frequency.dm" diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm new file mode 100644 index 00000000000..f0fe2750e22 --- /dev/null +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -0,0 +1,128 @@ +/datum/outfit/admin/megacorp/hephaestus_trooper + name = "Hephaestus Asset Protection" + + uniform = /obj/item/clothing/under/rank/hephaestus/tech + back = /obj/item/storage/backpack/satchel + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/magboots + belt = /obj/item/storage/belt/military + l_ear = /obj/item/device/radio/headset/syndicate + suit_store = /obj/item/gun/energy/laser + suit = /obj/item/clothing/suit/space/void/hephaestus + head = /obj/item/clothing/head/helmet/space/void/hephaestus + id = /obj/item/card/id/syndicate + mask = /obj/item/clothing/mask/gas/syndicate + glasses = /obj/item/clothing/glasses/night + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/energy/stunrevolver = 1) + + belt_contents = list( + /obj/item/shield/energy = 1, + /obj/item/device/flash = 1, + /obj/item/handcuffs/ziptie = 2, + /obj/item/melee/baton/loaded = 1, + /obj/item/grenade/flashbang = 2 + ) + +/datum/outfit/admin/megacorp/hephaestus_trooper/heavy + name = "Hephaestus Heavy Asset Protection" + + back = /obj/item/gun/projectile/shotgun/pump/combat + gloves = /obj/item/clothing/gloves/force + glasses = /obj/item/clothing/glasses/thermal + + accessory = /obj/item/clothing/accessory/storage/bandolier + accessory_contents = list( + /obj/item/ammo_casing/shotgun = 8, + /obj/item/ammo_casing/shotgun/pellet = 8 + ) + +/datum/outfit/admin/megacorp/zenghu_trooper + name = "Zeng Hu Pharmaceuticals Asset Protection" + + uniform = /obj/item/clothing/under/rank/zeng/civilian + back = /obj/item/storage/backpack/satchel + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/magboots + belt = /obj/item/storage/belt/military + l_ear = /obj/item/device/radio/headset/syndicate + suit_store = /obj/item/gun/energy/laser + suit = /obj/item/clothing/suit/space/void/zenghu + head = /obj/item/clothing/head/helmet/space/void/zenghu + id = /obj/item/card/id/syndicate + mask = /obj/item/clothing/mask/gas/syndicate + glasses = /obj/item/clothing/glasses/night + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/energy/toxgun = 1) + + belt_contents = list( + /obj/item/shield/energy = 1, + /obj/item/device/flash = 1, + /obj/item/handcuffs/ziptie = 2, + /obj/item/melee/baton/loaded = 1, + /obj/item/grenade/flashbang = 2 + ) + +/datum/outfit/admin/megacorp/zenghu_trooper/heavy + name = "Zeng Hu Pharmaceuticals Heavy Asset Protection" + + gloves = /obj/item/clothing/gloves/force + glasses = /obj/item/clothing/glasses/thermal + + accessory_contents = list(/obj/item/gun/energy/decloner = 1) + +/datum/outfit/admin/megacorp/zavodskoi_trooper + name = "Zavodskoi Interstellar Asset Protection" + + uniform = /obj/item/clothing/under/rank/zavodskoi + back = /obj/item/storage/backpack/satchel + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/magboots + belt = /obj/item/storage/belt/military + l_ear = /obj/item/device/radio/headset/syndicate + suit_store = /obj/item/gun/projectile/automatic/wt550 + suit = /obj/item/clothing/suit/space/void/zavodskoi + head = /obj/item/clothing/head/helmet/space/void/zavodskoi + id = /obj/item/card/id/syndicate + mask = /obj/item/clothing/mask/gas/syndicate + glasses = /obj/item/clothing/glasses/night + l_pocket = /obj/item/tank/emergency_oxygen/double + r_pocket = /obj/item/crowbar/red + + accessory = /obj/item/clothing/accessory/holster/hip/brown + accessory_contents = list(/obj/item/gun/projectile/pistol = 1) + + belt_contents = list( + /obj/item/shield/energy = 1, + /obj/item/device/flash = 1, + /obj/item/handcuffs/ziptie = 2, + /obj/item/melee/baton/loaded = 1, + /obj/item/grenade/flashbang = 2 + ) + + backpack_contents = list( + /obj/item/ammo_magazine/mc9mmt/rubber = 3, + /obj/item/ammo_magazine/mc9mmt = 2, + /obj/item/ammo_magazine/mc9mm = 3 + ) + +/datum/outfit/admin/megacorp/zavodskoi_trooper/heavy + name = "Zavodskoi Interstellar Heavy Asset Protection" + + gloves = /obj/item/clothing/gloves/force + glasses = /obj/item/clothing/glasses/thermal + + accessory_contents = list(/obj/item/gun/projectile/tanto = 1) + + suit_store = /obj/item/gun/projectile/automatic/rifle/sol + + backpack_contents = list( + /obj/item/ammo_magazine/mc10mm = 3, + /obj/item/ammo_magazine/c762/sol = 2 + ) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 124ccf8b12e..924dfb9c8bc 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -328,6 +328,7 @@ outfit_catagories["TCFL"] = typesof(/datum/outfit/admin/tcfl) outfit_catagories["Killers"] = typesof(/datum/outfit/admin/killer) outfit_catagories["Job"] = subtypesof(/datum/outfit/job) + outfit_catagories["Megacorps"] = subtypesof(/datum/outfit/admin/megacorp) outfit_catagories["Miscellaneous"] = typesof(/datum/outfit/admin/random) outfit_catagories["Miscellaneous"] += /datum/outfit/admin/random_employee diff --git a/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm b/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm index fe78a9dff64..50f3a583e76 100644 --- a/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm +++ b/code/modules/ghostroles/spawner/human/responseteams/med_eridani.dm @@ -15,6 +15,8 @@ max_count = 2 desc = "A highly trained bodyguard. Sticks close to the medics while they work." outfit = /datum/outfit/admin/ert/med_eridani/bodyguard + possible_species = list("Human", "Off-Worlder Human") + /datum/ghostspawner/human/ert/med_eridani/paramedic name = "Eridani Medical Contractor Paramedic" diff --git a/html/changelogs/alberyk-loadout.yml b/html/changelogs/alberyk-loadout.yml new file mode 100644 index 00000000000..a479c811d69 --- /dev/null +++ b/html/changelogs/alberyk-loadout.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Added megacorp outfits to the admin option in the set human outfit command."