Frontiersmen-Ening Part 1: Clothes! (shiptest-ss13#3087)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Does what it says on the tin, visually enhancing the Frontiersmen and
making them into real, genuine threats aesthetically!

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/547b3908-0742-4a20-b9bc-1bd73667db1e)

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/c108e357-dcb9-4010-9a05-978616c86704)

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/800197aa-7dc4-441c-8724-29036af1ba24)

This PR also makes several balance changes to equipment, as well as
adding entirely new equipment for the Frontiersmen to reap chaos in the
frontier!

Captains beware! A new role to sow devastation and wreak havoc in style
has arrived! While wearing suspiciously itchy fireproof armor, they
wield flamethrowers capable of burning targets down with deadly
precision. Their kit includes:

- A Fireproof X-11 Helmet
- A Fireproof Black Jumpsuit
- A Fireproof Coat
- A Unique Gas Mask

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/a5faa0d2-3e51-4204-ae49-122727d1f862)

In an effort to make them even scarier, flamethrowers were buffed
slightly by having them an extra tile of reach, and some slightly higher
damage!

This PR also adds the completely new Heavy Frontiersmen Armor, seen
previously worn by the heavy minigunners that walk their ranks.

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/fcfd6070-8335-420a-b09d-859c3715a73f)

As such, a balance change was made to marine armor, increasing its
defensive values, at the cost of a minor slowdown.

Finally, this PR also adds pre-sawn subtypes of the shotguns and the
Beacon, and revamps the ERTs and roles. These changes are mostly
non-player facing.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Improving one of the crustiest sprites for our main antagonist faction
is probably a big priority!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: PositiveEntropy
add: CLIP now reports the presence of so-called "Flame Troopers" of the
Frontiersmen terrorizing their territories...
balance: Marine armor has improved armor stats at the cost of the bulk
slowing down the wearer.
balance: Flamethrowers have a slightly improved effective range, as well
as higher damage.
imageadd: The Frontiersmen have gotten better tailors and now look sharp
and deadly!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: FalloutFalcon <[email protected]>
Co-authored-by: retlaw34 <[email protected]>

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -558,7 +558,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "gF" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/under/rank/security/officer/frontier/officer,
+/obj/item/clothing/under/frontiersmen/officer,
 /obj/item/clothing/suit/armor/frontier,
 /obj/item/clothing/head/beret/sec/frontier/officer,
 /turf/open/floor/carpet/red_gold,
@@ -1671,7 +1671,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/item/clothing/under/rank/security/officer/frontier,
+/obj/item/clothing/under/frontiersmen,
 /obj/item/clothing/head/beret/sec/frontier,
 /obj/machinery/light_switch{
 	pixel_y = 21;
@@ -3244,7 +3244,7 @@
 /obj/structure/closet/cabinet,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/item/clothing/under/rank/security/officer/frontier,
+/obj/item/clothing/under/frontiersmen,
 /obj/item/clothing/head/beret/sec/frontier,
 /obj/item/clothing/under/misc/pj/blue,
 /obj/machinery/light/small/broken/directional/north,
@@ -3931,9 +3931,9 @@
 	},
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/cobweb,
-/obj/item/clothing/under/rank/security/officer/frontier,
-/obj/item/clothing/under/rank/security/officer/frontier,
-/obj/item/clothing/under/rank/security/officer/frontier,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen,
 /obj/item/clothing/suit/armor/vest/bulletproof/frontier,
 /obj/item/clothing/suit/armor/vest/bulletproof/frontier,
 /obj/item/clothing/suit/armor/vest/bulletproof/frontier,

_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm

@@ -2249,7 +2249,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/unpowered/crashed_starwalker)
 "Kq" = (
-/obj/item/clothing/under/rank/security/officer/frontier,
+/obj/item/clothing/under/frontiersmen/officer,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/overmap_encounter/planetoid/lava/explored)
 "Ks" = (
@@ -2646,7 +2646,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "5-6"
 	},
