From 982c4bcad4c3b73fac596a468f00c0958f53d0cc Mon Sep 17 00:00:00 2001 From: Cheshify <73589390+Cheshify@users.noreply.github.com> Date: Sun, 2 Jul 2023 16:41:04 -0400 Subject: [PATCH] Frontier Militia ERT Fix [NO GBP] (#76454) ## About The Pull Request Makes sure only ONE LEADER SPAWNS instead of like 3 Also they have headsets And I removed their energy pistols Renames the ERT roles to shorten the names, I totally didn't get how that worked ## Why It's Good For The Game TOO MANY LEADERS WERE SPAWNING Headsets good The energy pistols detracted from the musket, which is what makes em unique and fun. The ERT names were too direct a reference. ## Changelog :cl: fix: Frontier Militia only have one general now, and have headsets. balance: Frontier Militia no longer have energy pistols. /:cl: --- code/datums/ert.dm | 2 +- code/modules/antagonists/ert/ert.dm | 4 ++-- code/modules/clothing/outfits/ert.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index 1ab5594e949..7e358b38cec 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -118,7 +118,7 @@ ert_template = /datum/map_template/shuttle/ert/bounty /datum/ert/militia - roles = list(/datum/antagonist/ert/militia, /datum/antagonist/ert/militia/general) + roles = list(/datum/antagonist/ert/militia) leader_role = /datum/antagonist/ert/militia/general teamsize = 4 opendoors = FALSE diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 837159a4183..d1d40c5cf22 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -279,9 +279,9 @@ /datum/antagonist/ert/militia name = "Frontier Militia" outfit = /datum/outfit/centcom/militia - role = "Minuteman" + role = "Volunteer" /datum/antagonist/ert/militia/general name = "Frontier Militia General" outfit = /datum/outfit/centcom/militia/general - role = "Minuteman Leader" + role = "General" diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index dd2a77b33f7..c4ee2d6e411 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -551,7 +551,7 @@ back = /obj/item/storage/backpack/satchel/leather l_pocket = /obj/item/switchblade r_pocket = /obj/item/reagent_containers/hypospray/medipen/salacid - belt = /obj/item/storage/belt/holster/energy/thermal + ears = /obj/item/radio/headset backpack_contents = list( /obj/item/storage/box/survival = 1, /obj/item/storage/medkit/emergency = 1,