From 7693c2a54a0f26764ca89a2b3413c7f6f4077f27 Mon Sep 17 00:00:00 2001 From: alberyk Date: Sun, 2 Jan 2022 00:06:46 -0300 Subject: [PATCH] the rest --- code/game/jobs/faction/hephaestus.dm | 60 +++++++++ code/game/jobs/faction/idris.dm | 4 +- code/game/jobs/faction/nanotrasen.dm | 117 +++++++++++++++++- code/game/jobs/faction/pmc.dm | 85 +++++++++++++ code/game/objects/items/weapons/cards_ids.dm | 8 +- .../ghostroles/spawner/human/emergencypod.dm | 2 +- 6 files changed, 268 insertions(+), 8 deletions(-) diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index d9c55586679..abcd816ecdb 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -41,3 +41,63 @@ SPECIES_VAURCA_BREEDER ) ) + + titles_to_loadout = list( + "Hangar Technician" = /datum/outfit/job/hangar_tech/hephaestus, + "Shaft Miner" = /datum/outfit/job/mining/hephaestus, + "Machinist" = /datum/outfit/job/machinist/hephaestus, + "Engineer" = /datum/outfit/job/engineer/zavodskoi, + "Atmospheric Technician" = /datum/outfit/job/atmos/hephaestus, + "Engineering Apprentice" = /datum/outfit/job/intern_eng/hephaestus, + "Corporate Liaison" = /datum/outfit/job/representative/hephaestus + ) + +/datum/outfit/job/hangar_tech/hephaestus + name = "Hangar Technician - Hephaestus" + + uniform = /obj/item/clothing/under/rank/hangar_technician/heph + id = /obj/item/card/id/hephaestus + +/datum/outfit/job/machinist/hephaestus + name = "Machinist - Hephaestus" + + uniform = /obj/item/clothing/under/rank/machinist/heph + id = /obj/item/card/id/hephaestus + +/datum/outfit/job/mining/hephaestus + name = "Shaft Miner - Hephaestus" + + uniform = /obj/item/clothing/under/rank/miner/heph + id = /obj/item/card/id/hephaestus + +/datum/outfit/job/engineer/hephaestus + name = "Engineer - Hephaestus" + + uniform = /obj/item/clothing/under/rank/engineer/heph + id = /obj/item/card/id/hephaestus + +/datum/outfit/job/atmos/hephaestus + name = "Atmospheric Technician - Hephaestus" + + uniform = /obj/item/clothing/under/rank/atmospheric_technician/heph + id = /obj/item/card/id/hephaestus + +/datum/outfit/job/intern_eng/hephaestus + name = "Engineering Apprentice - Hephaestus" + + uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph + id = /obj/item/card/id/hephaestus + +/datum/outfit/job/representative/hephaestus + name = "Hephaestus Corporate Liaison" + uniform = /obj/item/clothing/under/rank/hephaestus + head = null + suit = null + implants = null + id = /obj/item/card/id/hephaestus + + backpack_contents = list( + /obj/item/device/camera = 1, + /obj/item/gun/energy/pistol = 1, + /obj/item/stamp/hephaestus = 1 + ) \ No newline at end of file diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index e0dcdd0e60b..8245c4ceeb6 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -86,7 +86,7 @@ name = "Bartender - Idris" uniform = /obj/item/clothing/under/rank/bartender/idris - head = /obj/item/clothing/head/bartender + head = /obj/item/clothing/head/bartender/idris id = /obj/item/card/id/idris /datum/outfit/job/chef/idris @@ -121,7 +121,7 @@ name = "Service Manager - Idris" jobtype = /datum/job/service_manager - uniform = /obj/item/clothing/under/rank/service_manager + uniform = /obj/item/clothing/under/rank/service_manager/idris head = /obj/item/clothing/head/service_manager/idris suit = /obj/item/clothing/suit/storage/service_manager/idris diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index ef5b7518155..6229082ea69 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -39,6 +39,28 @@ allowed_role_types = NT_ROLES + titles_to_loadout = list( + "Bartender" = /datum/outfit/job/bartender/nt, + "Chef" = /datum/outfit/job/chef/nt, + "Gardener" = /datum/outfit/job/hydro/nt, + "Janitor" = /datum/outfit/job/janitor/nt, + "Librarian" = /datum/outfit/job/librarian/nt, + "Service Manager" = /datum/outfit/job/service_manager/nt, + "Physician" = /datum/outfit/job/doctor/nt, + "Surgeon" = /datum/outfit/job/doctor/surgeon/nt, + "Pharmacist" = /datum/outfit/job/pharmacist/nt, + "Psychiatrist" = /datum/outfit/job/psychiatrist/nt, + "Psychologist" = /datum/outfit/job/psychiatrist/nt, + "First Responder" = /datum/outfit/job/med_tech/nt, + "Medical Intern" = /datum/outfit/job/intern_med/nt, + "Xenobiologist" = /datum/outfit/job/scientist/nt, + "Xenobotanist" = /datum/outfit/job/scientist/nt, + "Xenobiologist" = /datum/outfit/job/scientist/nt, + "Xenobotanist" = /datum/outfit/job/scientist/nt, + "Lab Assistant" = /datum/outfit/job/intern_sci/nt, + "Xenoarcheologist"= /datum/outfit/job/scientist/xenoarcheologist/nt + ) + /datum/faction/nano_trasen/get_corporate_objectives(var/mission_level) var/objective switch(mission_level) @@ -55,4 +77,97 @@ "Make sure that [rand(2,4)] complaints are solved on the station", "Have [rand(3,10)] crewmembers buy Getmore products from the vendors") - return objective \ No newline at end of file + return objective + +/datum/outfit/job/doctor/nt + name = "Physician - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/medical/nt + suit = null + +/datum/outfit/job/doctor/surgeon/nt + name = "Surgeon - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/medical/surgeon/nt + suit = null + +/datum/outfit/job/pharmacist/nt + name = "Pharmacist - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/pharmacist/nt + suit = null + +/datum/outfit/job/psychiatrist/nt + name = "Psychiatrist - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/psych/nt + suit = null + +/datum/outfit/job/med_tech/nt + name = "First Responder - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/medical/first_responder/nt + suit = null + +/datum/outfit/job/intern_med/nt + name = "Medical Intern - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/medical/intern/nt + +/datum/outfit/job/scientist/nt + name = "Scientist - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/scientist/nt + suit = null + +/datum/outfit/job/scientist/xenoarcheologist/nt + name = "Xenoarcheologist - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/xenoarcheologist/nt + suit = null + +/datum/outfit/job/intern_sci/nt + name = "Lab Assistant - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/scientist/intern/nt + suit = null + +/datum/outfit/job/bartender/nt + name = "Bartender - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/bartender/nt + head = /obj/item/clothing/head/bartender/nt + id = /obj/item/card/id/idris + +/datum/outfit/job/chef/nt + name = "Chef - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/chef/nt + suit = null + +/datum/outfit/job/hydro/nt + name = "Gardener - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/chef/nt + head = /obj/item/clothing/head/bandana/hydro/nt + suit = null + +/datum/outfit/job/janitor/nt + name = "Janitor - NanoTrasen" + + uniform = /obj/item/clothing/under/rank/janitor/nt + head = /obj/item/clothing/head/softcap/janitor/nt + suit = null + +/datum/outfit/job/librarian/nt + name = "Librarian - NanoTrasen" + + uniform = /obj/item/clothing/under/librarian/nt + +/datum/outfit/job/service_manager/idris + name = "Service Manager - NanoTrasen" + jobtype = /datum/job/service_manager + + uniform = /obj/item/clothing/under/rank/service_manager/nt + head = /obj/item/clothing/head/service_manager/nt + suit = /obj/item/clothing/suit/storage/service_manager/nt \ No newline at end of file diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 7f963f9ba87..04b53a86bd7 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -39,3 +39,88 @@ ) ) + titles_to_loadout = list( + "Security Officer" = /datum/outfit/job/officer/pmc, + "Warden" = /datum/outfit/job/warden/pmc, + "Security Cadet" = /datum/outfit/job/intern_sec/pmc, + "Investigator" =/datum/outfit/job/forensics/pmc, + "Physician" = /datum/outfit/job/doctor/pmc, + "Surgeon" = /datum/outfit/job/doctor/surgeon/pmc, + "Pharmacist" = /datum/outfit/job/pharmacist/pmc, + "Psychiatrist" = /datum/outfit/job/psychiatrist/pmc, + "Psychologist" = /datum/outfit/job/psychiatrist/pmc, + "First Responder" = /datum/outfit/job/med_tech/pmc, + "Medical Intern" = /datum/outfit/job/intern_med/pmc, + "Corporate Liaison" = /datum/outfit/job/representative/pmc + ) + +/datum/outfit/job/officer/pmc + name = "Security Officer - PMC" + + uniform = /obj/item/clothing/under/rank/security/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/warden/pmc + name = "Warden - PMC" + + uniform = /obj/item/clothing/under/rank/warden/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/intern_sec/pmc + name = "Security Cadet - PMC" + + uniform = /obj/item/clothing/under/rank/cadet/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/forensics/pmc + name = "Investigator - PMC" + + uniform = /obj/item/clothing/under/det/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/doctor/pmc + name = "Physician - PMC" + + uniform = /obj/item/clothing/under/rank/medical/pmc + suit = null + id = /obj/item/card/id/pmc + +/datum/outfit/job/doctor/surgeon/pmc + name = "Surgeon - PMC" + + uniform = /obj/item/clothing/under/rank/medical/surgeon/pmc + suit = null + id = /obj/item/card/id/pmc + +/datum/outfit/job/pharmacist/pmc + name = "Pharmacist - PMC" + + uniform = /obj/item/clothing/under/rank/pharmacist/pmc + suit = null + id = /obj/item/card/id/pmc + +/datum/outfit/job/psychiatrist/pmc + name = "Psychiatrist - PMC" + + uniform = /obj/item/clothing/under/rank/psych/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/med_tech/pmc + name = "First Responder - PMC" + + uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/intern_med/pmc + name = "Medical Intern - PMC" + + uniform = /obj/item/clothing/under/rank/medical/intern/pmc + id = /obj/item/card/id/pmc + +/datum/outfit/job/representative/pmc + name = "PMC Corporate Liaison" + uniform = /obj/item/clothing/under/rank/security/eridani/alt + head = null + suit = null + implants = null + id = /obj/item/card/id/pmc \ No newline at end of file diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 45b581e8f32..4656ef1783c 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -529,7 +529,7 @@ var/const/NO_EMAG_ACT = -50 /obj/item/card/id/distress/ap_eridani/New() access = get_distress_access() ..() - + /obj/item/card/id/distress/iac name = "\improper Interstellar Aid Corps ID" assignment = "Interstellar Aid Corps Responder" @@ -570,9 +570,9 @@ var/const/NO_EMAG_ACT = -50 icon_state = "iru_card" overlay_state = "iru_card" -/obj/item/card/id/eridani - name = "\improper Eridani identification card" - desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Eridani Corporate Federation." +/obj/item/card/id/pmc + name = "\improper PMCG identification card" + desc = "A high-tech holobadge, identifying the owner as a contractor from one of the many PMCs from the Private Military Contracting Group." icon_state = "erisec_card" overlay_state = "erisec_card" diff --git a/code/modules/ghostroles/spawner/human/emergencypod.dm b/code/modules/ghostroles/spawner/human/emergencypod.dm index 9df0bf9be54..3fd47bd61c2 100644 --- a/code/modules/ghostroles/spawner/human/emergencypod.dm +++ b/code/modules/ghostroles/spawner/human/emergencypod.dm @@ -236,7 +236,7 @@ suit = /obj/item/clothing/suit/space/void/cruiser suit_store = /obj/item/tank/oxygen shoes = /obj/item/clothing/shoes/jackboots - id = /obj/item/card/id/eridani + id = /obj/item/card/id/pmc pda = /obj/item/modular_computer/handheld/pda/security belt = /obj/item/gun/energy/gun/nuclear uniform = /obj/item/clothing/under/rank/security/eridani