-/obj/item/clothing/under/rank/security/officer/frontier,
+/obj/item/clothing/under/frontiersmen/officer,
 /turf/open/floor/pod,
 /area/ruin/unpowered/crashed_starwalker)
 "Rg" = (

_maps/shuttles/pirate/pirate_tortuga.dmm

@@ -3015,13 +3015,13 @@
 "Op" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/closet/cabinet,
-/obj/item/clothing/under/rank/security/officer/frontier/officer{
+/obj/item/clothing/under/frontiersmen/officer{
 	pixel_x = -5
 	},
 /obj/item/clothing/shoes/jackboots{
 	pixel_y = -13
 	},
-/obj/item/clothing/head/caphat/frontier{
+/obj/item/clothing/head/frontier/peaked{
 	pixel_y = 9
 	},
 /obj/item/clothing/suit/armor/frontier{
@@ -3030,10 +3030,10 @@
 /obj/item/clothing/suit/armor/frontier{
 	pixel_x = 8
 	},
-/obj/item/clothing/under/rank/security/officer/frontier/officer{
+/obj/item/clothing/under/frontiersmen/officer{
 	pixel_x = -5
 	},
-/obj/item/clothing/head/caphat/frontier{
+/obj/item/clothing/head/frontier/peaked{
 	pixel_y = 9
 	},
 /obj/item/clothing/shoes/jackboots{
@@ -3515,17 +3515,17 @@
 /area/ship/crew/canteen)
 "Vg" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/under/rank/security/officer/frontier{
+/obj/item/clothing/under/frontiersmen{
 	pixel_x = -7
 	},
-/obj/item/clothing/under/rank/security/officer/frontier{
+/obj/item/clothing/under/frontiersmen{
 	pixel_x = -4
 	},
-/obj/item/clothing/under/rank/security/officer/frontier,
-/obj/item/clothing/under/rank/security/officer/frontier{
+/obj/item/clothing/under/frontiersmen,
+/obj/item/clothing/under/frontiersmen{
 	pixel_x = 4
 	},
-/obj/item/clothing/under/rank/security/officer/frontier{
+/obj/item/clothing/under/frontiersmen{
 	pixel_x = 8
 	},
 /obj/item/clothing/shoes/jackboots{

_maps/shuttles/syndicate/syndicate_litieguai.dmm

@@ -1410,9 +1410,9 @@
 	name = "armor locker";
 	req_access_txt = "5"
 	},
-/obj/item/clothing/suit/armor/vest/marine/trauma,
-/obj/item/clothing/suit/armor/vest/marine/trauma,
-/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/clothing/suit/armor/vest/trauma,
+/obj/item/clothing/suit/armor/vest/trauma,
+/obj/item/clothing/suit/armor/vest/trauma,
 /obj/item/clothing/head/helmet/medical,
 /obj/item/clothing/head/helmet/medical,
 /obj/item/clothing/head/helmet/medical,

_maps/shuttles/syndicate/syndicate_twinkleshine.dmm

@@ -1377,7 +1377,7 @@
 /obj/item/clothing/under/syndicate/medic/skirt,
 /obj/item/clothing/under/syndicate/medic,
 /obj/item/clothing/head/helmet/medical,
-/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/clothing/suit/armor/vest/trauma,
 /obj/item/storage/belt/medical,
 /obj/item/storage/belt/medical/webbing,
 /obj/item/clothing/gloves/color/latex/nitrile/evil,
@@ -5020,7 +5020,7 @@
 /obj/item/clothing/under/syndicate/medic/skirt,
 /obj/item/clothing/under/syndicate/medic,
 /obj/item/clothing/head/helmet/medical,
-/obj/item/clothing/suit/armor/vest/marine/trauma,
+/obj/item/clothing/suit/armor/vest/trauma,
 /obj/item/antag_spawner/nuke_ops/borg_tele/medical/unlocked,
 /obj/item/storage/belt/medical,
 /obj/item/storage/belt/medical/webbing,
@@ -5608,14 +5608,6 @@
 /area/ship/security)
 "Gm" = (
 /obj/structure/rack,
-/obj/item/gun/ballistic/automatic/ebr/no_mag{
-	pixel_x = -16;
-	pixel_y = 7;
-	},
-/obj/item/gun/ballistic/automatic/ebr/no_mag{
-	pixel_x = -9;
-	pixel_y = 2;
-	},
 /obj/item/ammo_box/magazine/ebr{
 	pixel_x = 10;
 	pixel_y = -1
@@ -5630,6 +5622,11 @@
 /obj/item/ammo_box/magazine/ebr{
 	pixel_y = -2
 	},
+/obj/item/gun/ballistic/automatic/ebr/no_mag{
+	pixel_x = -7;
+	pixel_y = 4
+	},
+/obj/item/gun/ballistic/automatic/ebr/no_mag,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "Gn" = (
@@ -7501,11 +7498,11 @@
 /obj/structure/rack,
 /obj/item/gun/ballistic/shotgun/bulldog/no_mag{
 	pixel_x = -7;
-	pixel_y = 7;
+	pixel_y = 7
 	},
 /obj/item/gun/ballistic/shotgun/bulldog/no_mag{
 	pixel_y = -3;
-	pixel_x = 2;
+	pixel_x = 2
 	},
 /obj/machinery/light/directional/north,
 /obj/item/ammo_box/magazine/m12g{
@@ -8838,14 +8835,14 @@
 /obj/structure/rack,
 /obj/item/gun/ballistic/automatic/smg/c20r/no_mag{
 	pixel_x = 2;
-	pixel_y = 8;
+	pixel_y = 8
 	},
 /obj/item/gun/ballistic/automatic/smg/c20r/no_mag{
-	pixel_y = 3;
+	pixel_y = 3
 	},
 /obj/item/gun/ballistic/automatic/smg/c20r/no_mag{
 	pixel_y = -2;
-	pixel_x = 3;
+	pixel_x = 3
 	},
 /obj/item/ammo_box/magazine/smgm45,
 /obj/item/ammo_box/magazine/smgm45,

code/datums/ert.dm

@@ -257,10 +257,16 @@
 
 /datum/ert/frontier/assault
 	leader_role = /datum/antagonist/ert/frontier/leader
-	roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
+	roles = list(/datum/antagonist/ert/frontier/better, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
 	rename_team = "Assault Frontiersmen Team"
 	polldesc = "a well armed squad of pirates"
 
+/datum/ert/frontier/unarmed //use for finer control of pirate's armaments
+	leader_role = /datum/antagonist/ert/frontier/leader/unnarmed
+	roles = list(/datum/antagonist/ert/frontier/unnarmed)
+	rename_team = "Unnarmed Frontiersmen Team"
+	polldesc = "a custom squad of pirates"
+
 /datum/ert/independent
 	teamsize = 3
 	opendoors = FALSE

code/game/objects/items/flamethrower.dm

@@ -183,9 +183,9 @@
 	update_appearance()
 
 #define REQUIRED_POWER_TO_FIRE_FLAMETHROWER 10
-#define FLAMETHROWER_POWER_MULTIPLIER 0.5
-#define FLAMETHROWER_RANGE 4
-#define FLAMETHROWER_RELEASE_AMOUNT 8
+#define FLAMETHROWER_POWER_MULTIPLIER 0.8
+#define FLAMETHROWER_RANGE 5
+#define FLAMETHROWER_RELEASE_AMOUNT 5
 
 /obj/item/flamethrower/proc/flame_turf(target)
 	if(!beaker)

code/game/objects/items/storage/belt.dm

@@ -248,6 +248,16 @@
 	new /obj/item/hypospray/mkii(src)
 	update_appearance()
 
+/obj/item/storage/belt/medical/webbing/surgery/PopulateContents()
+	new /obj/item/scalpel(src)
+	new /obj/item/circular_saw(src)
+	new /obj/item/surgicaldrill(src)
+	new /obj/item/retractor(src)
+	new /obj/item/cautery(src)
+	new /obj/item/hemostat(src)
+	new /obj/item/hypospray/mkii(src)
+	update_appearance()
+
 /obj/item/storage/belt/security
 	name = "security belt"
 	desc = "Can hold security gear like handcuffs and flashes."

code/game/objects/items/storage/boxes.dm

@@ -124,8 +124,12 @@
 	var/radio_type = /obj/item/radio
 
 /obj/item/storage/box/survival/PopulateContents()
-	new mask_type(src)
-	new radio_type(src)
+	if(!isnull(mask_type))
+		new mask_type(src)
+
+	if(!isnull(radio_type))
+		new radio_type(src)
+
 	if(!isnull(medipen_type))
 		new medipen_type(src)
 
@@ -165,10 +169,12 @@
 
 /obj/item/storage/box/survival/clip/balaclava
 	mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava
-
-/obj/item/storage/box/survival/clip/balaclava
 	internal_type = /obj/item/tank/internals/emergency_oxygen/double
 
+/obj/item/storage/box/survival/frontier
+	mask_type = null // we spawn in gas masks in frontiersmen bags alongside this, so it isn't nessary
+	internal_type = /obj/item/tank/internals/emergency_oxygen //frontiersmen dont
+
 /obj/item/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains sterile latex gloves."

code/modules/antagonists/ert/frontiersmen.dm

@@ -26,6 +26,9 @@
 	outfit = /datum/outfit/job/frontiersmen/ert/leader
 	role = "Officer"
 
+/datum/antagonist/ert/frontier/leader/unnarmed
+	outfit = /datum/outfit/job/frontiersmen/ert/leader/unnarmed
+
 /datum/antagonist/ert/frontier/medic
 	name = "Frontiersmen Medic"
 	outfit = /datum/outfit/job/frontiersmen/ert/medic
@@ -35,3 +38,11 @@
 	name = "Frontiersmen Engineer"
 	outfit = /datum/outfit/job/frontiersmen/ert/engineer
 	role = "Sapper"
+
+/datum/antagonist/ert/frontier/better
+	name = "Frontiersmen Grunt"
+	outfit = /datum/outfit/job/frontiersmen/ert/grunt/skm
+
+/datum/antagonist/ert/frontier/unnarmed
+	name = "Frontiersmen Grunt"
+	outfit = /datum/outfit/job/frontiersmen/ert/grunt