cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Departmental Event Jobs (#18245)

Browse Source 
* event jobs: the test of faith

no horizon spawns

engineering name fix

* event jobs 2: they work now
This commit is contained in:
RustingWithYou
2024-02-09 12:18:15 +00:00
committed by GitHub
parent 5bd4743399
commit 1506f1a50d
31 changed files with 340 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/items/accessories.dm
+13 -13
View File
@@ -60,7 +60,7 @@
display_name = "holster selection"
path = /obj/item/clothing/accessory/holster/armpit
allowed_roles = list("Captain", "Executive Officer", "Bridge Crew", "Security Officer", "Warden", "Head of Security","Investigator", "Security Cadet", "Corporate Liaison", "Consular Officer",
"Chief Engineer", "Chief Medical Officer", "Research Director", "Operations Manager")
"Chief Engineer", "Chief Medical Officer", "Research Director", "Operations Manager", "Security Personnel")
/datum/gear/accessory/holster/New()
..()
@@ -109,17 +109,17 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, engineering"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
/datum/gear/accessory/black_vest
display_name = "webbing, security"
path = /obj/item/clothing/accessory/storage/black_vest
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Investigator")
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Investigator", "Security Personnel")
/datum/gear/accessory/white_vest
display_name = "webbing, medical"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "First Responder", "Medical Intern", "Medical Personnel")
/datum/gear/accessory/webbing
display_name = "webbing, simple"
@@ -156,17 +156,17 @@
/datum/gear/accessory/brown_pouches
display_name = "drop pouches, engineering"
path = /obj/item/clothing/accessory/storage/pouches/brown
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
/datum/gear/accessory/black_pouches
display_name = "drop pouches, security"
path = /obj/item/clothing/accessory/storage/pouches/black
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator", "Security Personnel")
/datum/gear/accessory/white_pouches
display_name = "drop pouches, medical"
path = /obj/item/clothing/accessory/storage/pouches/white
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "First Responder", "Medical Intern", "Medical Personnel")
/datum/gear/accessory/pouches
display_name = "drop pouches, simple"
@@ -177,13 +177,13 @@
/datum/gear/accessory/overalls_engineer
display_name = "overalls, engineering"
path = /obj/item/clothing/accessory/storage/overalls/engineer
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
cost = 2
/datum/gear/accessory/overalls_mining
display_name = "overalls, mining"
path = /obj/item/clothing/accessory/storage/overalls/mining
allowed_roles = list("Shaft Miner", "Xenoarchaeologist")
allowed_roles = list("Shaft Miner", "Xenoarchaeologist", "Operations Personnel", "Science Personnel")
cost = 2
/datum/gear/accessory/polo
@@ -337,7 +337,7 @@
/datum/gear/accessory/holobadge
display_name = "badge, holographic"
path = /obj/item/clothing/accessory/badge/holo
allowed_roles = list("Head of Security", "Investigator", "Warden", "Security Officer", "Security Cadet")
allowed_roles = list("Head of Security", "Investigator", "Warden", "Security Officer", "Security Cadet", "Security Personnel")
/datum/gear/accessory/holobadge/New()
..()
@@ -349,12 +349,12 @@
/datum/gear/accessory/officerbadge
display_name = "badge, officer"
path = /obj/item/clothing/accessory/badge/officer
allowed_roles = list("Security Officer")
allowed_roles = list("Security Officer", "Security Personnel")
/datum/gear/accessory/wardenbadge
display_name = "badge, warden"
path = /obj/item/clothing/accessory/badge/warden
allowed_roles = list("Warden")
allowed_roles = list("Warden", "Security Personnel")
/datum/gear/accessory/hosbadge
display_name = "badge, HoS"
@@ -364,7 +364,7 @@
/datum/gear/accessory/detbadge
display_name = "badge, investigations"
path = /obj/item/clothing/accessory/badge/investigator
allowed_roles = list("Investigator")
allowed_roles = list("Investigator", "Security Personnel")
/datum/gear/accessory/badge
display_name = "badge selection"
code/modules/client/preference_setup/loadout/items/augments.dm
+9 -9
View File
@@ -98,7 +98,7 @@
display_name = "retractable cyborg analyzer"
description = "An augment that allows the user to deploy a retractable cyborg analyzer."
path = /obj/item/organ/internal/augment/tool/cyborg_analyzer
allowed_roles = list("Machinist")
allowed_roles = list("Machinist", "Operations Personnel")
cost = 3
/datum/gear/augment/analyzer/New()
@@ -151,7 +151,7 @@
path = /obj/item/organ/internal/augment/memory_inhibitor
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
faction = "Zeng-Hu Pharmaceuticals"
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel")
/datum/gear/augment/emotional_manipulator
display_name = "emotional manipulator"
@@ -159,7 +159,7 @@
path = /obj/item/organ/internal/augment/emotional_manipulator
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
faction = "Zeng-Hu Pharmaceuticals"
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel")
/datum/gear/augment/enhanced_vision
display_name = "vision enhanced retinas"
@@ -168,7 +168,7 @@
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
cost = 3
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Bridge Crew", "Medical Personnel")
/datum/gear/augment/sightlights
@@ -178,7 +178,7 @@
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
cost = 3
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel")
/datum/gear/augment/zenghu_plate
@@ -187,7 +187,7 @@
path = /obj/item/organ/internal/augment/zenghu_plate
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
faction = "Zeng-Hu Pharmaceuticals"
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel")
/datum/gear/augment/corrective_lenses
@@ -199,7 +199,7 @@
display_name = "retractable glare dampeners"
description = "A subdermal implant installed just above the brow line that deploys a thin sheath of hyperpolycarbonate that protects from eye damage associated with arc flash."
path = /obj/item/organ/internal/augment/tool/correctivelens/glare_dampener
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist")
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel", "Operations Personel")
cost = 2
/datum/gear/augment/drill
@@ -207,7 +207,7 @@
description = "A mining drill integrated in the hand. The drill is heavy enough that it is only usable by industrial IPCs, as well as Vaurca Bulwarks and Bound Workers."
path = /obj/item/organ/internal/augment/tool/drill
whitelisted = list(SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WORKER)
allowed_roles = list("Shaft Miner")
allowed_roles = list("Shaft Miner", "Operations Personnel")
cost = 5
/datum/gear/augment/head_fluff
@@ -244,6 +244,6 @@
path = /obj/item/organ/internal/augment/language/zeng
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD)
faction = "Zeng-Hu Pharmaceuticals"
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Captain", "Medical Personnel", "Science Personnel")
cost = 3
code/modules/client/preference_setup/loadout/items/belt.dm
+1 -1
View File
@@ -30,5 +30,5 @@
description = "An alternative look to a standard toolbelt."
cost = 1
path = /obj/item/storage/belt/utility/alt
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director")
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director", "Engineering Personnel", "Operations Personnel")
flags = null
code/modules/client/preference_setup/loadout/items/eyes.dm
+4 -4
View File
@@ -46,7 +46,7 @@
display_name = "flash-proof sunglasses selection (Security/Command)"
description = "A selection of flash-proof sunglasses."
path = /obj/item/clothing/glasses/sunglasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Executive Officer", "Operations Manager", "Investigator", "Bridge Crew")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Executive Officer", "Operations Manager", "Investigator", "Bridge Crew", "Security Personnel")
/datum/gear/eyes/sunglasses/New()
..()
@@ -77,7 +77,7 @@
display_name = "medical HUD selection"
description = "A selection of medical HUDs."
path = /obj/item/clothing/glasses/hud/health/aviator
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel")
/datum/gear/eyes/medhuds/New()
..()
@@ -93,7 +93,7 @@
display_name = "security HUD selection"
description = "A selection of security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/aviator
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator", "Security Personnel")
/datum/gear/eyes/sechuds/New()
..()
@@ -152,7 +152,7 @@
display_name = "HUD goggles selection (medical)"
description = "A selection of medical goggles. Note that factional ones can only be taken by members of that faction."
path = /obj/item/clothing/glasses/safety/goggles/medical
allowed_roles = list("First Responder")
allowed_roles = list("First Responder", "Medical Personnel")
/datum/gear/eyes/medical_goggles/New()
..()
code/modules/client/preference_setup/loadout/items/factions.dm
+18 -18
View File
@@ -30,7 +30,7 @@
path = /obj/item/clothing/under/rank/security/idris/idrissec
slot = slot_w_uniform
faction = "Idris Incorporated"
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden")
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden", "Security Personnel")
/datum/gear/faction/idris_sec_uniforms/New()
..()
@@ -65,7 +65,7 @@
description = "A selection of Idris security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/idris
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator", "Security Personnel")
faction = "Idris Incorporated"
/datum/gear/faction/idris_sunglasses/New()
@@ -118,7 +118,7 @@
path = /obj/item/clothing/accessory/sleevepatch/idrissec
faction = "Idris Incorporated"
slot = slot_tie
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet")
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet", "Security Personnel")
//Zavodskoi
/datum/gear/faction/zavodskoi_headwear
@@ -147,7 +147,7 @@
path = /obj/item/clothing/under/rank/security/zavod/zavodsec
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
allowed_roles = list("Warden", "Investigator", "Security Officer", "Security Cadet")
allowed_roles = list("Warden", "Investigator", "Security Officer", "Security Cadet", "Security Personnel")
/datum/gear/faction/zavod_sec_uniforms/New()
..()
@@ -184,7 +184,7 @@
path = /obj/item/clothing/suit/storage/security/officer/zav
slot = slot_wear_suit
faction = "Zavodskoi Interstellar"
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet")
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet", "Security Personnel")
/datum/gear/faction/zavod_sec_coat/New()
..()
@@ -199,7 +199,7 @@
path = /obj/item/clothing/suit/storage/toggle/warden/zavod
slot = slot_wear_suit
faction = "Zavodskoi Interstellar"
allowed_roles = list("Head of Security", "Warden")
allowed_roles = list("Head of Security", "Warden", "Security Personnel")
/datum/gear/faction/zavod_warden_coat/New()
..()
@@ -214,7 +214,7 @@
path = /obj/item/clothing/glasses/sunglasses/sechud/zavod
slot = slot_glasses
faction = "Zavodskoi Interstellar"
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet")
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet", "Security Personnel")
/datum/gear/faction/zavod_sunglasses/New()
..()
@@ -236,7 +236,7 @@
path = /obj/item/clothing/accessory/sleevepatch/zavodskoisec
slot = slot_tie
faction = "Zavodskoi Interstellar"
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet")
allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet", "Security Personnel")
/datum/gear/faction/zavodskoicape
display_name = "zavodskoi dominian great house cape selection"
@@ -262,7 +262,7 @@
description = "A selection of PMCG security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/pmc
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator", "Security Personnel")
faction = "Private Military Contracting Group"
/datum/gear/faction/pmc_sunglasses/New()
@@ -283,7 +283,7 @@
description = "A selection of PMCG medical HUDs."
path = /obj/item/clothing/glasses/hud/health/aviator/pmc
slot = slot_glasses
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel")
faction = "Private Military Contracting Group"
/datum/gear/faction/pmc_medglasses/New()
@@ -362,7 +362,7 @@
path = /obj/item/clothing/under/rank/security/pmc/epmc
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden")
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden", "Security Personnel")
/datum/gear/faction/pmcg_sec_uniforms/New()
..()
@@ -401,35 +401,35 @@
path = /obj/item/clothing/under/rank/medical/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Physician")
allowed_roles = list("Physician", "Medical Personnel")
/datum/gear/faction/epmc_uniform_pharm_med
display_name = "PMCG pharmacist uniform"
path = /obj/item/clothing/under/rank/medical/pharmacist/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Pharmacist")
allowed_roles = list("Pharmacist", "Medical Personnel")
/datum/gear/faction/epmc_uniform_psych_med
display_name = "PMCG psychiatrist uniform"
path = /obj/item/clothing/under/rank/medical/psych/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Psychiatrist")
allowed_roles = list("Psychiatrist", "Medical Personnel")
/datum/gear/faction/epmc_uniform_intern_med
display_name = "PMCG medical intern uniform"
path = /obj/item/clothing/under/rank/medical/intern/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Medical Intern")
allowed_roles = list("Medical Intern", "Medical Personnel")
/datum/gear/faction/epmc_uniform_fr_med
display_name = "PMCG/EPMC first responder uniform"
path = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("First Responder")
allowed_roles = list("First Responder", "Medical Personnel")
/datum/gear/faction/epmc_uniform_fr_med/New()
..()
@@ -522,7 +522,7 @@
description = "A selection of Zeng-Hu medical HUDs."
path = /obj/item/clothing/glasses/hud/health/aviator/zeng
slot = slot_glasses
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel")
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zeng_medglasses/New()
@@ -618,7 +618,7 @@
description = "A selection of NanoTrasen medical HUDs."
path = /obj/item/clothing/glasses/hud/health/aviator/nt
slot = slot_glasses
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "First Responder", "Psychiatrist", "Medical Intern", "Medical Personnel")
faction = "NanoTrasen"
/datum/gear/faction/nt_medglasses/New()
code/modules/client/preference_setup/loadout/items/head.dm
+4 -4
View File
@@ -111,7 +111,7 @@
display_name = "headwear, security (warden)"
description = "A selection of warden headwear."
path = /obj/item/clothing/head
allowed_roles = list("Head of Security" , "Warden")
allowed_roles = list("Head of Security" , "Warden", "Security Personnel")
/datum/gear/head/warden/New()
..()
@@ -139,7 +139,7 @@
/datum/gear/head/hardhat
display_name = "hard hat selection"
path = /obj/item/clothing/head/hardhat
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Operations Manager", "Hangar Technician", "Shaft Miner", "Xenoarchaeologist")
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Operations Manager", "Hangar Technician", "Shaft Miner", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel")
/datum/gear/head/hardhat/New()
..()
@@ -292,7 +292,7 @@
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/pmc
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel")
/datum/gear/head/surgical/New()
..()
@@ -338,7 +338,7 @@
display_name = "IAC headgear selection"
description = "A selection of hats worn by Interstellar Aid Corps volunteers."
path = /obj/item/clothing/head/softcap/iac
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/iac/New()
code/modules/client/preference_setup/loadout/items/religion.dm
+1 -1
View File
@@ -183,7 +183,7 @@
display_name = "tribunalist medical beret"
path = /obj/item/clothing/head/beret/dominia/medical
slot = slot_head
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel")
culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi)
/datum/gear/religion/shaman_staff
code/modules/client/preference_setup/loadout/items/suit.dm
+3 -3
View File
@@ -121,12 +121,12 @@
display_name = "surgical apron"
path = /obj/item/clothing/accessory/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel")
/datum/gear/suit/medical_outerwear
display_name = "medical outerwear (jackets, vests, rigs)"
path = /obj/item/clothing/suit/storage/toggle/fr_jacket
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel")
/datum/gear/suit/medical_outerwear/New()
..()
@@ -138,7 +138,7 @@
/datum/gear/suit/iac_outerwear
display_name = "IAC outerwear (jackets, vests, rigs)"
path = /obj/item/clothing/suit/storage/hazardvest/iac
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/iac_outerwear/New()
code/modules/client/preference_setup/loadout/items/uniform.dm
+2 -2
View File
@@ -12,7 +12,7 @@
/datum/gear/uniform/iacjumpsuit
display_name = "IAC Jumpsuit"
path = /obj/item/clothing/under/rank/iacjumpsuit
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Medical Personnel")
/datum/gear/uniform/jumpsuit
display_name = "generic jumpsuits"
@@ -99,7 +99,7 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/surgeon/zavod
allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel")
/datum/gear/uniform/scrubs/New()
..()
code/modules/client/preference_setup/loadout/items/utility.dm
+1 -1
View File
@@ -94,7 +94,7 @@
/datum/gear/utility/himeo_kit
display_name = "himean voidsuit kit"
path = /obj/item/voidsuit_modkit/himeo
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council)
/datum/gear/utility/wheelchair/color
code/modules/client/preference_setup/loadout/items/xeno/human.dm
+1 -1
View File
@@ -19,7 +19,7 @@
whitelisted = list(SPECIES_HUMAN_OFFWORLD)
sort_category = "Xenowear - Human"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist")
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel")
/datum/gear/accessory/offworlder
display_name = "legbrace"
code/modules/client/preference_setup/loadout/items/xeno/machine.dm
+1 -1
View File
@@ -103,7 +103,7 @@
path = /obj/item/clothing/suit/storage/toggle/armor/vest/idris
whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL)
sort_category = "Xenowear - IPC"
allowed_roles = list("Security Officer", "Warden", "Head of Security", "Investigator", "Security Cadet")
allowed_roles = list("Security Officer", "Warden", "Head of Security", "Investigator", "Security Cadet", "Security Personnel")
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/suit/idris/New()
code/modules/client/preference_setup/loadout/items/xeno/skrell.dm
+1 -1
View File
@@ -233,7 +233,7 @@
path = /obj/item/clothing/head/helmet/security/skrell
whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI)
sort_category = "Xenowear - Skrell"
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Investigator", "Executive Officer", "Captain")
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Investigator", "Executive Officer", "Captain", "Security Personnel")
/datum/gear/head/skrell_helmet/hos
display_name = "Head of Security Skrellmet"
code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
+3 -3
View File
@@ -113,14 +113,14 @@
display_name = "PRA medical coat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "First Responder", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "First Responder", "Medical Intern", "Medical Personnel")
sort_category = "Xenowear - Tajara"
/datum/gear/suit/tajaran_surgeon
display_name = "adhomian surgeon garb"
path = /obj/item/clothing/suit/storage/hooded/tajaran/surgery
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Xenobiologist", "Roboticist", "Medical Intern")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Xenobiologist", "Roboticist", "Medical Intern", "Medical Personnel")
sort_category = "Xenowear - Tajara"
/datum/gear/uniform/tajara
@@ -425,7 +425,7 @@
path = /obj/item/voidsuit_modkit/himeo/tajara
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
origin_restriction = list(/singleton/origin_item/origin/free_council)
/datum/gear/tajaran_tarot
code/modules/client/preference_setup/loadout/items/xeno/unathi.dm
+4 -4
View File
@@ -208,7 +208,7 @@
culture_restriction = list(/singleton/origin_item/culture/autakh)
sort_category = "Xenowear - Unathi"
cost = 2
allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist")
allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/augment/autakh_mining
@@ -219,7 +219,7 @@
culture_restriction = list(/singleton/origin_item/culture/autakh)
sort_category = "Xenowear - Unathi"
cost = 2
allowed_roles = list("Shaft Miner")
allowed_roles = list("Shaft Miner", "Operations Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/augment/autakh_medical
@@ -230,7 +230,7 @@
culture_restriction = list(/singleton/origin_item/culture/autakh)
sort_category = "Xenowear - Unathi"
cost = 2
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Chemist")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Chemist", "Medical Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/augment/autakh_security
@@ -241,7 +241,7 @@
culture_restriction = list(/singleton/origin_item/culture/autakh)
sort_category = "Xenowear - Unathi"
cost = 2
allowed_roles = list("Security Officer", "Head of Security", "Warden")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/uniform/unathi/jizixi
code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm
+3 -3
View File
@@ -270,7 +270,7 @@
path = /obj/item/organ/external/hand/right/vaurca/security
whitelisted = list(SPECIES_VAURCA_WARRIOR)
sort_category = "Xenowear - Vaurca"
allowed_roles = list("Security Officer", "Warden")
allowed_roles = list("Security Officer", "Warden", "Security Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/augment/vaurcamed
@@ -280,7 +280,7 @@
path = /obj/item/organ/external/hand/right/vaurca/medical
whitelisted = list(SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER)
sort_category = "Xenowear - Vaurca"
allowed_roles = list("Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Chemist")
allowed_roles = list("Physician", "Surgeon", "First Responder", "Medical Intern", "Psychiatrist", "Chemist", "Medical Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/augment/vaurcamag
@@ -290,7 +290,7 @@
path = /obj/item/organ/internal/augment/tool/vaurcamag
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist")
allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel")
/datum/gear/accessory/tret_passcard
display_name = "tret passcard"
code/modules/client/preference_setup/occupation/occupation.dm
+43 -1
View File
@@ -13,6 +13,9 @@
S["job_engsec_high"] >> pref.job_engsec_high
S["job_engsec_med"] >> pref.job_engsec_med
S["job_engsec_low"] >> pref.job_engsec_low
S["job_event_high"] >> pref.job_event_high
S["job_event_med"] >> pref.job_event_med
S["job_event_low"] >> pref.job_event_low
S["player_alt_titles"] >> pref.player_alt_titles
S["faction"] >> pref.faction
@@ -27,6 +30,9 @@
S["job_engsec_high"] << pref.job_engsec_high
S["job_engsec_med"] << pref.job_engsec_med
S["job_engsec_low"] << pref.job_engsec_low
S["job_event_high"] >> pref.job_event_high
S["job_event_med"] >> pref.job_event_med
S["job_event_low"] >> pref.job_event_low
S["player_alt_titles"] << pref.player_alt_titles
S["faction"] << pref.faction
@@ -68,7 +74,11 @@
"job_medsci_low" = pref.job_medsci_low,
"job_engsec_high" = pref.job_engsec_high,
"job_engsec_med" = pref.job_engsec_med,
"job_engsec_low" = pref.job_engsec_low
"job_engsec_low" = pref.job_engsec_low,
"job_event_high" = pref.job_event_high,
"job_event_med" = pref.job_event_med,
"job_event_low" = pref.job_event_low
)
return list(
@@ -99,6 +109,9 @@
pref.job_engsec_high = 0
pref.job_engsec_med = 0
pref.job_engsec_low = 0
pref.job_event_high = 0
pref.job_event_med = 0
pref.job_event_low = 0
else
for (var/preference in jobs)
try
@@ -117,6 +130,10 @@
pref.job_engsec_high = sanitize_integer(text2num(pref.job_engsec_high), 0, 65535, initial(pref.job_engsec_high))
pref.job_engsec_med = sanitize_integer(text2num(pref.job_engsec_med), 0, 65535, initial(pref.job_engsec_med))
pref.job_engsec_low = sanitize_integer(text2num(pref.job_engsec_low), 0, 65535, initial(pref.job_engsec_low))
pref.job_event_high = sanitize_integer(text2num(pref.job_event_high), 0, 65535, initial(pref.job_event_high))
pref.job_event_med = sanitize_integer(text2num(pref.job_event_med), 0, 65535, initial(pref.job_event_med))
pref.job_event_low = sanitize_integer(text2num(pref.job_event_low), 0, 65535, initial(pref.job_event_low))
if (!pref.player_alt_titles)
pref.player_alt_titles = new()
@@ -357,14 +374,17 @@
pref.job_civilian_high = 0
pref.job_medsci_high = 0
pref.job_engsec_high = 0
pref.job_event_high = 0
return 1
if(2)//Set current highs to med, then reset them
pref.job_civilian_med |= pref.job_civilian_high
pref.job_medsci_med |= pref.job_medsci_high
pref.job_engsec_med |= pref.job_engsec_high
pref.job_event_med |= pref.job_event_high
pref.job_civilian_high = 0
pref.job_medsci_high = 0
pref.job_engsec_high = 0
pref.job_event_high = 0
switch(job.department_flag)
if(SERVICE)
@@ -397,6 +417,16 @@
pref.job_engsec_low &= ~job.flag
else
pref.job_engsec_low |= job.flag
if(EVENTDEPT)
switch(level)
if(2)
pref.job_event_high = job.flag
pref.job_event_med &= ~job.flag
if(3)
pref.job_event_med |= job.flag
pref.job_event_low &= ~job.flag
else
pref.job_event_low |= job.flag
return 1
/datum/category_item/player_setup_item/occupation/proc/ResetJobs()
@@ -412,6 +442,10 @@
pref.job_engsec_med = 0
pref.job_engsec_low = 0
pref.job_event_high = 0
pref.job_event_med = 0
pref.job_event_low = 0
pref.player_alt_titles.Cut()
/datum/category_item/player_setup_item/occupation/proc/show_faction_menu(mob/user, selected_faction) //note : selected faction is what you choose to see, pref.faction is the actual chosen faction
@@ -519,4 +553,12 @@
return job_engsec_med
if(3)
return job_engsec_low
if(EVENTDEPT)
switch(level)
if(1)
return job_event_high
if(2)
return job_event_med
if(3)
return job_event_low
return 0