Skip to content

Commit

Permalink
minor gripes
Browse files Browse the repository at this point in the history
  • Loading branch information
meemofcourse committed Nov 8, 2023
1 parent 78f5b0a commit 91db911
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 20 deletions.
5 changes: 5 additions & 0 deletions _maps/shuttles/subshuttles/frontiersmen_gut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -625,6 +628,7 @@
dir = 8;
color = "#808080"
},
/obj/effect/landmark/ert_shuttle_spawn,
/turf/open/floor/plasteel/tech,
/area/ship/storage)
"UA" = (
Expand Down Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
16 changes: 8 additions & 8 deletions code/modules/antagonists/ert/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<B><font size=3 color=red>You are the [name].</font></B>")
var/missiondesc = "You have been sent on a mission by the Frontiersmen to [station_name()].<BR>"
var/missiondesc = "You have been sent on a mission by the Frontiersmen pirate fleet to [station_name()].<BR>"
if(leader) //If Squad Leader
missiondesc += "Lead your team to complete your objectives."
else
Expand All @@ -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"
10 changes: 5 additions & 5 deletions code/modules/clothing/outfits/ert/frontiersmen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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"

Expand All @@ -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"
Expand All @@ -56,4 +56,4 @@

backpack_contents = list(/obj/item/grenade/c4=3, /obj/item/crowbar/large=1)

id_role = "Carpenter"
id_role = "Sapper"
6 changes: 4 additions & 2 deletions code/modules/clothing/outfits/ert/inteq_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 25 in code/modules/clothing/outfits/ert/inteq_ert.dm

View workflow job for this annotation

GitHub Actions / Run Linters

non-constant assignment

id_role = "Enforcer"

Expand Down

0 comments on commit 91db911

Please sign in to comment.