Skip to content

Commit

Permalink
Fixes #2628 (#2674)
Browse files Browse the repository at this point in the history
<!-- 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. -->

## About The Pull Request
Continuation of #2628, which was merged without a testmerge. This fixes
some ERT outfits, adds a Syndicate Inspector ERT (which had the outfit
defined but not the ERT), and fixes the independent sechud background.
Also messes with the CMM Inspector's icon.

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/a3ac82d6-e5c2-4028-9992-f2565604ac0b)


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
blame zephyr

<!-- 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. -->

## Changelog

:cl:
add: ACLF Syndicate Inspector ERT
fix: Independent background icons
fix: ERT Outfits not having access and proper names
/: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. -->
  • Loading branch information
meemofcourse authored Feb 2, 2024
1 parent 8d3186d commit 22610d6
Show file tree
Hide file tree
Showing 11 changed files with 74 additions and 6 deletions.
11 changes: 11 additions & 0 deletions code/datums/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,17 @@
rename_team = "Cybersun Medical Intervention Team"
polldesc = "a Cybersun paramedic team"

/datum/ert/syndicate/inspector
teamsize = 1
leader_role = /datum/antagonist/ert/official/syndicate
roles = list(/datum/antagonist/ert/official/syndicate)
rename_team = "Syndicate Inspector"
polldesc = "a syndicate inspector"
spawn_at_outpost = FALSE

/datum/ert/syndicate/inspector/New()
mission = "Conduct a routine review on [station_name()]'s vessels."

// Frontiersmen
/datum/ert/frontier
teamsize = 4
Expand Down
12 changes: 12 additions & 0 deletions code/modules/antagonists/ert/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,18 @@
outfit = /datum/outfit/job/syndicate/ert/cybersun/medic/leader
role = "Lead Medical Technician"

/datum/antagonist/ert/official/syndicate
name = "Syndicate Inspector"
outfit = /datum/outfit/job/syndicate/ert/inspector
role = "Syndicate Inspector"

/datum/antagonist/ert/official/solgov/greet()
to_chat(owner, "<B><font size=3 color=red>You are a Syndicate Inspector.</font></B>")
if (ert_team)
to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")
else
to_chat(owner, "The Syndicate Coalition is sending you to [station_name()] with the task: [mission.explanation_text]")

// ********************************************************************
// ** Frontiersmen **
// ********************************************************************
Expand Down
12 changes: 12 additions & 0 deletions code/modules/clothing/outfits/ert/indie_ert.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/datum/outfit/job/independent/ert
name = "ERT - Independent Security Officer"
jobtype = /datum/job/officer
job_icon = "securityofficer"

head = /obj/item/clothing/head/helmet/sec
ears = /obj/item/radio/headset/alt
Expand All @@ -14,6 +16,8 @@

/datum/outfit/job/independent/ert/emt
name = "ERT - Independent Paramedic"
jobtype = /datum/job/paramedic
job_icon = "paramedic"

head = /obj/item/clothing/head/soft/paramedic
mask = null
Expand All @@ -27,6 +31,8 @@

/datum/outfit/job/independent/ert/firefighter
name = "ERT - Independent Firefighter (Standard)"
jobtype = /datum/job/atmos
job_icon = "atmospherictechnician"

head = /obj/item/clothing/head/hardhat/red
uniform = /obj/item/clothing/under/utility
Expand All @@ -43,6 +49,8 @@

/datum/outfit/job/independent/ert/firefighter/medic
name = "ERT - Independent Firefighter (Medic)"
jobtype = /datum/job/paramedic
job_icon = "paramedic"

mask = /obj/item/clothing/mask/breath/medical
back = /obj/item/storage/backpack/fireproof
Expand All @@ -56,6 +64,8 @@

/datum/outfit/job/independent/ert/firefighter/leader
name = "ERT - Independent Firefighter (Group Captain)"
jobtype = /datum/job/chief_engineer
job_icon = "chiefengineer"

back = /obj/item/fireaxe
suit = /obj/item/clothing/suit/space/hardsuit/engine
Expand All @@ -66,6 +76,8 @@

/datum/outfit/job/independent/ert/technician
name = "ERT - Independent Technician"
jobtype = /datum/job/engineer
job_icon = "stationengineer"

head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineering/engineer
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/outfits/ert/inteq_ert.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/datum/outfit/job/inteq/ert
name = "ERT - Inteq Rifleman"
jobtype = /datum/job/officer
job_icon = "securityofficer"

mask = /obj/item/clothing/mask/gas/sechailer/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
Expand Down Expand Up @@ -28,6 +30,8 @@

/datum/outfit/job/inteq/ert/medic
name = "ERT - Inteq Corpsman"
jobtype = /datum/job/paramedic
job_icon = "paramedic"

