From 91db91196e989a54d117bc0b938a215d6623c0ea Mon Sep 17 00:00:00 2001
From: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Date: Wed, 8 Nov 2023 17:03:29 -0300
Subject: [PATCH] minor gripes
---
_maps/shuttles/subshuttles/frontiersmen_gut.dmm | 5 +++++
code/game/objects/items/storage/belt.dm | 5 -----
code/modules/antagonists/ert/ert.dm | 16 ++++++++--------
.../clothing/outfits/ert/frontiersmen_ert.dm | 10 +++++-----
code/modules/clothing/outfits/ert/inteq_ert.dm | 6 ++++--
5 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm
index cf1571f9d7d4..3b05c2224080 100644
--- a/_maps/shuttles/subshuttles/frontiersmen_gut.dmm
+++ b/_maps/shuttles/subshuttles/frontiersmen_gut.dmm
@@ -247,6 +247,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
+/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"qh" = (
@@ -341,6 +342,7 @@
},
/obj/machinery/light/directional/east,
/obj/machinery/power/apc/auto_name/directional/north,
+/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"ue" = (
@@ -569,6 +571,7 @@
color = "#808080"
},
/obj/machinery/light/directional/east,
+/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"RY" = (
@@ -625,6 +628,7 @@
dir = 8;
color = "#808080"
},
+/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"UA" = (
@@ -686,6 +690,7 @@
dir = 1;
name = "tactical chair"
},
+/obj/effect/landmark/ert_shuttle_brief_spawn,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/storage)
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 7ac7c7d800b9..3d8f619b54f2 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -846,8 +846,3 @@
desc = "A harness with a bunch of pouches attached to them emblazoned in the colors of the IRMG, can hold security gear."
icon_state = "inteq_droppouch"
item_state = "inteq_droppouch"
-
-/obj/item/storage/belt/security/webbing/inteq/alt/bulldog/PopulateContents()
- . = ..()
- for(var/i in 1 to 7)
- new /obj/item/ammo_box/magazine/m12g(src)
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 2adad0b205ac..05d12d3a79e5 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -443,12 +443,12 @@
/datum/antagonist/ert/frontier
name = "Frontiersmen Pirate"
- outfit = /datum/outfit/job/assistant/frontiersmen
- role = "Buccaneer"
+ outfit = /datum/outfit/centcom/ert/frontiersmen
+ role = "Grunt"
/datum/antagonist/ert/frontier/greet()
to_chat(owner, "You are the [name].")
- var/missiondesc = "You have been sent on a mission by the Frontiersmen to [station_name()].
"
+ var/missiondesc = "You have been sent on a mission by the Frontiersmen pirate fleet to [station_name()].
"
if(leader) //If Squad Leader
missiondesc += "Lead your team to complete your objectives."
else
@@ -459,15 +459,15 @@
/datum/antagonist/ert/frontier/leader
name = "Frontiersmen Officer"
- outfit = /datum/outfit/job/head_of_personnel/frontiersmen
+ outfit = /datum/outfit/centcom/ert/frontiersmen/leader
role = "Officer"
/datum/antagonist/ert/frontier/medic
name = "Frontiersmen Medic"
- outfit = /datum/outfit/job/doctor/frontiersmen
- role = "Medic"
+ outfit = /datum/outfit/centcom/ert/frontiersmen/medic
+ role = "Stretcher-Bearer"
/datum/antagonist/ert/frontier/engineer
name = "Frontiersmen Engineer"
- outfit = /datum/outfit/job/engineer/independent/frontiersmen
- role = "Carpenter"
+ outfit = /datum/outfit/centcom/ert/frontiersmen/engineer
+ role = "Sapper"
diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
index cdb5eef81c20..612603976385 100644
--- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
+++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -7,7 +7,7 @@
suit_store = /obj/item/gun/ballistic/rifle/boltaction
uniform = /obj/item/clothing/under/rank/security/officer/frontier
shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
+ gloves = /obj/item/clothing/gloves/color/black
ears = /obj/item/radio/headset/pirate/alt
back = /obj/item/storage/backpack
belt = null
@@ -16,7 +16,7 @@
backpack_contents = list(/obj/item/ammo_box/a762=5, /obj/item/grenade/frag=1)
- id_role = "Buccaneer"
+ id_role = "Grunt"
/datum/outfit/centcom/ert/frontiersmen/leader
name = "ERT - Frontiersman Officer"
@@ -29,7 +29,7 @@
suit_store = /obj/item/gun/ballistic/revolver/nagant
belt = /obj/item/storage/belt/military/assault
- backpack_contents = list(/obj/item/ammo_box/n762_clip=3, /obj/item/binoculars=1, /obj/item/melee/classic_baton/telescopic)
+ backpack_contents = list(/obj/item/ammo_box/n762_clip=3, /obj/item/binoculars=1, /obj/item/kitchen/knife/combat/survival)
id_role = "Officer"
@@ -44,7 +44,7 @@
backpack_contents = list(/obj/item/storage/firstaid/medical=1, /obj/item/reagent_containers/hypospray/medipen/stimpack=3)
- id_role = "Medic"
+ id_role = "Stretcher-Bearer"
/datum/outfit/centcom/ert/frontiersmen/engineer
name = "ERT - Frontiersman Engineer"
@@ -56,4 +56,4 @@
backpack_contents = list(/obj/item/grenade/c4=3, /obj/item/crowbar/large=1)
- id_role = "Carpenter"
+ id_role = "Sapper"
diff --git a/code/modules/clothing/outfits/ert/inteq_ert.dm b/code/modules/clothing/outfits/ert/inteq_ert.dm
index 848896fce297..da828a3ad210 100644
--- a/code/modules/clothing/outfits/ert/inteq_ert.dm
+++ b/code/modules/clothing/outfits/ert/inteq_ert.dm
@@ -19,8 +19,10 @@
/datum/outfit/centcom/ert/inteq/shotgun
name = "ERT - Inteq Shotgunner"
- suit_store = /obj/item/gun/ballistic/shotgun/bulldog/inteq
- belt = /obj/item/storage/belt/security/webbing/inteq/alt/bulldog
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat
+ belt = /obj/item/storage/belt/security/webbing/inteq/alt
+
+ backpack_contents = (/obj/item/storage/box/lethalshot=2)
id_role = "Enforcer"