uniform = /obj/item/clothing/under/syndicate/inteq/corpsman
belt = /obj/item/storage/belt/medical/webbing/paramedic
Expand All @@ -39,6 +43,8 @@

/datum/outfit/job/inteq/ert/leader
name = "ERT - Inteq Vanguard"
jobtype = /datum/job/hos
job_icon = "headofsecurity"

ears = /obj/item/radio/headset/inteq/alt/captain
back = /obj/item/storage/backpack/messenger/inteq
Expand Down
11 changes: 11 additions & 0 deletions code/modules/clothing/outfits/ert/minutemen_ert.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/datum/outfit/job/minutemen/ert
name = "ERT - Minuteman"
jobtype = /datum/job/officer
job_icon = "securityofficerOld"

head = /obj/item/clothing/head/helmet/bulletproof/minutemen
uniform = /obj/item/clothing/under/rank/security/officer/minutemen
Expand All @@ -17,13 +19,15 @@

/datum/outfit/job/minutemen/ert/leader
name = "ERT - Minuteman Sergeant"
job_icon = "lieutenant"

ears = /obj/item/radio/headset/minutemen/alt/captain
back = /obj/item/storage/backpack/satchel/sec/cmm
head = /obj/item/clothing/head/beret/command

/datum/outfit/job/minutemen/ert/bard
name = "ERT - Minuteman (BARD)"
job_icon = "securityofficerOld"

suit = /obj/item/clothing/suit/armor/vest/marine/medium
suit_store = /obj/item/gun/ballistic/automatic/smg/cm5
Expand All @@ -43,6 +47,7 @@

/datum/outfit/job/minutemen/ert/bard/leader
name = "ERT - Minuteman Sergeant (BARD)"
job_icon = "lieutenant"

belt = /obj/item/storage/belt/military/assault/minutemen
uniform = /obj/item/clothing/under/rank/command/minutemen
Expand All @@ -60,6 +65,7 @@

/datum/outfit/job/minutemen/ert/riot
name = "ERT - Minuteman (Riot Officer)"
job_icon = "securityofficerOld"

suit = /obj/item/clothing/suit/armor/riot/minutemen
head = /obj/item/clothing/head/helmet/riot/minutemen
Expand All @@ -74,12 +80,15 @@

/datum/outfit/job/minutemen/ert/riot/leader
name = "ERT - Minutemen Sergeant (Riot Officer)"
job_icon = "lieutenant"

ears = /obj/item/radio/headset/minutemen/alt/captain
back = /obj/item/shield/riot/flash

/datum/outfit/job/minutemen/ert/inspector
name = "ERT - Inspector (Minutemen GOLD)"
jobtype = /datum/job/head_of_personnel
job_icon = "minutemen"

head = /obj/item/clothing/head/cowboy/sec/minutemen
mask = null
Expand All @@ -97,12 +106,14 @@

/datum/outfit/job/minutemen/ert/pirate_hunter
name = "ERT - Minuteman (Pirate Hunter)"
job_icon = "securityofficerOld"

head = null
suit = /obj/item/clothing/suit/space/hardsuit/security/independent/minutemen

/datum/outfit/job/minutemen/ert/pirate_hunter/leader
name = "ERT - Minutemen Sergeant (Pirate Hunter)"
job_icon = "lieutenant"

uniform = /obj/item/clothing/under/rank/command/minutemen
ears = /obj/item/radio/headset/minutemen/alt/captain
Expand Down
4 changes: 4 additions & 0 deletions code/modules/clothing/outfits/ert/nanotrasen_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@
/datum/outfit/job/nanotrasen/ert/lp
name = "ERT - Loss Prevention Security Specialist"
jobtype = /datum/job/officer
job_icon = "securityresponseofficer"

head = null
implants = list(/obj/item/implant/mindshield)
Expand All @@ -406,6 +407,7 @@
/datum/outfit/job/nanotrasen/ert/lp/medic
name = "ERT - Loss Prevention Medical Specialist"
jobtype = /datum/job/doctor
job_icon = "medicalresponseofficer"

head = null
uniform = /obj/item/clothing/under/rank/medical/paramedic/lp
Expand All @@ -425,6 +427,7 @@
/datum/outfit/job/nanotrasen/ert/lp/engineer
name = "ERT - Loss Prevention Engineering Specialist"
jobtype = /datum/job/engineer
job_icon = "engineeringresponseofficer"

head = null
uniform = /obj/item/clothing/under/rank/engineering/engineer/nt/lp
Expand All @@ -444,6 +447,7 @@
/datum/outfit/job/nanotrasen/ert/lp/lieutenant
name = "ERT - Loss Prevention Lieutenant"
jobtype = /datum/job/captain
job_icon = "emergencyresponseteamcommander"

head = null
ears = /obj/item/radio/headset/nanotrasen/alt/captain
Expand Down
3 changes: 2 additions & 1 deletion code/modules/clothing/outfits/ert/solgov_ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@


/datum/outfit/job/solgov/ert/inspector
name = "ERT - SolGov Inspector"
name = "ERT - Inspector (SolGov)"
jobtype = /datum/job/head_of_personnel
job_icon = "solgovrepresentative"

uniform = /obj/item/clothing/under/solgov/formal
belt = /obj/item/clipboard
Expand Down
18 changes: 14 additions & 4 deletions code/modules/clothing/outfits/ert/syndicate_ert.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/datum/outfit/job/syndicate/ert
name = "ERT - Syndicate Basic"
jobtype = /datum/job/officer
job_icon = "securityofficer"

suit = /obj/item/clothing/suit/armor/vest/syndie
suit_store = /obj/item/gun/ballistic/automatic/smg/c20r
Expand All @@ -18,10 +20,9 @@
implants = list(/obj/item/implant/weapons_auth)
backpack_contents = list(/obj/item/radio=1)

jobtype = /datum/job/officer // most of these are Shooty Shooty People anyway

/datum/outfit/job/syndicate/ert/leader
name = "ERT - Syndicate Basic Leader"
job_icon = "lieutenant"

head = /obj/item/clothing/head/HoS/beret/syndicate
ears = /obj/item/radio/headset/syndicate/captain
Expand All @@ -48,6 +49,8 @@

/datum/outfit/job/syndicate/ert/gorlex/medic
name = "ERT - Syndicate Gorlex Loyalist Medic"
jobtype = /datum/job/paramedic
job_icon = "paramedic"

head = /obj/item/clothing/head/soft/black
mask = null
Expand Down Expand Up @@ -79,6 +82,7 @@

/datum/outfit/job/syndicate/ert/gorlex/leader
name = "ERT - Syndicate Gorlex Loyalist Sergeant"
job_icon = "lieutenant"

uniform = /obj/item/clothing/under/syndicate/gorlex
head = /obj/item/clothing/head/HoS/beret/syndicate
Expand All @@ -93,6 +97,7 @@

/datum/outfit/job/syndicate/ert/cybersun
name = "ERT - Syndicate Cybersun Commando"
job_icon = "syndicate"

head = null
uniform = /obj/item/clothing/under/syndicate/combat
Expand All @@ -117,6 +122,7 @@

/datum/outfit/job/syndicate/ert/cybersun/medic
name = "ERT - Syndicate Cybersun Paramedic"
job_icon = "paramedic"

uniform = /obj/item/clothing/under/syndicate/medic
suit = /obj/item/clothing/suit/space/hardsuit/syndi/cybersun/paramed
Expand All @@ -138,6 +144,7 @@

/datum/outfit/job/syndicate/ert/cybersun/medic/leader
name = "ERT - Syndicate Cybersun Lead Paramedic"
job_icon = "chiefmedicalofficer"

head = /obj/item/clothing/head/beret/cmo
glasses = /obj/item/clothing/glasses/hud/security/night
Expand All @@ -150,6 +157,8 @@

/datum/outfit/job/syndicate/ert/inspector
name = "ERT - Inspector (Syndicate)"
jobtype = /datum/job/head_of_personnel
job_icon = "syndicate"

uniform = /obj/item/clothing/under/syndicate/officer
head = /obj/item/clothing/head/HoS/beret/syndicate
Expand All @@ -160,10 +169,11 @@
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/color/white
suit = /obj/item/clothing/suit/armor/hos
l_pocket = null
r_pocket = null
suit_store = null

job_icon = "syndicate"
jobtype = /datum/job/head_of_personnel
backpack_contents = list(/obj/item/stamp/syndicate)

/datum/outfit/job/syndicate/ert/inspector/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/factions/independent.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/outfit/job/independent
name = "Independent - Base Outfit"
faction_icon = "bg_independent"
faction_icon = "bg_indie"

uniform = /obj/item/clothing/under/utility
box = /obj/item/storage/box/survival
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/outfits/factions/nanotrasen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@
job_icon = "medicaldoctor"
jobtype = /datum/job/doctor

belt = /obj/item/pda/medical
ears = /obj/item/radio/headset/headset_med
uniform = /obj/item/clothing/under/rank/medical/doctor
shoes = /obj/item/clothing/shoes/sneakers/white
Expand Down
Binary file modified icons/mob/hud.dmi
Binary file not shown.

0 comments on commit 22610d6

Please sign in to comment.