[MIRROR] Job rank and radio channel rework (#8965)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-09-17 12:24:13 -07:00
committed by GitHub
parent 6159cecfc8
commit 4153768ba1
444 changed files with 3341 additions and 2440 deletions

119
code/__defines/faction.dm Normal file
View File

@@ -0,0 +1,119 @@
#define FACTION_BAR "bar"
#define FACTION_CLOWN "clown"
#define FACTION_NONE "None"
#define FACTION_STATION "Station"
#define FACTION_AEROSTAT_INSIDE "aerostat_inside"
#define FACTION_AEROSTAT_SURFACE "aerostat_surface"
#define FACTION_ASTEROID_BELT "asteroid_belt"
#define FACTION_BEACH_OUT "beach_out"
#define FACTION_BEACH_CAVE "beach_cave"
#define FACTION_DERELICT "derelict"
#define FACTION_OVERMAP "overmap"
#define FACTION_ROGUEMINES "roguemines"
#define FACTION_SPACE_ROCK "space_rock"
#define FACTION_SPOOKYLAND "spookyland"
#define FACTION_THEATRE "theatre"
#define FACTION_UNDERDARK "underdark"
#define FACTION_VIRGO2 "virgo2"
#define FACTION_VIRGO3B "virgo3b"
#define FACTION_ALTEVIAN "altevian"
#define FACTION_CULT "cult"
#define FACTION_PIRATE "pirate"
#define FACTION_SHADEKIN "shadekin"
#define FACTION_SPACE_GHOST "space ghost"
#define FACTION_SYNDICATE "syndicate"
#define FACTION_TECHNOMANCER "technomancer"
#define FACTION_VAMPIRE "vampire"
#define FACTION_CORRUPT "corrupt"
#define FACTION_HIVEBOT "hivebot"
#define FACTION_MALF_DRONE "malf_drone"
#define FACTION_VAGRANT "vagrant"
#define FACTION_WARDS "wards"
#define FACTION_ANIMAL "animal"
#define FACTION_BEE "bee"
#define FACTION_BLOB "blob"
#define FACTION_CARP "carp"
#define FACTION_CATGIRL "catgirl"
#define FACTION_CATSLUG "catslug"
#define FACTION_COOKIEGIRL "cookiegirl"
#define FACTION_CRABS "crabs"
#define FACTION_CREATURE "creature"
#define FACTION_DEATHCLAW "deathclaw"
#define FACTION_DEMON "demon"
#define FACTION_DEVIL "devil"
#define FACTION_DIYAAB "diyaab"
#define FACTION_DOG "dog"
#define FACTION_DRAGON "dragon"
#define FACTION_DUCK "duck"
#define FACTION_FAITHLESS "faithless"
#define FACTION_FENNEC "fennec"
#define FACTION_FOX "fox"
#define FACTION_GEESE "geese"
#define FACTION_GNAT "gnat"
#define FACTION_GOAT "goat"
#define FACTION_GOLEM "golem"
#define FACTION_GRAFADREKA "grafadreka"
#define FACTION_GRUBS "grubs"
#define FACTION_HORSE "horse"
#define FACTION_INSECTS "insects"
#define FACTION_JELLYFISH "jellyfish"
#define FACTION_KURUAK "kururak"
#define FACTION_LAMIA "lamia"
#define FACTION_LEECH "leech"
#define FACTION_MACROBACTERIA "macrobacteria"
#define FACTION_MEOWL "meowl"
#define FACTION_MIMIC "mimic"
#define FACTION_MOUSE "mouse"
#define FACTION_NANOMACHINES "nanomachines"
#define FACTION_NEUTRAL "neutral"
#define FACTION_OTIE "otie"
#define FACTION_PAKKUN "pakkun"
#define FACTION_PANTHER "panther"
#define FACTION_PEASANT "peasant"
#define FACTION_POLAR "polar"
#define FACTION_RABBIT "rabbit"
#define FACTION_RAPTOR "raptor"
#define FACTION_RAY "ray"
#define FACTION_REDPANDA "redpanda"
#define FACTION_RUSSIAN "russian"
#define FACTION_SAKIMM "sakimm"
#define FACTION_SAVIK "savik"
#define FACTION_SCARYBAT "scarybat"
#define FACTION_SCEL "scel"
#define FACTION_SCRUBBLE "scrubble"
#define FACTION_SEAGULL "seagull"
#define FACTION_SHANTAK "shantak"
#define FACTION_SHEEP "sheep"
#define FACTION_SIF "sif"
#define FACTION_SIFFET "siffet"
#define FACTION_SLIME "slime"
#define FACTION_SNAKE "snake"
#define FACTION_SONADILE "sonadile"
#define FACTION_SPACESHARK "spaceshark"
#define FACTION_SPACE_MOUSE "space mouse"
#define FACTION_SPACE_SKELETON "space skeleton"
#define FACTION_SPACE_TURTLE "space turtle"
#define FACTION_SPIDERS "spiders"
#define FACTION_STALKER "stalker"
#define FACTION_SUCCUBUS "succubus"
#define FACTION_SWARMER "swarmer"
#define FACTION_TEPPI "teppi"
#define FACTION_TUNNELCLOWN "tunnelclown"
#define FACTION_WILD_ANIMAL "wild animal"
#define FACTION_WOLFGIRL "wolfgirl"
#define FACTION_WOLFTAUR "wolftaur"
#define FACTION_WORM "worm"
#define FACTION_XENO "xeno"
#define FACTION_PLANTS "plants"
#define FACTION_MATH "MATH"
//CHOMPAdd Start factions
#define FACTION_AWAYMISSION "awaymission"
//CHOMPAdd End

432
code/__defines/jobs.dm Normal file
View File

@@ -0,0 +1,432 @@
// Station Command jobs
#define JOB_SITE_MANAGER "Site Manager"
// Site Manager alt titles
#define JOB_ALT_OVERSEER "Overseer"
#define JOB_ALT_FACILITY_DIRECTOR "Facility Director"
#define JOB_ALT_CHIEF_SUPERVISOR "Chief Supervisor"
#define JOB_ALT_CAPTAIN "Captain"
#define JOB_ALT_COLONY_DIRECTOR "Colony Director" //CHOMPAdd
#define JOB_HEAD_OF_PERSONNEL "Head of Personnel"
// Head of Personnel alt titles
#define JOB_ALT_CREW_RESOURCE_OFFICER "Crew Resources Officer"
#define JOB_ALT_DEPUTY_MANAGER "Deputy Director" // CHOMPEdit
#define JOB_ALT_STAFF_MANAGER "Staff Manager"
#define JOB_ALT_FACILITY_STEWARD "Facility Steward"
#define JOB_ALT_FIRST_MATE "First Mate"
#define JOB_ALT_PERFORMANCE_MANAGEMENT_SUPERVISOR "Performance Management Supervisor"
#define JOB_COMMAND_SECRETARY "Command Secretary"
// Command Secretary alt titles
#define JOB_ALT_COMMAND_LIAISON "Command Liaison"
#define JOB_ALT_COMMAND_ASSISTANT "Command Assistant"
#define JOB_ALT_COMMAND_INTERN "Command Intern"
#define JOB_ALT_BRIDGE_SECRETARY "Bridge Secretary"
#define JOB_ALT_BRIDGE_ASSISTANT "Bridge Assistant"
#define JOB_ALT_BRIDGE_OFFICER "Bridge Officer" // CHOMPAdd
#define JOB_HEAD_OF_SECURITY "Head of Security"
// Head of Security alt titles
#define JOB_ALT_SECURITY_COMMANDER "Security Commander"
#define JOB_ALT_CHIEF_OF_SECURITY "Chief of Security"
#define JOB_ALT_SECURITY_MANAGER "Security Manager"
#define JOB_CHIEF_ENGINEER "Chief Engineer"
// Cheif Engineer alt titles
#define JOB_ALT_HEAD_ENGINEER "Head Engineer"
#define JOB_ALT_FOREMAN "Foreman"
#define JOB_ALT_MAINTENANCE_MANAGER "Maintenance Manager"
#define JOB_RESEARCH_DIRECTOR "Research Director"
// Research Director alt titles
#define JOB_ALT_RESEARCH_SUPERVISOR "Research Supervisor"
#define JOB_ALT_RESEARCH_MANAGER "Research Manager"
#define JOB_ALT_HEAD_OF_DEVELOPMENT "Head of Development"
#define JOB_ALT_HEAD_SCIENTIST "Head Scientist"
#define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer"
// Chief Medical Officer alt titles
#define JOB_ALT_CHIEF_PHYSICIAN "Chief Physician"
#define JOB_ALT_MEDICAL_DIRECTOR "Medical Director"
#define JOB_ALT_HEALTHCARE_MANAGER "Healthcare Manager"
#define JOB_QUARTERMASTER "Quartermaster"
// Quartermaster alt titles
#define JOB_ALT_SUPPLY_CHIEF "Supply Chief"
#define JOB_ALT_LOGISTICS_MANAGER "Logistics Manager"
#define JOB_ALT_CARGO_SUPERVISOR "Cargo Supervisor"
#define JOB_PATHFINDER "Pathfinder" // was Pathfinder //CHOMP explo keep
// Pathfinder alt titles
#define JOB_ALT_EXPEDITION_LEAD "Expedition Lead"
#define JOB_ALT_EXPLORATION_MANAGER "Exploration Manager"
//___________________________________________________________
// Station Assistant jobs
#define JOB_INTERN "Intern"
// Intern alt titles
#define JOB_ALT_APPRENTICE_ENGINEER "Apprentice Engineer"
#define JOB_ALT_RESEARCH_INTERN "Research Intern"
#define JOB_ALT_SECURITY_CADET "Security Cadet"
#define JOB_ALT_JR_CARGO_TECH "Jr. Cargo Tech"
#define JOB_ALT_JR_EXPLORER "Jr. Explorer" //CHOMP explo keep
#define JOB_ALT_SERVER "Server"
#define JOB_ALT_ASSISTANT "Assistant"
//Assistant/Visitor/Whatever
#define JOB_ALT_TECHNICAL_ASSISTANT "Technical Assistant"
#define JOB_ALT_MEDICAL_INTERN "Medical Intern"
#define JOB_ALT_RESEARCH_ASSISTANT "Research Assistant"
#define JOB_ALT_VISITOR "Visitor"
#define JOB_ALT_RESIDENT "Resident"
//___________________________________________________________
// Station Civilian jobs
#define JOB_BARTENDER "Bartender"
// Bartender alt titles
#define JOB_ALT_BARKEEPR "Barkeeper"
#define JOB_ALT_BARMAID "Barmaid"
#define JOB_ALT_BARISTA "Barista"
#define JOB_ALT_MIXOLOGIST "Mixologist"
#define JOB_CHEF "Chef"
// Chef alt titles
#define JOB_ALT_SOUSCHEF "Sous-chef"
#define JOB_ALT_COOK "Cook"
#define JOB_ALT_KITCHEN_WORKER "Kitchen Worker"
#define JOB_BOTANIST "Botanist"
// Botanist alt titles
#define JOB_ALT_HYDROPONICIST "Hydroponicist"
#define JOB_ALT_GARDENER "Gardener"
#define JOB_ALT_CULTIVATOR "Cultivator"
#define JOB_ALT_FARMER "Farmer"
#define JOB_ALT_FLORIST "Florist"
#define JOB_ALT_RANCHER "Rancher"
#define JOB_CARGO_TECHNICIAN "Cargo Technician"
// Cargo Technician alt titles
#define JOB_ALT_CARGO_LOADER "Cargo Loader"
#define JOB_ALT_CARGO_HANDLER "Cargo Handler"
#define JOB_ALT_SUPPLY_COURIER "Supply Courier"
#define JOB_ALT_DISPOSALS_SORTER "Disposals Sorter"
#define JOB_ALT_MAILMAN "Mailman" // CHOMPAdd
#define JOB_SHAFT_MINER "Shaft Miner"
// Shaft Miner alt titles
#define JOB_ALT_DEEP_SPACE_MINER "Deep Space Miner"
#define JOB_ALT_DRILL_TECHNICIAN "Drill Technician"
#define JOB_ALT_PROSPECTOR "Prospector"
#define JOB_ALT_EXCAVATOR "Excavator"
#define JOB_JANITOR "Janitor"
// Janitor alt titles
#define JOB_ALT_CUSTODIAN "Custodian"
#define JOB_ALT_SANITATION_TECHNICIAN "Sanitation Technician"
#define JOB_ALT_MAID "Maid"
#define JOB_ALT_GARBAGE_COLLECTOR "Garbage Collector"
#define JOB_LIBRARIAN "Librarian"
// Librarian alt titles
#define JOB_ALT_JOURNALIST "Journalist"
#define JOB_ALT_REPORTER "Reporter"
#define JOB_ALT_WRITER "Writer"
#define JOB_ALT_HISTORIAN "Historian"
#define JOB_ALT_ARCHIVIST "Archivist"
#define JOB_ALT_PROFESSOR "Professor"
#define JOB_ALT_ACADEMIC "Academic"
#define JOB_ALT_PHILOSOPHER "Philosopher"
#define JOB_ALT_CURATOR "Curator"
#define JOB_INTERNAL_AFFAIRS_AGENT "Internal Affairs Agent"
// Internal Affairs Agent alt titles
#define JOB_ALT_INTERNAL_AFFAIRS_LIAISON "Internal Affairs Liaison"
#define JOB_ALT_INTERNAL_AFFAIRS_DELEGATE "Internal Affairs Delegate"
#define JOB_ALT_INTERNAL_AFFAIRS_INVESTIGATOR "Internal Affairs Investigator"
#define JOB_CHAPLAIN "Chaplain"
// Chaplain alt titles
#define JOB_ALT_MISSIONARY "Missionary"
#define JOB_ALT_PREACHER "Preacher"
#define JOB_ALT_PRIEST "Priest"
#define JOB_ALT_NUN "Nun"
#define JOB_ALT_MONK "Monk"
#define JOB_ALT_COUNSELOR "Counselor"
#define JOB_ALT_GURU "Guru"
#define JOB_PILOT "Pilot"
// Pilot alt titles
#define JOB_ALT_COPILOT "Co-Pilot"
#define JOB_ALT_NAVIGATOR "Navigator"
#define JOB_ALT_HELMSMAN "Helmsman"
#define JOB_ENTERTAINER "Entertainer"
// Entertainer alt titles
#define JOB_ALT_PERFORMER "Performer"
#define JOB_ALT_MUSICIAN "Musician"
#define JOB_ALT_STAGEHAND "Stagehand"
#define JOB_ALT_ACTOR "Actor"
#define JOB_ALT_DANCER "Dancer"
#define JOB_ALT_SINGER "Singer"
#define JOB_ALT_MAGICIAN "Magician"
#define JOB_ALT_COMEDIAN "Comedian"
#define JOB_ALT_TRAGEDIAN "Tragedian"
#define JOB_ALT_ARTIST "Artist"
#define JOB_ALT_GAME_MASTER "Game Master"
#define JOB_ENTREPRENEUR "Entrepreneur"
// Entrepreneur alt titles
#define JOB_ALT_LAWYER "Lawyer"
#define JOB_ALT_PRIVATE_EYE "Private Eye"
#define JOB_ALT_BODYGUARD "Bodyguard"
#define JOB_ALT_PERSONAL_PHYSICIAN "Personal Physician"
#define JOB_ALT_DENTIST "Dentist"
#define JOB_ALT_FITNESS_INSTRUCTOR "Fitness Instructor"
#define JOB_ALT_YOGA_TEACHER "Yoga Teacher"
#define JOB_ALT_MASSEUSE "Masseuse"
#define JOB_ALT_TRADESPERSON "Tradesperson"
#define JOB_ALT_STREAMER "Streamer"
#define JOB_ALT_INFLUENCER "Influencer"
#define JOB_ALT_PARANORMAL_INVESTIGATOR "Paranormal Investigator"
#define JOB_ALT_PERSONAL_SECRETARY "Personal Secretary"
#define JOB_ALT_STYLIST "Stylist"
#define JOB_ALT_FISHER "Fisher"
#define JOB_ALT_FORTUNE_TELLER "Fortune Teller"
#define JOB_ALT_SPIRIT_HEALER "Spirit Healer"
//___________________________________________________________
// Station Engineering jobs
#define JOB_ENGINEER "Engineer"
// Engineer alt titles
#define JOB_ALT_MAINTENANCE_TECHNICIAN "Maintenance Technician"
#define JOB_ALT_ENGINE_TECHNICIAN "Engine Technician"
#define JOB_ALT_ELECTRICIAN "Electrician"
#define JOB_ALT_CONSTRUCTION_ENGINEER "Construction Engineer"
#define JOB_ALT_ENGINEERING_CONTRACTOR "Engineering Contractor"
#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
// Atmospheric Technician alt titles
#define JOB_ALT_ATMOSPHERIC_ENGINEER "Atmospheric Engineer"
#define JOB_ALT_ATMOSPHERIC_MAINTAINER "Atmospheric Maintainer"
#define JOB_ALT_DISPOSALS_TECHNICIAN "Disposals Technician"
#define JOB_ALT_FUEL_TECHNICIAN "Fuel Technician"
//___________________________________________________________
// Station Away Team / Explorer jobs
#define JOB_EXPLORER "Explorer" // was Explorer //CHOMP explo keep
// Explorer alt titles
#define JOB_ALT_SURVEYOR "Surveyor"
#define JOB_ALT_OFFSITE_SCOUT "Offsite Scout"
#define JOB_ALT_EXPLORER_MEDIC "Explorer Medic" // Unused
#define JOB_ALT_EXPLORERE_TECHNICIAN "Explorer Technician" // Unused
#define JOB_FIELD_MEDIC "Field Medic" // was Field Medic //CHOMP explo keep
// Field Medic alt titles
#define JOB_ALT_EXPEDITION_MEDIC "Expedition Medic"
#define JOB_ALT_OFFSITE_MEDIC "Offsite Medic"
//___________________________________________________________
// Station Medical jobs
#define JOB_MEDICAL_DOCTOR "Medical Doctor"
// Medical Doctor alt titles
#define JOB_ALT_PHYSICIAN "Physician"
#define JOB_ALT_MEDICAL_PRACTITIONER "Medical Practitioner"
#define JOB_ALT_SURGEON "Surgeon"
#define JOB_ALT_EMERGENCY_PHYSICIAN "Emergency Physician"
#define JOB_ALT_NURSE "Nurse"
#define JOB_ALT_ORDERLY "Orderly"
#define JOB_ALT_VIROLOGIST "Virologist"
#define JOB_ALT_MEDICAL_CONTRACTOR "Medical Contractor"
#define JOB_CHEMIST "Chemist"
// Chemist alt titles
#define JOB_ALT_PHARMACIST "Pharmacist"
#define JOB_ALT_PHARMACOLOGIST "Pharmacologist"
#define JOB_PSYCHIATRIST "Psychiatrist"
// Psychiatrist alt titles
#define JOB_ALT_PSYCHOLOGIST "Psychologist"
#define JOB_ALT_PSYCHOANALYST "Psychoanalyst"
#define JOB_ALT_PSYCHOTHERAPIST "Psychotherapist"
#define JOB_PARAMEDIC "Paramedic"
// Paramedic alt titles
#define JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN "Emergency Medical Technician"
#define JOB_ALT_MEDICAL_RESPONDER "Medical Responder"
#define JOB_SEARCH_AND_RESCUE "Search and Rescue" // CHOMPEdit, actual JOB here
#define JOB_GENETICIST "Geneticist" //Disabled atm
//___________________________________________________________
// Station Offduty jobs
#define JOB_OFFDUTY_OFFICER "Off-duty Officer"
#define JOB_OFFDUTY_ENGINEER "Off-duty Engineer"
#define JOB_OFFDUTY_MEDIC "Off-duty Medic"
#define JOB_OFFDUTY_SCIENTIST "Off-duty Scientist"
#define JOB_OFFDUTY_CARGO "Off-duty Cargo"
#define JOB_OFFDUTY_EXPLORER "Off-duty Explorer"
#define JOB_OFFDUTY_WORKER "Off-duty Worker"
//___________________________________________________________
// Station Science jobs
#define JOB_SCIENTIST "Scientist"
// Scientist alt titles
#define JOB_ALT_RESEARCHER "Researcher"
#define JOB_ALT_LAB_ASSISTANT "Lab Assistant"
#define JOB_ALT_XENOARCHAEOLOGIST "Xenoarchaeologist"
#define JOB_ALT_XENOPALEONTOLOGIST "Xenopaleontologist"
#define JOB_ALT_ANOMALIST "Anomalist"
#define JOB_ALT_PHORON_RESEARCHER "Phoron Researcher"
#define JOB_ALT_GAS_PHYSICIST "Gas Physicist"
#define JOB_ALT_CIRCUIT_DESIGNER "Circuit Designer"
#define JOB_ALT_CIRCUIT_PROGRAMMER "Circuit Programmer"
#define JOB_XENOBIOLOGIST "Xenobiologist"
// Xenobiologist alt titles
#define JOB_ALT_XENOZOOLOGIST "Xenozoologist"
#define JOB_ALT_XENOANTHROPOLOGIST "Xenoanthropologist"
#define JOB_ROBOTICIST "Roboticist"
// Roboticist alt titles
#define JOB_ALT_ASSEMBLY_TECHNICIAN "Assembly Technician"
#define JOB_ALT_BIOMECHANICAL_ENGINEER "Biomechanical Engineer"
#define JOB_ALT_MECHATRONIC_ENGINEER "Mechatronic Engineer"
#define JOB_XENOBOTANIST "Xenobotanist"
// Xenobotanist alt titles
#define JOB_ALT_XENOHYDROPONICIST "Xenohydroponicist"
#define JOB_ALT_XENOFLORIST "Xenoflorist"
//___________________________________________________________
// Station Security jobs
#define JOB_WARDEN "Warden"
// Warden alt titles
#define JOB_ALT_BRIG_SENTRY "Brig Sentry"
#define JOB_ALT_ARMORY_SUPERINTENDENT "Armory Superintendent"
#define JOB_ALT_MASTERATARMS "Master-at-Arms"
#define JOB_DETECTIVE "Detective"
// Detective alt titles
#define JOB_ALT_INVESTIGATOR "Investigator"
#define JOB_ALT_SECURITY_INSPECTOR "Security Inspector"
#define JOB_ALT_FORENSIC_TECHNICIAN "Forensic Technician"
#define JOB_SECURITY_OFFICER "Security Officer"
// Security Officer alt titles
#define JOB_ALT_PATROL_OFFICER "Patrol Officer"
#define JOB_ALT_SECURITY_GUARD "Security Guard"
#define JOB_ALT_SECURITY_DEPUTY "Security Deputy"
#define JOB_ALT_JUNIOR_OFFICER "Junior Officer"
#define JOB_ALT_SECURITY_CONTRACTOR "Security Contractor"
//___________________________________________________________
// Station Robot jobs
#define JOB_AI "AI"
#define JOB_CYBORG "Cyborg"
// Cyborg alt titles
#define JOB_ALT_ROBOT "Robot"
#define JOB_ALT_DRONE "Drone"
//___________________________________________________________
// Station Sepcial jobs //CHOMPNotice, all of those are used as JOB_ENTERTAINER alts
#define JOB_CLOWN "Clown"
// Clown alt titles
#define JOB_ALT_JESTER "Jester"
#define JOB_ALT_FOOL "Fool"
#define JOB_MIME "Mime"
// Mime alt titles
#define JOB_ALT_PASEUR "Poseur"
//___________________________________________________________
// Talon jobs
#define JOB_TALON_CAPTAIN "Talon Captain"
// Talon Captain alt titles
#define JOB_ALT_TALON_COMMANDER "Talon Commander"
#define JOB_TALON_DOCTOR "Talon Doctor"
// Talon Doctor alt titles
#define JOB_ALT_TALON_MEDIC "Talon Medic"
#define JOB_TALON_ENGINEER "Talon Engineer"
// Talon Engineer alt titles
#define JOB_ALT_TALON_TECHNICIAN "Talon Technician"
#define JOB_TALON_GUARD "Talon Guard"
// Talon Guard alt titles
#define JOB_ALT_TALON_SECURITY "Talon Security"
#define JOB_ALT_TALON_MARINE "Talon Marine" //CHOMPAdd
#define JOB_TALON_PILOT "Talon Pilot"
// Talon Pilot alt titles
#define JOB_ALT_TALON_HELMSMAN "Talon Helmsman"
#define JOB_TALON_MINER "Talon Miner"
// Talon Miner alt titles
#define JOB_ALT_TALON_EXCAVATOR "Talon Excavator"
//___________________________________________________________
// CHOMPAdd Start
// Blueshield jobs
#define JOB_BLUESHIELD_GUARD "Blueshield Guard"
#define JOB_SECURITY_PILOT "Security Pilot"
// CHOMPAdd End
// Mind jobs
#define JOB_SLIME "slime"
#define JOB_LARVA "Larva"
#define JOB_MONKEY "Monkey"
#define JOB_ANIMAL "Animal"
#define JOB_SIMPLE_MOB "Simple Mob"
#define JOB_CORGI "Corgi"
#define JOB_SHADE "Shade"
#define JOB_ARTIFICER "Artificer"
#define JOB_WRAITH "Wraith"
#define JOB_JUGGERNAUT "Juggernaut"
#define JOB_MODE = "MODE"
#define JOB_DISEMBODIED_VOICE "Disembodied Voice"
#define JOB_ALIEN "Alien"
#define JOB_GOLEM "Golem"
#define JOB_CORTICAL_BORER "Cortical Borer"
#define JOB_SYNTHETIC_BRAIN "Synthetic Brain"
#define JOB_ROBOTIC_INTELLIGENCE "Robotic Intelligence"
#define JOB_POSITRONIC_BRAIN "Positronic Brain"
#define JOB_CARBON_BASED "Carbon-based"
#define JOB_SILICON_BASED "Silicon-based"
#define JOB_PAI "pAI"
#define JOB_PROMETHEAN "Promethean"
#define JOB_LIVING "Living"
#define JOB_NEW_PLAYER "New player"
#define JOB_GHOST "Ghost"
#define JOB_GHOSTROLES "GhostRoles"
#define JOB_GRAFFITI "Graffiti"
#define JOB_RECORDS "Records"
#define JOB_DIONAEA "Dionaea"
#define JOB_CUSTOM_LOADOUT "Custom loadout"
// Speical Mind / Antag / Event jobs
#define JOB_CULTIST "Cultist"
#define JOB_MEME "Meme"
#define JOB_APPRENTICE "apprentice"
#define JOB_WIZARD "Wizard"
#define JOB_ANTAGHUD "AntagHUD"
#define JOB_CHANGELING "Changeling"
#define JOB_SYNDICATE "Syndicate"
#define JOB_XENOMORPH "Xenomorph"
#define JOB_BORER "Borer"
#define JOB_EMERGENCY_RESPONSE_TEAM "Emergency Response Team"

View File

@@ -42,9 +42,6 @@
#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience)
//Assistant/Visitor/Whatever
#define USELESS_JOB "Visitor"
//Herm Gender
#define HERM "herm"

32
code/__defines/radio.dm Normal file
View File

@@ -0,0 +1,32 @@
// Station Radio Channel
#define CHANNEL_COMMON "Common"
#define CHANNEL_AI_PRIVATE "AI Private"
#define CHANNEL_ENTERTAINMENT "Entertainment"
// Departments
#define CHANNEL_COMMAND "Command"
#define CHANNEL_SECURITY "Security"
#define CHANNEL_SECURITY_1 "Security(I)"
#define CHANNEL_SUPPLY "Supply"
#define CHANNEL_SERVICE "Service"
#define CHANNEL_ENGINEERING "Engineering"
#define CHANNEL_SCIENCE "Science"
#define CHANNEL_MEDICAL "Medical"
#define CHANNEL_MEDICAL_1 "Medical(I)"
#define CHANNEL_EXPLORATION "Explorer" // was Explorer //CHOMPEdit explo keep
// Special Channels
#define CHANNEL_RESPONSE_TEAM "Response Team"
#define CHANNEL_SPECIAL_OPS "Special Ops"
// Antag Channels
#define CHANNEL_RAIDER "Raider"
#define CHANNEL_MERCENARY "Mercenary"
// Other Channels
#define CHANNEL_TALON "Talon"
#define CHANNEL_CASINO "Casino"
// CHOMPAdd Channels
#define CHANNEL_BODYCAM "Bodycam"
#define CHANNEL_OUTSIDER "Outsider"

View File

@@ -546,16 +546,16 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
SPECIES_SHADEKIN) //Shadefluffers just poof away
/var/global/list/alt_titles_with_icons = list(
"Virologist",
"Apprentice Engineer",
"Medical Intern",
"Research Intern",
"Security Cadet",
"Jr. Cargo Tech",
"Jr. Explorer", //CHOMP explo keep
"Server",
"Electrician",
"Barista")
JOB_ALT_VIROLOGIST,
JOB_ALT_APPRENTICE_ENGINEER,
JOB_ALT_MEDICAL_INTERN,
JOB_ALT_RESEARCH_INTERN,
JOB_ALT_SECURITY_CADET,
JOB_ALT_JR_CARGO_TECH,
JOB_ALT_JR_EXPLORER, //CHOMP explo keep
JOB_ALT_SERVER,
JOB_ALT_ELECTRICIAN,
JOB_ALT_BARISTA)
/var/global/list/existing_solargrubs = list()

View File

@@ -350,7 +350,7 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the
/obj/screen/alert/locked
name = "Locked Down"
desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \
desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the " + JOB_RESEARCH_DIRECTOR + "'s \
office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary."
icon_state = "locked"
no_underlay = TRUE

View File

@@ -131,27 +131,27 @@ var/const/CSN_FREQ = 1365 //VOREStation Add
var/const/OUT_FREQ = 1367 //CHOMPstation Add
var/list/radiochannels = list(
"Common" = PUB_FREQ,
"Science" = SCI_FREQ,
"Command" = COMM_FREQ,
"Medical" = MED_FREQ,
"Engineering" = ENG_FREQ,
"Security" = SEC_FREQ,
"Bodycam" = BDCM_FREQ, // CHOMPEdit
"Response Team" = ERT_FREQ,
"Special Ops" = DTH_FREQ,
"Mercenary" = SYND_FREQ,
"Raider" = RAID_FREQ,
"Supply" = SUP_FREQ,
"Service" = SRV_FREQ,
"Explorer" = EXP_FREQ, //CHOMP explo keep
"AI Private" = AI_FREQ,
"Entertainment" = ENT_FREQ,
"Medical(I)" = MED_I_FREQ,
"Security(I)" = SEC_I_FREQ,
"Talon" = TALON_FREQ, //VOREStation Add
"Casino" = CSN_FREQ,
"Outsider" = OUT_FREQ //CHOMPstation Add
CHANNEL_COMMON = PUB_FREQ,
CHANNEL_SCIENCE = SCI_FREQ,
CHANNEL_COMMAND = COMM_FREQ,
CHANNEL_MEDICAL = MED_FREQ,
CHANNEL_ENGINEERING = ENG_FREQ,
CHANNEL_SECURITY = SEC_FREQ,
CHANNEL_BODYCAM = BDCM_FREQ, // CHOMPEdit
CHANNEL_RESPONSE_TEAM = ERT_FREQ,
CHANNEL_SPECIAL_OPS = DTH_FREQ,
CHANNEL_MERCENARY = SYND_FREQ,
CHANNEL_RAIDER = RAID_FREQ,
CHANNEL_SUPPLY = SUP_FREQ,
CHANNEL_SERVICE = SRV_FREQ,
CHANNEL_EXPLORATION = EXP_FREQ,
CHANNEL_AI_PRIVATE = AI_FREQ,
CHANNEL_ENTERTAINMENT = ENT_FREQ,
CHANNEL_MEDICAL_1 = MED_I_FREQ,
CHANNEL_SECURITY_1 = SEC_I_FREQ,
CHANNEL_TALON = TALON_FREQ, //VOREStation Add
CHANNEL_CASINO = CSN_FREQ,
CHANNEL_OUTSIDER = OUT_FREQ //CHOMPstation Add
)
// Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels

View File

@@ -26,7 +26,7 @@ SUBSYSTEM_DEF(job)
//CHOMPadd end
return SS_INIT_SUCCESS // CHOMPEdit
/datum/controller/subsystem/job/proc/setup_occupations(faction = "Station")
/datum/controller/subsystem/job/proc/setup_occupations(faction = FACTION_STATION)
occupations = list()
var/list/all_jobs = subtypesof(/datum/job)
if(!all_jobs.len)

View File

@@ -437,7 +437,7 @@ var/global/datum/controller/subsystem/ticker/ticker
var/captainless=1
for(var/mob/living/carbon/human/player in player_list)
if(player && player.mind && player.mind.assigned_role)
if(player.mind.assigned_role == "Site Manager")
if(player.mind.assigned_role == JOB_SITE_MANAGER)
captainless=0
if(!player_is_antag(player.mind, only_offstation_roles = 1))
job_master.EquipRank(player, player.mind.assigned_role, 0)

View File

@@ -219,7 +219,7 @@ var/global/list/PDA_Manifest = list()
heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1
depthead = 1
if(rank=="Site Manager" && heads.len != 1)
if(rank==JOB_SITE_MANAGER && heads.len != 1)
heads.Swap(1,heads.len)
if(SSjob.is_job_in_department(real_rank, DEPARTMENT_SECURITY))

View File

@@ -53,7 +53,7 @@
/// Send async alerts and ask for responses. Expects you to have tested D for client and type already
/datum/ghost_query/proc/ask_question(var/mob/observer/dead/D)
//VOREStation Add Start Check the ban status before we ask
if(jobban_isbanned(D, "GhostRoles"))
if(jobban_isbanned(D, JOB_GHOSTROLES))
return
//VOREStation Add End
@@ -112,7 +112,7 @@
question = "Someone has activated a Positronic Brain. Would you like to play as one?"
query_sound = 'sound/machines/boobeebeep.ogg'
be_special_flag = BE_AI
check_bans = list("AI", "Cyborg")
check_bans = list(JOB_AI, JOB_CYBORG)
cutoff_number = 1
/datum/ghost_query/drone_brain
@@ -120,7 +120,7 @@
question = "Someone has activated a Drone AI Chipset. Would you like to play as one?"
query_sound = 'sound/machines/boobeebeep.ogg'
be_special_flag = BE_AI
check_bans = list("AI", "Cyborg")
check_bans = list(JOB_AI, JOB_CYBORG)
cutoff_number = 1
// Antags.
@@ -128,7 +128,7 @@
role_name = "Technomancer Apprentice"
question = "A Technomancer is requesting an Apprentice to help them on their adventure to the facility. Would you like to play as the Apprentice?"
be_special_flag = BE_WIZARD
check_bans = list("Syndicate", "wizard")
check_bans = list(JOB_SYNDICATE, JOB_WIZARD)
cutoff_number = 1
/datum/ghost_query/xeno
@@ -141,7 +141,7 @@
role_name = "Xenomorph Larva"
question = "A xenomorph larva is ready to hatch from their egg. Would you like to join the hive?"
be_special_flag = BE_ALIEN
check_bans = list("Xenomorph")
check_bans = list(JOB_XENOMORPH)
cutoff_number = 1
@@ -156,14 +156,14 @@
role_name = "Mercenary Drone"
question = "A team of dubious mercenaries have purchased a powerful drone, and they are attempting to activate it. Would you like to play as the drone?"
be_special_flag = BE_AI
check_bans = list("AI", "Cyborg", "Syndicate")
check_bans = list(JOB_AI, JOB_CYBORG, JOB_SYNDICATE)
cutoff_number = 1
/datum/ghost_query/borer
role_name = "Cortical Borer"
question = "A cortical borer has just been created on the facility. Would you like to play as them?"
be_special_flag = BE_ALIEN
check_bans = list("Syndicate", "Borer")
check_bans = list(JOB_SYNDICATE, JOB_BORER)
cutoff_number = 1
// Surface stuff.
@@ -171,14 +171,14 @@
role_name = "Lost Drone"
question = "A lost drone onboard has been discovered by a crewmember and they are attempting to reactivate it. Would you like to play as the drone?"
be_special_flag = BE_LOSTDRONE //VOREStation Edit
check_bans = list("AI", "Cyborg")
check_bans = list(JOB_AI, JOB_CYBORG)
cutoff_number = 1
/datum/ghost_query/gravekeeper_drone
role_name = "Gravekeeper Drone"
question = "A gravekeeper drone is about to reactivate and tend to its gravesite. Would you like to play as the drone?"
be_special_flag = BE_AI
check_bans = list("AI", "Cyborg")
check_bans = list(JOB_AI, JOB_CYBORG)
cutoff_number = 1
/datum/ghost_query/lost_passenger

View File

@@ -515,58 +515,58 @@
/mob/living/carbon/human/mind_initialize()
. = ..()
if(!mind.assigned_role)
mind.assigned_role = USELESS_JOB //defualt //VOREStation Edit - Visitor not Assistant
mind.assigned_role = JOB_ALT_VISITOR //defualt //VOREStation Edit - Visitor not Assistant
//slime
/mob/living/simple_mob/slime/mind_initialize()
. = ..()
mind.assigned_role = "slime"
mind.assigned_role = JOB_SLIME
/mob/living/carbon/alien/larva/mind_initialize()
. = ..()
mind.special_role = "Larva"
mind.special_role = JOB_LARVA
//AI
/mob/living/silicon/ai/mind_initialize()
. = ..()
mind.assigned_role = "AI"
mind.assigned_role = JOB_AI
//BORG
/mob/living/silicon/robot/mind_initialize()
. = ..()
mind.assigned_role = "Cyborg"
mind.assigned_role = JOB_CYBORG
//PAI
/mob/living/silicon/pai/mind_initialize()
. = ..()
mind.assigned_role = "pAI"
mind.assigned_role = JOB_PAI
mind.special_role = ""
//Animals
/mob/living/simple_mob/mind_initialize()
. = ..()
mind.assigned_role = "Simple Mob"
mind.assigned_role = JOB_SIMPLE_MOB
/mob/living/simple_mob/animal/passive/dog/corgi/mind_initialize()
. = ..()
mind.assigned_role = "Corgi"
mind.assigned_role = JOB_CORGI
/mob/living/simple_mob/construct/shade/mind_initialize()
. = ..()
mind.assigned_role = "Shade"
mind.special_role = "Cultist"
mind.assigned_role = JOB_SHADE
mind.special_role = JOB_CULTIST
/mob/living/simple_mob/construct/artificer/mind_initialize()
. = ..()
mind.assigned_role = "Artificer"
mind.special_role = "Cultist"
mind.assigned_role = JOB_ARTIFICER
mind.special_role = JOB_CULTIST
/mob/living/simple_mob/construct/wraith/mind_initialize()
. = ..()
mind.assigned_role = "Wraith"
mind.special_role = "Cultist"
mind.assigned_role = JOB_WRAITH
mind.special_role = JOB_CULTIST
/mob/living/simple_mob/construct/juggernaut/mind_initialize()
. = ..()
mind.assigned_role = "Juggernaut"
mind.special_role = "Cultist"
mind.assigned_role = JOB_JUGGERNAUT
mind.special_role = JOB_CULTIST

View File

@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/blueshield
name = OUTFIT_JOB_NAME("Blueshield Guard")
name = OUTFIT_JOB_NAME(JOB_BLUESHIELD_GUARD)
uniform = /obj/item/clothing/under/yw/blueshield
l_ear = /obj/item/device/radio/headset/heads/blueshield
shoes = /obj/item/clothing/shoes/laceup

View File

@@ -1,21 +1,21 @@
/decl/hierarchy/outfit/job/assistant
name = OUTFIT_JOB_NAME(USELESS_JOB) //VOREStation Edit - Visitor not Assistant
name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
id_type = /obj/item/weapon/card/id/generic //VOREStation Edit
/decl/hierarchy/outfit/job/assistant/visitor
name = OUTFIT_JOB_NAME("Visitor")
id_pda_assignment = "Visitor"
name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR)
id_pda_assignment = JOB_ALT_VISITOR
uniform = /obj/item/clothing/under/assistantformal
//VOREStation Add - Interns
/decl/hierarchy/outfit/job/assistant/intern
name = OUTFIT_JOB_NAME("Intern")
name = OUTFIT_JOB_NAME(JOB_INTERN)
id_type = /obj/item/weapon/card/id/civilian
//VOREStation Add End - Interns
/decl/hierarchy/outfit/job/assistant/resident
name = OUTFIT_JOB_NAME("Resident")
id_pda_assignment = "Resident"
name = OUTFIT_JOB_NAME(JOB_ALT_RESIDENT)
id_pda_assignment = JOB_ALT_RESIDENT
uniform = /obj/item/clothing/under/color/white
/decl/hierarchy/outfit/job/service
@@ -23,7 +23,7 @@
hierarchy_type = /decl/hierarchy/outfit/job/service
/decl/hierarchy/outfit/job/service/bartender
name = OUTFIT_JOB_NAME("Bartender")
name = OUTFIT_JOB_NAME(JOB_BARTENDER)
uniform = /obj/item/clothing/under/rank/bartender
id_type = /obj/item/weapon/card/id/civilian/service/bartender //VOREStation Edit
pda_type = /obj/item/device/pda/bar
@@ -36,12 +36,12 @@
permit.set_name(H.real_name)
/decl/hierarchy/outfit/job/service/bartender/barista
name = OUTFIT_JOB_NAME("Barista")
id_pda_assignment = "Barista"
name = OUTFIT_JOB_NAME(JOB_ALT_BARISTA)
id_pda_assignment = JOB_ALT_BARISTA
backpack_contents = null
/decl/hierarchy/outfit/job/service/chef
name = OUTFIT_JOB_NAME("Chef")
name = OUTFIT_JOB_NAME(JOB_CHEF)
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/chef
head = /obj/item/clothing/head/chefhat
@@ -49,19 +49,19 @@
pda_type = /obj/item/device/pda/chef
/decl/hierarchy/outfit/job/service/chef/cook
name = OUTFIT_JOB_NAME("Cook")
id_pda_assignment = "Cook"
name = OUTFIT_JOB_NAME(JOB_ALT_COOK)
id_pda_assignment = JOB_ALT_COOK
// Rykka adds Server Outfit
/decl/hierarchy/outfit/job/service/server
name = OUTFIT_JOB_NAME("Server")
name = OUTFIT_JOB_NAME(JOB_ALT_SERVER)
uniform = /obj/item/clothing/under/waiter
// End Outfit addition
/decl/hierarchy/outfit/job/service/gardener
name = OUTFIT_JOB_NAME("Gardener")
name = OUTFIT_JOB_NAME(JOB_ALT_GARDENER)
uniform = /obj/item/clothing/under/rank/hydroponics
suit = /obj/item/clothing/suit/storage/apron
gloves = /obj/item/clothing/gloves/botanic_leather
@@ -74,13 +74,13 @@
pda_type = /obj/item/device/pda/botanist
/decl/hierarchy/outfit/job/service/janitor
name = OUTFIT_JOB_NAME("Janitor")
name = OUTFIT_JOB_NAME(JOB_JANITOR)
uniform = /obj/item/clothing/under/rank/janitor
id_type = /obj/item/weapon/card/id/civilian/service/janitor //VOREStation Edit
pda_type = /obj/item/device/pda/janitor
/decl/hierarchy/outfit/job/librarian
name = OUTFIT_JOB_NAME("Librarian")
name = OUTFIT_JOB_NAME(JOB_LIBRARIAN)
uniform = /obj/item/clothing/under/suit_jacket/red
l_hand = /obj/item/weapon/barcodescanner
id_type = /obj/item/weapon/card/id/civilian
@@ -101,14 +101,14 @@
pda_type = /obj/item/device/pda/lawyer
/decl/hierarchy/outfit/job/chaplain
name = OUTFIT_JOB_NAME("Chaplain")
name = OUTFIT_JOB_NAME(JOB_CHAPLAIN)
uniform = /obj/item/clothing/under/rank/chaplain
l_hand = /obj/item/weapon/storage/bible
id_type = /obj/item/weapon/card/id/civilian/chaplain
pda_type = /obj/item/device/pda/chaplain
/decl/hierarchy/outfit/job/explorer
name = OUTFIT_JOB_NAME("Explorer")
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
mask = /obj/item/clothing/mask/gas/explorer
@@ -120,4 +120,4 @@
pda_slot = slot_belt
pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
r_pocket = /obj/item/device/gps/explorer
id_pda_assignment = "Explorer"
id_pda_assignment = JOB_EXPLORER

View File

@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/captain
name = OUTFIT_JOB_NAME("Captain")
name = OUTFIT_JOB_NAME(JOB_ALT_CAPTAIN) // Keep Captain for now, not JOB_SITE_MANAGER
glasses = /obj/item/clothing/glasses/sunglasses
uniform = /obj/item/clothing/under/rank/captain
l_ear = /obj/item/device/radio/headset/heads/captain
@@ -24,7 +24,7 @@
qdel(medal)
/decl/hierarchy/outfit/job/hop
name = OUTFIT_JOB_NAME("Head of Personnel")
name = OUTFIT_JOB_NAME(JOB_HEAD_OF_PERSONNEL)
uniform = /obj/item/clothing/under/rank/head_of_personnel
l_ear = /obj/item/device/radio/headset/heads/hop
shoes = /obj/item/clothing/shoes/brown
@@ -32,7 +32,7 @@
pda_type = /obj/item/device/pda/heads/hop
/decl/hierarchy/outfit/job/secretary
name = OUTFIT_JOB_NAME("Command Secretary")
name = OUTFIT_JOB_NAME(JOB_COMMAND_SECRETARY)
l_ear = /obj/item/device/radio/headset/headset_com
shoes = /obj/item/clothing/shoes/brown
id_type = /obj/item/weapon/card/id/silver/secretary
@@ -44,4 +44,4 @@
if(H.gender == FEMALE)
uniform = /obj/item/clothing/under/suit_jacket/female/skirt
else
uniform = /obj/item/clothing/under/suit_jacket/charcoal
uniform = /obj/item/clothing/under/suit_jacket/charcoal

View File

@@ -11,7 +11,7 @@
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
/decl/hierarchy/outfit/job/engineering/chief_engineer
name = OUTFIT_JOB_NAME("Chief engineer")
name = OUTFIT_JOB_NAME(JOB_CHIEF_ENGINEER)
head = /obj/item/clothing/head/hardhat/white
uniform = /obj/item/clothing/under/rank/chief_engineer
l_ear = /obj/item/device/radio/headset/heads/ce
@@ -20,14 +20,14 @@
pda_type = /obj/item/device/pda/heads/ce
/decl/hierarchy/outfit/job/engineering/engineer
name = OUTFIT_JOB_NAME("Engineer")
name = OUTFIT_JOB_NAME(JOB_ENGINEER)
head = /obj/item/clothing/head/hardhat
uniform = /obj/item/clothing/under/rank/engineer
id_type = /obj/item/weapon/card/id/engineering
pda_type = /obj/item/device/pda/engineering
/decl/hierarchy/outfit/job/engineering/atmos
name = OUTFIT_JOB_NAME("Atmospheric technician")
name = OUTFIT_JOB_NAME(JOB_ATMOSPHERIC_TECHNICIAN)
uniform = /obj/item/clothing/under/rank/atmospheric_technician
belt = /obj/item/weapon/storage/belt/utility/atmostech
id_type = /obj/item/weapon/card/id/engineering/atmos

View File

@@ -9,7 +9,7 @@
messenger_bag = /obj/item/weapon/storage/backpack/messenger/med
/decl/hierarchy/outfit/job/medical/cmo
name = OUTFIT_JOB_NAME("Chief Medical Officer")
name = OUTFIT_JOB_NAME(JOB_CHIEF_MEDICAL_OFFICER)
l_ear =/obj/item/device/radio/headset/heads/cmo
uniform = /obj/item/clothing/under/rank/chief_medical_officer
suit = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
@@ -20,7 +20,7 @@
pda_type = /obj/item/device/pda/heads/cmo
/decl/hierarchy/outfit/job/medical/doctor
name = OUTFIT_JOB_NAME("Medical Doctor")
name = OUTFIT_JOB_NAME(JOB_MEDICAL_DOCTOR)
uniform = /obj/item/clothing/under/rank/medical
suit = /obj/item/clothing/suit/storage/toggle/labcoat
l_hand = /obj/item/weapon/storage/firstaid/adv //CHOMP Edit
@@ -28,16 +28,16 @@
id_type = /obj/item/weapon/card/id/medical
/decl/hierarchy/outfit/job/medical/doctor/emergency_physician
name = OUTFIT_JOB_NAME("Emergency Physician")
name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_PHYSICIAN)
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
/decl/hierarchy/outfit/job/medical/doctor/surgeon
name = OUTFIT_JOB_NAME("Surgeon")
name = OUTFIT_JOB_NAME(JOB_ALT_SURGEON)
uniform = /obj/item/clothing/under/rank/medical/scrubs
head = /obj/item/clothing/head/surgery/blue
/decl/hierarchy/outfit/job/medical/doctor/virologist
name = OUTFIT_JOB_NAME("Virologist")
name = OUTFIT_JOB_NAME(JOB_ALT_VIROLOGIST)
uniform = /obj/item/clothing/under/rank/virologist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/virologist
mask = /obj/item/clothing/mask/surgical
@@ -45,7 +45,7 @@
satchel_one = /obj/item/weapon/storage/backpack/satchel/vir
/decl/hierarchy/outfit/job/medical/doctor/nurse
name = OUTFIT_JOB_NAME("Nurse")
name = OUTFIT_JOB_NAME(JOB_ALT_NURSE)
suit = null
/decl/hierarchy/outfit/job/medical/doctor/nurse/pre_equip(mob/living/carbon/human/H)
@@ -60,7 +60,7 @@
..()
/decl/hierarchy/outfit/job/medical/chemist
name = OUTFIT_JOB_NAME("Chemist")
name = OUTFIT_JOB_NAME(JOB_CHEMIST)
uniform = /obj/item/clothing/under/rank/chemist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
backpack = /obj/item/weapon/storage/backpack/chemistry
@@ -70,7 +70,7 @@
pda_type = /obj/item/device/pda/chemist
/decl/hierarchy/outfit/job/medical/geneticist
name = OUTFIT_JOB_NAME("Geneticist")
name = OUTFIT_JOB_NAME(JOB_GENETICIST)
uniform = /obj/item/clothing/under/rank/geneticist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics
backpack = /obj/item/weapon/storage/backpack/genetics
@@ -80,18 +80,18 @@
pda_type = /obj/item/device/pda/geneticist
/decl/hierarchy/outfit/job/medical/psychiatrist
name = OUTFIT_JOB_NAME("Psychiatrist")
name = OUTFIT_JOB_NAME(JOB_PSYCHIATRIST)
uniform = /obj/item/clothing/under/rank/psych
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/laceup
id_type = /obj/item/weapon/card/id/medical/psych
/decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
name = OUTFIT_JOB_NAME("Psychologist")
name = OUTFIT_JOB_NAME(JOB_ALT_PSYCHOLOGIST)
uniform = /obj/item/clothing/under/rank/psych/turtleneck
/decl/hierarchy/outfit/job/medical/paramedic
name = OUTFIT_JOB_NAME("Paramedic")
name = OUTFIT_JOB_NAME(JOB_PARAMEDIC)
uniform = /obj/item/clothing/under/rank/medical/paramedic
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
shoes = /obj/item/clothing/shoes/boots/jackboots
@@ -102,6 +102,6 @@
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
/decl/hierarchy/outfit/job/medical/paramedic/emt
name = OUTFIT_JOB_NAME("Emergency Medical Technician")
name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN)
uniform = /obj/item/clothing/under/rank/medical/paramedic_alt
suit = /obj/item/clothing/suit/storage/toggle/labcoat/emt

View File

@@ -3,9 +3,9 @@
hierarchy_type = /decl/hierarchy/outfit/job/silicon
/decl/hierarchy/outfit/job/silicon/ai
name = OUTFIT_JOB_NAME("AI")
name = OUTFIT_JOB_NAME(JOB_AI)
suit = /obj/item/clothing/suit/straight_jacket
/decl/hierarchy/outfit/job/silicon/cyborg
name = OUTFIT_JOB_NAME("Cyborg")
name = OUTFIT_JOB_NAME(JOB_CYBORG)
suit = /obj/item/clothing/suit/cardborg

View File

@@ -19,19 +19,19 @@
pda_type = /obj/item/device/pda/heads/rd
/decl/hierarchy/outfit/job/science/scientist
name = OUTFIT_JOB_NAME("Scientist")
name = OUTFIT_JOB_NAME(JOB_SCIENTIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
/decl/hierarchy/outfit/job/science/xenobiologist
name = OUTFIT_JOB_NAME("Xenobiologist")
name = OUTFIT_JOB_NAME(JOB_XENOBIOLOGIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
/decl/hierarchy/outfit/job/science/roboticist
name = OUTFIT_JOB_NAME("Roboticist")
name = OUTFIT_JOB_NAME(JOB_ROBOTICIST)
uniform = /obj/item/clothing/under/rank/roboticist
shoes = /obj/item/clothing/shoes/black
belt = /obj/item/weapon/storage/belt/utility/full/multitool
@@ -40,4 +40,4 @@
pda_type = /obj/item/device/pda/roboticist
backpack = /obj/item/weapon/storage/backpack
satchel_one = /obj/item/weapon/storage/backpack/satchel/norm
suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/roboticist

View File

@@ -2,7 +2,7 @@
id_type = /obj/item/weapon/card/id/science/xenobiologist
/decl/hierarchy/outfit/job/science/xenobotanist
name = OUTFIT_JOB_NAME("Xenobotanist")
name = OUTFIT_JOB_NAME(JOB_XENOBOTANIST)
uniform = /obj/item/clothing/under/rank/scientist
id_type = /obj/item/weapon/card/id/science/xenobotanist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science
suit = /obj/item/clothing/suit/storage/toggle/labcoat/science

View File

@@ -11,21 +11,21 @@
sports_bag = /obj/item/weapon/storage/backpack/sport/sec
/decl/hierarchy/outfit/job/security/hos
name = OUTFIT_JOB_NAME("Head of security")
name = OUTFIT_JOB_NAME(JOB_HEAD_OF_SECURITY)
l_ear = /obj/item/device/radio/headset/heads/hos
uniform = /obj/item/clothing/under/rank/head_of_security
id_type = /obj/item/weapon/card/id/security/head
pda_type = /obj/item/device/pda/heads/hos
/decl/hierarchy/outfit/job/security/warden
name = OUTFIT_JOB_NAME("Warden")
name = OUTFIT_JOB_NAME(JOB_WARDEN)
uniform = /obj/item/clothing/under/rank/warden
l_pocket = /obj/item/device/flash
id_type = /obj/item/weapon/card/id/security/warden
pda_type = /obj/item/device/pda/warden
/decl/hierarchy/outfit/job/security/detective
name = OUTFIT_JOB_NAME("Detective")
name = OUTFIT_JOB_NAME(JOB_DETECTIVE)
head = /obj/item/clothing/head/det
uniform = /obj/item/clothing/under/det
suit = /obj/item/clothing/suit/storage/det_trench
@@ -48,7 +48,7 @@
//VOREStation Edit End
/decl/hierarchy/outfit/job/security/officer
name = OUTFIT_JOB_NAME("Security Officer")
name = OUTFIT_JOB_NAME(JOB_SECURITY_OFFICER)
uniform = /obj/item/clothing/under/rank/security
l_pocket = /obj/item/device/flash
id_type = /obj/item/weapon/card/id/security

View File

@@ -1,5 +1,5 @@
/decl/hierarchy/outfit/job/security/pilot
name = OUTFIT_JOB_NAME("Security Pilot")
name = OUTFIT_JOB_NAME(JOB_SECURITY_PILOT)
uniform = /obj/item/clothing/under/rank/khi/sec/pilot
id_type = /obj/item/weapon/card/id/security
pda_type = /obj/item/device/pda/security
pda_type = /obj/item/device/pda/security

View File

@@ -27,7 +27,7 @@
ert.add_antagonist(H.mind)
/decl/hierarchy/outfit/job/clown
name = OUTFIT_JOB_NAME("Clown")
name = OUTFIT_JOB_NAME(JOB_CLOWN)
uniform = /obj/item/clothing/under/rank/clown
back = /obj/item/weapon/storage/backpack/clown
shoes = /obj/item/clothing/shoes/clown_shoes
@@ -38,7 +38,7 @@
flags = 0
/decl/hierarchy/outfit/job/mime
name = OUTFIT_JOB_NAME("Mime")
name = OUTFIT_JOB_NAME(JOB_MIME)
uniform = /obj/item/clothing/under/mime
shoes = /obj/item/clothing/shoes/mime
head = /obj/item/clothing/head/soft/mime

View File

@@ -109,7 +109,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME("Explorer")
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/device/radio/headset/explorer
@@ -117,14 +117,14 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/explorer
id_type = /obj/item/weapon/card/id/exploration
id_pda_assignment = "Explorer"
id_pda_assignment = JOB_EXPLORER
backpack = /obj/item/weapon/storage/backpack/explorer
satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer
messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME("Pilot")
name = OUTFIT_JOB_NAME(JOB_PILOT)
shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
@@ -136,11 +136,11 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_slot = slot_belt
pda_type = /obj/item/device/pda/pilot
id_type = /obj/item/weapon/card/id/civilian/pilot
id_pda_assignment = "Pilot"
id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic")
name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC)
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
shoes = /obj/item/clothing/shoes/boots/winter/explorer
@@ -150,14 +150,14 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/sar
id_type = /obj/item/weapon/card/id/exploration/fm
id_pda_assignment = "Field Medic"
id_pda_assignment = JOB_FIELD_MEDIC
backpack = /obj/item/weapon/storage/backpack/explorer
satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer
messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME("Pathfinder")
name = OUTFIT_JOB_NAME(JOB_PATHFINDER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
l_ear = /obj/item/device/radio/headset/pathfinder
@@ -165,7 +165,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_slot = slot_l_store
pda_type = /obj/item/device/pda/pathfinder
id_type = /obj/item/weapon/card/id/exploration/head
id_pda_assignment = "Pathfinder"
id_pda_assignment = JOB_PATHFINDER
backpack = /obj/item/weapon/storage/backpack/explorer //CHOMPADD
satchel_one = /obj/item/weapon/storage/backpack/satchel/explorer //CHOMPADD
messenger_bag = /obj/item/weapon/storage/backpack/messenger/explorer //CHOMPADD

View File

@@ -192,7 +192,7 @@
)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Particle Accelerator crate"
access = access_ce
access = list(access_ce, access_research) // CHOMPEdit
/datum/supply_pack/eng/shield_gen
contains = list(/obj/item/weapon/circuitboard/shield_gen)

View File

@@ -145,7 +145,7 @@
access = access_cmo
/datum/supply_pack/med/doctorgear
name = "Medical Doctor equipment"
name = JOB_MEDICAL_DOCTOR + " equipment"
contains = list(
/obj/item/weapon/storage/belt/medical,
/obj/item/device/radio/headset/headset_med,
@@ -164,11 +164,11 @@
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical Doctor equipment"
containername = JOB_MEDICAL_DOCTOR + " equipment"
access = access_medical_equip
/datum/supply_pack/med/chemistgear
name = "Chemist equipment"
name = JOB_CHEMIST + " equipment"
contains = list(
/obj/item/weapon/storage/box/beakers,
/obj/item/device/radio/headset/headset_med,
@@ -187,11 +187,11 @@
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Chemist equipment"
containername = JOB_CHEMIST + " equipment"
access = access_chemistry
/datum/supply_pack/med/paramedicgear
name = "Paramedic equipment"
name = JOB_PARAMEDIC + " equipment"
contains = list(
/obj/item/weapon/storage/belt/medical/emt,
/obj/item/device/radio/headset/headset_med,
@@ -215,11 +215,11 @@
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Paramedic equipment"
containername = JOB_PARAMEDIC + " equipment"
access = access_medical_equip
/datum/supply_pack/med/psychiatristgear
name = "Psychiatrist equipment"
name = JOB_PSYCHIATRIST + " equipment"
contains = list(
/obj/item/clothing/under/rank/psych,
/obj/item/device/radio/headset/headset_med,
@@ -234,7 +234,7 @@
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Psychiatrist equipment"
containername = JOB_PSYCHIATRIST + " equipment"
access = access_psychiatrist
/datum/supply_pack/med/medicalscrubs

View File

@@ -118,7 +118,7 @@
containername = "EFTPOS crate"
/datum/supply_pack/misc/chaplaingear
name = "Chaplain equipment"
name = JOB_CHAPLAIN + " equipment"
contains = list(
/obj/item/clothing/under/rank/chaplain,
/obj/item/clothing/shoes/black,
@@ -133,7 +133,7 @@
)
cost = 10
containertype = /obj/structure/closet/crate/gilthari
containername = "Chaplain equipment crate"
containername = JOB_CHAPLAIN + " equipment crate"
/datum/supply_pack/misc/hoverpod
name = "Hoverpod Shipment"
@@ -252,7 +252,7 @@
one_access = TRUE
/datum/supply_pack/randomised/misc/explorer_shield
name = "Explorer shield" //CHOMP explo keep
name = JOB_EXPLORER + " shield"
num_contained = 2
contains = list(
/obj/item/weapon/shield/riot/explorer,

View File

@@ -546,7 +546,7 @@
access = access_brig
/datum/supply_pack/security/wardengear
name = "Gear - Warden equipment"
name = "Gear - " + JOB_WARDEN + " equipment"
contains = list(
/obj/item/clothing/suit/storage/vest/warden,
/obj/item/clothing/under/rank/warden,
@@ -571,11 +571,11 @@
)
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Warden equipment"
containername = JOB_WARDEN + " equipment"
access = access_armory
/datum/supply_pack/security/headofsecgear
name = "Gear - Head of security equipment"
name = "Gear - " + JOB_HEAD_OF_SECURITY + " equipment"
contains = list(
/obj/item/clothing/head/helmet/HoS,
/obj/item/clothing/suit/storage/vest/hos,
@@ -598,7 +598,7 @@
)
cost = 50
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Head of security equipment"
containername = JOB_HEAD_OF_SECURITY + " equipment"
access = access_hos
/datum/supply_pack/security/securityclothing

View File

@@ -158,7 +158,7 @@
cost = 15
/datum/supply_pack/explorergear
name="Explorer gear" //CHOMP explo keep
name= JOB_EXPLORER + " gear"
contains = list (
/obj/item/device/cataloguer,
/obj/item/device/geiger,
@@ -180,11 +180,11 @@
)
cost=25
containertype = /obj/structure/closet/crate/secure/xion
containername = "Explorer equipment" //CHOMP explo keep
containername = JOB_EXPLORER + " equipment"
access = access_explorer //CHOMP explo keep
/datum/supply_pack/pilotgear
name= "Pilot gear"
name= JOB_PILOT + " gear"
contains = list (
/obj/item/weapon/storage/backpack/parachute,
/obj/item/device/radio/headset/pilot,
@@ -206,7 +206,7 @@
)
cost=20
containertype = /obj/structure/closet/crate/secure/xion
containername = "Pilot equipment"
containername = JOB_PILOT + " equipment"
access = access_pilot
/datum/supply_pack/supply/foodcubes
@@ -218,7 +218,7 @@
containername = "food cubes"
/datum/supply_pack/pathfindergear
name="Explorer Leader gear" //CHOMPEdit Keep Explo
name= JOB_PATHFINDER + " gear"
contains = list (
/obj/item/device/cataloguer/compact/pathfinder,
/obj/item/device/geiger,
@@ -242,5 +242,5 @@
)
cost = 75
containertype = /obj/structure/closet/crate/secure/xion
containername = "Explorer Leader equipment" //CHOMPEdit Keep Explo
containername = JOB_PATHFINDER + " equipment"
access = list(access_explorer)

View File

@@ -277,7 +277,7 @@
//ChompEdit End
/datum/supply_pack/voidsuits/explorer
name = "Exploration voidsuits" //CHOMP explo keep
name = JOB_EXPLORER + " voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/exploration = 2,
/obj/item/clothing/head/helmet/space/void/exploration = 2,
@@ -287,11 +287,11 @@
)
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = "Exploration voidsuit crate" //CHOMP explo keep
containername = JOB_EXPLORER + "voidsuit crate"
access = access_explorer //CHOMP explo keep
/datum/supply_pack/voidsuits/explorer_medic
name = "Expedition Medic voidsuits" //CHOMP explo keep
name = JOB_FIELD_MEDIC + " voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/exploration = 2,
/obj/item/clothing/head/helmet/space/void/exploration = 2,
@@ -301,11 +301,11 @@
)
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = "Expedition Medic voidsuit crate" //CHOMP explo keep
access = access_explorer //CHOMP explo keep
containername = JOB_FIELD_MEDIC + " voidsuit crate"
access = access_medical
/datum/supply_pack/voidsuits/pilot
name = "Pilot voidsuits"
name = JOB_PILOT + " voidsuits"
contains = list(
/obj/item/clothing/suit/space/void/pilot = 1,
/obj/item/clothing/head/helmet/space/void/pilot = 1,
@@ -315,7 +315,7 @@
)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "Pilot voidsuit crate"
containername = JOB_PILOT + " voidsuit crate"
access = access_pilot
// Surplus!

View File

@@ -48,7 +48,7 @@
var/landmark_id // Spawn point identifier.
var/mob_path = /mob/living/carbon/human // Mobtype this antag will use if none is provided.
var/feedback_tag = "traitor_objective" // End of round
var/bantype = "Syndicate" // Ban to check when spawning this antag.
var/bantype = JOB_SYNDICATE // Ban to check when spawning this antag.
var/minimum_player_age = 7 // Players need to be at least minimum_player_age days old before they are eligable for auto-spawning
var/suspicion_chance = 50 // Prob of being on the initial Command report
var/flags = 0 // Various runtime options.

View File

@@ -6,7 +6,7 @@ var/datum/antagonist/mutineer/mutineers
role_text_plural = "Mutineers"
id = MODE_MUTINEER
antag_indicator = "mutineer"
restricted_jobs = list("Site Manager")
restricted_jobs = list(JOB_SITE_MANAGER)
/datum/antagonist/mutineer/New(var/no_reference)
..()
@@ -39,7 +39,7 @@ var/datum/antagonist/mutineer/mutineers
proc/get_head_loyalist_candidates()
var/list/candidates[0]
for(var/mob/loyalist in player_list)
if(loyalist.mind && loyalist.mind.assigned_role == "Site Manager")
if(loyalist.mind && loyalist.mind.assigned_role == JOB_SITE_MANAGER)
candidates.Add(loyalist.mind)
return candidates
@@ -47,7 +47,7 @@ var/datum/antagonist/mutineer/mutineers
var/list/candidates[0]
for(var/mob/mutineer in player_list)
if(mutineer.client.prefs.be_special & BE_MUTINEER)
for(var/job in command_positions - "Site Manager")
for(var/job in command_positions - JOB_SITE_MANAGER)
if(mutineer.mind && mutineer.mind.assigned_role == job)
candidates.Add(mutineer.mind)
return candidates

View File

@@ -2,7 +2,7 @@ var/datum/antagonist/ert/ert
/datum/antagonist/ert
id = MODE_ERT
bantype = "Emergency Response Team"
bantype = JOB_EMERGENCY_RESPONSE_TEAM
role_type = BE_OPERATIVE
role_text = "Emergency Responder"
role_text_plural = "Emergency Responders"
@@ -14,7 +14,7 @@ var/datum/antagonist/ert/ert
and before taking extreme actions, please try to also contact the administration! \
Think through your actions and make the roleplay immersive! <b>Please remember all \
rules aside from those without explicit exceptions apply to the ERT.</b>"
leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Site Manager where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the Site Manager where possible, however."
leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the " + JOB_SITE_MANAGER + " where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the " + JOB_SITE_MANAGER + " where possible, however."
landmark_id = "Response Team"
id_type = /obj/item/weapon/card/id/centcom/ERT

View File

@@ -161,7 +161,7 @@ var/datum/antagonist/ninja/ninjas
var/xenorace = pick(SPECIES_UNATHI, SPECIES_TAJ, SPECIES_SKRELL)
directive += "A group of [xenorace] radicals have been loyal supporters of the Spider Clan. Favor [xenorace] crew whenever possible."
if(15)
directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the Chaplain and prove these accusations false."
directive += "The Spider Clan has recently been accused of religious insensitivity. Attempt to speak with the " + JOB_CHAPLAIN + " and prove these accusations false."
if(16)
directive += "The Spider Clan has been bargaining with a competing prosthetics manufacturer. Try to shine [using_map.company_name] prosthetics in a bad light."
if(17)

View File

@@ -227,9 +227,9 @@ var/datum/antagonist/raider/raiders
player.equip_to_slot_or_del(new new_suit(player),slot_wear_suit)
equip_weapons(player)
var/obj/item/weapon/card/id/id = create_id("Visitor", player, equip = 0)
var/obj/item/weapon/card/id/id = create_id(JOB_ALT_VISITOR, player, equip = 0)
id.name = "[player.real_name]'s Passport"
id.assignment = "Visitor"
id.assignment = JOB_ALT_VISITOR
var/obj/item/weapon/storage/wallet/W = new(player)
W.handle_item_insertion(id)
player.equip_to_slot_or_del(W, slot_wear_id)

View File

@@ -5,8 +5,8 @@ var/datum/antagonist/technomancer/technomancers
role_type = BE_WIZARD
role_text = "Technomancer"
role_text_plural = "Technomancers"
bantype = "wizard"
landmark_id = "wizard"
bantype = JOB_WIZARD
landmark_id = JOB_WIZARD
welcome_text = "You will need to purchase <b>functions</b> and perhaps some <b>equipment</b> from the various machines around your \
base. Choose your technological arsenal carefully. Remember that without the <b>core</b> on your back, your functions are \
powerless, and therefore you will be as well.<br>\

View File

@@ -5,8 +5,8 @@ var/datum/antagonist/wizard/wizards
role_type = BE_WIZARD
role_text = "Space Wizard"
role_text_plural = "Space Wizards"
bantype = "wizard"
landmark_id = "wizard"
bantype = JOB_WIZARD
landmark_id = JOB_WIZARD
welcome_text = "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.<br>In your pockets you will find a teleport scroll. Use it as needed."
flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE
antaghud_indicator = "hudwizard"

View File

@@ -6,7 +6,7 @@
bantype = "changeling"
feedback_tag = "changeling_objective"
avoid_silicons = TRUE
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Site Manager")
protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER)
welcome_text = "Use say \"#g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them."
antag_sound = 'sound/effects/antag_notice/ling_alert.ogg'
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE

View File

@@ -11,10 +11,10 @@ var/datum/antagonist/cultist/cult
role_text = "Cultist"
role_text_plural = "Cultists"
bantype = "cultist"
restricted_jobs = list("Chaplain")
restricted_jobs = list(JOB_CHAPLAIN)
avoid_silicons = TRUE
protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager")
roundstart_restricted = list("Internal Affairs Agent", "Head of Security", "Site Manager")
protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_INTERNAL_AFFAIRS_AGENT, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER)
roundstart_restricted = list(JOB_INTERNAL_AFFAIRS_AGENT, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER)
role_type = BE_CULTIST
feedback_tag = "cult_objective"
antag_indicator = "cult"

View File

@@ -11,7 +11,7 @@ var/datum/antagonist/traitor/infiltrator/infiltrators
role_text = "Infiltrator"
role_text_plural = "Infiltrators"
welcome_text = "To speak on your team's private channel, use :t."
protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager")
protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_INTERNAL_AFFAIRS_AGENT, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER)
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
can_speak_aooc = TRUE

View File

@@ -30,8 +30,8 @@ var/datum/antagonist/revolutionary/revs
faction_invisible = 1
avoid_silicons = TRUE
protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Site Manager", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
roundstart_restricted = list("Internal Affairs Agent", "Site Manager", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_INTERNAL_AFFAIRS_AGENT, JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER)
roundstart_restricted = list(JOB_INTERNAL_AFFAIRS_AGENT, JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER)
/datum/antagonist/revolutionary/New()
..()

View File

@@ -26,7 +26,7 @@ var/datum/antagonist/rogue_ai/malf
/datum/antagonist/rogue_ai/get_candidates()
..()
for(var/datum/mind/player in candidates)
if(player.assigned_role && player.assigned_role != "AI")
if(player.assigned_role && player.assigned_role != JOB_AI)
candidates -= player
if(!candidates.len)
return list()
@@ -101,4 +101,3 @@ var/datum/antagonist/rogue_ai/malf
if (newname)
player.SetName(newname)
if(player.mind) player.mind.name = player.name

View File

@@ -4,7 +4,7 @@ var/datum/antagonist/traitor/traitors
/datum/antagonist/traitor
id = MODE_TRAITOR
antag_sound = 'sound/effects/antag_notice/traitor_alert.ogg'
protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager")
protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_INTERNAL_AFFAIRS_AGENT, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER)
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
can_speak_aooc = FALSE // If they want to plot and plan as this sort of traitor, they'll need to do it ICly.

View File

@@ -166,7 +166,7 @@ var/list/sacrificed = list()
if(!waiting_for_input[target]) //so we don't spam them with dialogs if they hesitate
waiting_for_input[target] = 1
if(!cult.can_become_antag(target.mind) || jobban_isbanned(target, "cultist"))//putting jobban check here because is_convertable uses mind as argument
if(!cult.can_become_antag(target.mind) || jobban_isbanned(target, JOB_CULTIST))//putting jobban check here because is_convertable uses mind as argument
//waiting_for_input ensures this is only shown once, so they basically auto-resist from here on out. They still need to find a way to get off the freaking rune if they don't want to burn to death, though.
to_chat(target, "<span class='cult'>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.</span>")
to_chat(target, "<span class='danger'>And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.</span>")
@@ -351,7 +351,7 @@ var/list/sacrificed = list()
to_chat(usr, "<span class='warning'>The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.</span>")
return fizzle()
if(!cult.can_become_antag(corpse_to_raise.mind) || jobban_isbanned(corpse_to_raise, "cultist"))
if(!cult.can_become_antag(corpse_to_raise.mind) || jobban_isbanned(corpse_to_raise, JOB_CULTIST))
to_chat(usr, "<span class='warning'>The Geometer of Blood refuses to touch this one.</span>")
return fizzle()
else if(!corpse_to_raise.client && corpse_to_raise.mind) //Don't force the dead person to come back if they don't want to.
@@ -459,7 +459,7 @@ var/list/sacrificed = list()
break
if(!ghost)
return this_rune.fizzle()
if(jobban_isbanned(ghost, "cultist"))
if(jobban_isbanned(ghost, JOB_CULTIST))
return this_rune.fizzle()
usr.say("Gal'h'rfikk harfrandid mud[pick("'","`")]gib!")

View File

@@ -24,7 +24,7 @@
return ..()
if(istype(M, /mob/living/carbon/human/dummy))
return..()
if(jobban_isbanned(M, "cultist"))
if(jobban_isbanned(M, JOB_CULTIST))
to_chat(user, "<span class='warning'>This person's soul is too corrupt and cannot be captured!</span>")
return..()

View File

@@ -17,7 +17,7 @@
/datum/game_mode/epidemic/pre_setup()
doctors = 0
for(var/mob/new_player/player in world)
if(player.mind.assigned_role in list("Chief Medical Officer","Medical Doctor"))
if(player.mind.assigned_role in list(JOB_CHIEF_MEDICAL_OFFICER ,JOB_MEDICAL_DOCTOR))
doctors++
break

View File

@@ -9,5 +9,5 @@
end_on_antag_death = 0
auto_recall_shuttle = 0
antag_tags = list(MODE_MALFUNCTION)
disabled_jobs = list("AI")
disabled_jobs = list(JOB_AI)
votable = 0

View File

@@ -7,7 +7,7 @@
config_tag = "meme"
required_players = 3
required_players_secret = 10
restricted_jobs = list("AI", "Cyborg")
restricted_jobs = list(JOB_AI, JOB_CYBORG)
recommended_enemies = 2 // need at least a meme and a host
votable = 0 // temporarily disable this mode for voting
end_on_antag_death = 1
@@ -66,8 +66,8 @@
// so that we can later know which host belongs to which meme
assigned_hosts[meme.key] = first_host
meme.assigned_role = "MODE" //So they aren't chosen for other jobs.
meme.special_role = "Meme"
meme.assigned_role = JOB_MODE //So they aren't chosen for other jobs.
meme.special_role = JOB_MEME
return 1

View File

@@ -150,7 +150,7 @@ var/global/list/all_objectives = list()
if(!istype(I)) return 1
if(I.assignment == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
if(I.assignment == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
return 1
else
return 0
@@ -638,7 +638,7 @@ var/global/list/all_objectives = list()
return
/datum/objective/heist/kidnap/choose_target()
var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Engineer")
var/list/roles = list(JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST,JOB_CHEMIST,JOB_ENGINEER)
var/list/possible_targets = list()
var/list/priority_targets = list()

View File

@@ -39,7 +39,7 @@
/obj/item/weapon/spell/summon/summon_creature/on_summon(var/mob/living/simple_mob/summoned)
if(check_for_scepter())
// summoned.faction = "technomancer"
// summoned.faction = FACTION_TECHNOMANCER
summoned.friends += owner
// Makes their new pal big and strong, if they have spell power.

View File

@@ -1,8 +1,8 @@
/datum/game_mode/wizard
name = "Wizard"
name = JOB_WIZARD
round_description = "There is a SPACE WIZARD on the station. You can't let the magician achieve their objectives!"
extended_round_description = "A powerful entity capable of manipulating the elements around him, most commonly referred to as a 'wizard', has infiltrated the station. They have a wide variety of powers and spells available to them that makes your own simple moral self tremble with fear and excitement. Ultimately, their purpose is unknown. However, it is up to you and your crew to decide if their powers can be used for good or if their arrival foreshadows the destruction of the entire station."
config_tag = "wizard"
config_tag = JOB_WIZARD
votable = 0
required_players = 1
required_players_secret = 3

View File

@@ -127,7 +127,7 @@
/var/const/access_captain = 20
/datum/access/captain
id = access_captain
desc = "Site Manager"
desc = JOB_SITE_MANAGER
region = ACCESS_REGION_COMMAND
/var/const/access_all_personal_lockers = 21
@@ -187,7 +187,7 @@
/var/const/access_rd = 30
/datum/access/rd
id = access_rd
desc = "Research Director"
desc = JOB_RESEARCH_DIRECTOR
region = ACCESS_REGION_RESEARCH
/var/const/access_cargo = 31
@@ -247,13 +247,13 @@
/var/const/access_cmo = 40
/datum/access/cmo
id = access_cmo
desc = "Chief Medical Officer"
desc = JOB_CHIEF_MEDICAL_OFFICER
region = ACCESS_REGION_COMMAND
/var/const/access_qm = 41
/datum/access/qm
id = access_qm
desc = "Quartermaster"
desc = JOB_QUARTERMASTER
region = ACCESS_REGION_SUPPLY
/var/const/access_network = 42
@@ -262,16 +262,16 @@
desc = "Station Network"
region = ACCESS_REGION_RESEARCH
var/const/access_explorer = 43 //CHOMP explo keep
/datum/access/explorer //CHOMP explo keep
id = access_explorer //CHOMP explo keep
desc = "Explorer" //CHOMP explo keep
var/const/access_explorer = 43
/datum/access/explorer
id = access_explorer
desc = JOB_EXPLORER
region = ACCESS_REGION_GENERAL
//CHOMP explo keep removed a wide comment field on this line
/var/const/access_pathfinder = 44
/datum/access/pathfinder
id = access_pathfinder
desc = "Pathfinder"
desc = JOB_PATHFINDER
region = ACCESS_REGION_GENERAL
//CHOMP explo keep removed the closing wide comment field on this line. KEEP THE PATHFINDER
@@ -331,19 +331,19 @@ var/const/access_explorer = 43 //CHOMP explo keep
/var/const/access_ce = 56
/datum/access/ce
id = access_ce
desc = "Chief Engineer"
desc = JOB_CHIEF_ENGINEER
region = ACCESS_REGION_ENGINEERING
/var/const/access_hop = 57
/datum/access/hop
id = access_hop
desc = "Head of Personnel"
desc = JOB_HEAD_OF_PERSONNEL
region = ACCESS_REGION_COMMAND
/var/const/access_hos = 58
/datum/access/hos
id = access_hos
desc = "Head of Security"
desc = JOB_HEAD_OF_SECURITY
region = ACCESS_REGION_SECURITY
/var/const/access_RC_announce = 59 //Request console announcements
@@ -379,7 +379,7 @@ var/const/access_explorer = 43 //CHOMP explo keep
/var/const/access_psychiatrist = 64 // Psychiatrist's office
/datum/access/psychiatrist
id = access_psychiatrist
desc = "Psychiatrist's Office"
desc = JOB_PSYCHIATRIST + "'s Office"
region = ACCESS_REGION_MEDBAY
/var/const/access_xenoarch = 65
@@ -397,7 +397,7 @@ var/const/access_explorer = 43 //CHOMP explo keep
var/const/access_pilot = 67
/datum/access/pilot
id = access_pilot
desc = "Pilot"
desc = JOB_PILOT
region = ACCESS_REGION_GENERAL
/var/const/access_entertainment = 72
@@ -430,7 +430,7 @@ var/const/access_pilot = 67
/var/const/access_cent_specops = 103//Special Ops.
/datum/access/cent_specops
id = access_cent_specops
desc = "Emergency Response Team Prep"
desc = JOB_EMERGENCY_RESPONSE_TEAM + " Prep"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_medical = 104//Medical/Research
@@ -460,7 +460,7 @@ var/const/access_pilot = 67
/var/const/access_cent_creed = 108//Creed's office.
/datum/access/cent_creed
id = access_cent_creed
desc = "Emergency Response Team Administration"
desc = JOB_EMERGENCY_RESPONSE_TEAM + " Administration"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_captain = 109//Captain's office/ID comp/AI.
@@ -472,7 +472,7 @@ var/const/access_pilot = 67
/var/const/access_clown = 136
/datum/access/clown
id = access_clown
desc = "Clown Office"
desc = JOB_CLOWN + " Office"
region = ACCESS_REGION_GENERAL
/var/const/access_tomfoolery = 137
@@ -484,7 +484,7 @@ var/const/access_pilot = 67
/var/const/access_mime = 138
/datum/access/mime
id = access_mime
desc = "Mime Office"
desc = JOB_MIME + " Office"
region = ACCESS_REGION_GENERAL
/***************

View File

@@ -1,13 +1,13 @@
/var/const/access_secpilot = 51
/datum/access/secpilot
id = access_secpilot
desc = "Security Pilot Access"
desc = JOB_SECURITY_PILOT + " Access"
region = ACCESS_REGION_SECURITY
/var/const/access_blueshield = 52
/datum/access/blueshield
id = access_blueshield
desc = "Blueshield Guard"
desc = JOB_BLUESHIELD_GUARD
region = ACCESS_REGION_COMMAND
//special restricted access level, required for the secret locker and crates
@@ -16,17 +16,17 @@
/datum/access/blueshield_exclusive
id = access_blueshield_exclusive
desc = "Blueshield Special Reserve"
access_type = ACCESS_TYPE_CENTCOM
access_type = ACCESS_TYPE_CENTCOM
//that last line is what makes it inaccessible: you can add a region but that only makes it appear in the list, and if it has this access_type not even a CD's ID can add/remove it
var/const/access_fieldmedic = 68
/datum/access/fieldmedic
id = access_fieldmedic
desc = "Field Medic"
desc = JOB_FIELD_MEDIC
region = ACCESS_REGION_MEDBAY
var/const/access_pathfinder = 69
/datum/access/pathfinder
id = access_pathfinder
desc = "Pathfinder"
region = ACCESS_REGION_RESEARCH
desc = JOB_PATHFINDER
region = ACCESS_REGION_RESEARCH

View File

@@ -2,12 +2,12 @@
// Assistant
//////////////////////////////////
/datum/job/assistant
title = "Assistant"
title = JOB_ALT_ASSISTANT
flag = ASSISTANT
departments = list(DEPARTMENT_CIVILIAN)
sorting_order = -1
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = -1
spawn_positions = -1
supervisors = "absolutely everyone"
@@ -18,9 +18,9 @@
outfit_type = /decl/hierarchy/outfit/job/assistant
job_description = "An Assistant does whatever is requested of them. Though they are part of the crew, they have no real authority."
/* alt_titles = list("Technical Assistant" = /datum/alt_title/tech_assist,
"Medical Intern"= /datum/alt_title/med_intern, "Research Assistant" = /datum/alt_title/research_assist,
"Visitor" = /datum/alt_title/visitor)
/* alt_titles = list(JOB_ALT_TECHNICAL_ASSISTANT = /datum/alt_title/tech_assist,
JOB_ALT_MEDICAL_INTERN= /datum/alt_title/med_intern, JOB_ALT_RESEARCH_ASSISTANT = /datum/alt_title/research_assist,
JOB_ALT_VISITOR = /datum/alt_title/visitor)
) */ //VOREStation Removal: no alt-titles for visitors
/datum/job/assistant/get_access()
@@ -31,29 +31,29 @@
// Assistant Alt Titles
/datum/alt_title/tech_assist
title = "Technical Assistant"
title_blurb = "A Technical Assistant attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \
often in training to become an Engineer. A Technical Assistant has no real authority."
title = JOB_ALT_TECHNICAL_ASSISTANT
title_blurb = "A " + JOB_ALT_TECHNICAL_ASSISTANT + " attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \
often in training to become an " + JOB_ENGINEER + ". A " + JOB_ALT_TECHNICAL_ASSISTANT + " has no real authority."
/datum/alt_title/med_intern
title = "Medical Intern"
title_blurb = "A Medical Intern attempts to provide whatever the Medical department needs. They are frequently asked to pay attention to \
the suit sensors console. A Medical Intern has no real authority."
title = JOB_ALT_MEDICAL_INTERN
title_blurb = "A " + JOB_ALT_MEDICAL_INTERN + " attempts to provide whatever the Medical department needs. They are frequently asked to pay attention to \
the suit sensors console. A " + JOB_ALT_MEDICAL_INTERN + " has no real authority."
/datum/alt_title/research_assist
title = "Research Assistant"
title_blurb = "A Research Assistant attempts to assist anyone working in the Research department. They are expected to follow the instruction \
of proper Research staff, as it is frequently a matter of safety. A Research Assistant has no real authority."
title = JOB_ALT_RESEARCH_ASSISTANT
title_blurb = "A " + JOB_ALT_RESEARCH_ASSISTANT + " attempts to assist anyone working in the Research department. They are expected to follow the instruction \
of proper Research staff, as it is frequently a matter of safety. A " + JOB_ALT_RESEARCH_ASSISTANT + " has no real authority."
/datum/alt_title/visitor
title = "Visitor"
title_blurb = "A Visitor is anyone who has arrived on the station but does not have a specific job to do. Many off-duty crewmembers \
title = JOB_ALT_VISITOR
title_blurb = "A " + JOB_ALT_VISITOR + " is anyone who has arrived on the station but does not have a specific job to do. Many off-duty crewmembers \
who care to make use of the station's facilities arrive as Visitors. Properly registered Vistors are considered \
to be part of the crew for most if not all purposes, but they have no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/visitor
/datum/alt_title/resident // Just in case it makes a comeback
title = "Resident"
title_blurb = "A Resident is an individual who resides on the station, frequently in a different part of the station than what is seen. \
title = JOB_ALT_RESIDENT
title_blurb = "A " + JOB_ALT_RESIDENT + " is an individual who resides on the station, frequently in a different part of the station than what is seen. \
They are considered to be part of the crew for most purposes, but have no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/resident

View File

@@ -3,11 +3,11 @@
//////////////////////////////////
/datum/job/intern
title = "Intern"
title = JOB_INTERN
flag = INTERN
departments = list(DEPARTMENT_CIVILIAN)
department_flag = ENGSEC // Ran out of bits
faction = "Station"
faction = FACTION_STATION
total_positions = -1
spawn_positions = -1
supervisors = "the staff from the department you're interning in"
@@ -16,63 +16,63 @@
access = list() //See /datum/job/intern/get_access()
minimal_access = list() //See /datum/job/intern/get_access()
outfit_type = /decl/hierarchy/outfit/job/assistant/intern
alt_titles = list("Apprentice Engineer" = /datum/alt_title/intern_eng,
"Medical Intern" = /datum/alt_title/intern_med,
"Lab Assistant" = /datum/alt_title/intern_sci, //CHOMPEdit
"Security Cadet" = /datum/alt_title/intern_sec,
"Jr. Cargo Tech" = /datum/alt_title/intern_crg,
"Jr. Explorer" = /datum/alt_title/intern_exp, //CHOMP Explo keep
"Server" = /datum/alt_title/server,
"Assistant" = /datum/alt_title/assistant)
job_description = "An Intern does whatever is requested of them, often doing so in process of learning \
alt_titles = list(JOB_ALT_APPRENTICE_ENGINEER = /datum/alt_title/intern_eng,
JOB_ALT_MEDICAL_INTERN = /datum/alt_title/intern_med,
JOB_ALT_LAB_ASSISTANT = /datum/alt_title/intern_sci, //CHOMPEdit
JOB_ALT_SECURITY_CADET = /datum/alt_title/intern_sec,
JOB_ALT_JR_CARGO_TECH = /datum/alt_title/intern_crg,
JOB_ALT_JR_EXPLORER = /datum/alt_title/intern_exp, //CHOMP Explo keep
JOB_ALT_SERVER = /datum/alt_title/server,
JOB_ALT_ASSISTANT = /datum/alt_title/assistant)
job_description = "An " + JOB_INTERN + " does whatever is requested of them, often doing so in process of learning \
another job. Though they are part of the crew, they have no real authority."
timeoff_factor = 0 // Interns, noh
requestable = FALSE
/datum/alt_title/intern_eng
title = "Apprentice Engineer"
title_blurb = "An Apprentice Engineer attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \
often in training to become an Engineer. An Apprentice Engineer has no real authority."
title = JOB_ALT_APPRENTICE_ENGINEER
title_blurb = "An " + JOB_ALT_APPRENTICE_ENGINEER + " attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \
often in training to become an Engineer. An " + JOB_ALT_APPRENTICE_ENGINEER + " has no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/engineer
/datum/alt_title/intern_med
title = "Medical Intern"
title_blurb = "A Medical Intern attempts to provide whatever the Medical department needs. They are not proper Doctors, and are \
often in training to become a Doctor. A Medical Intern has no real authority."
title = JOB_ALT_MEDICAL_INTERN
title_blurb = "A " + JOB_ALT_MEDICAL_INTERN + " attempts to provide whatever the Medical department needs. They are not proper Doctors, and are \
often in training to become a Doctor. A " + JOB_ALT_MEDICAL_INTERN + " has no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/medic
/datum/alt_title/intern_sci
title = "Lab Assistant" //CHOMPEdit
title_blurb = "A Lab Assistant attempts to provide whatever the Research department needs. They are not proper Scientists, and are \
often in training to become a Scientist. A Lab Assistant has no real authority." //CHOMPEdit
title = JOB_ALT_LAB_ASSISTANT //CHOMPEdit
title_blurb = "A " + JOB_ALT_LAB_ASSISTANT + " attempts to provide whatever the Research department needs. They are not proper " + JOB_SCIENTIST + "s, and are \
often in training to become a " + JOB_SCIENTIST + ". A " + JOB_ALT_LAB_ASSISTANT + " has no real authority." //CHOMPEdit
title_outfit = /decl/hierarchy/outfit/job/assistant/scientist
/datum/alt_title/intern_sec
title = "Security Cadet"
title_blurb = "A Security Cadet attempts to provide whatever the Security department needs. They are not proper Officers, and are \
often in training to become an Officer. A Security Cadet has no real authority."
title = JOB_ALT_SECURITY_CADET
title_blurb = "A " + JOB_ALT_SECURITY_CADET + " attempts to provide whatever the Security department needs. They are not proper Officers, and are \
often in training to become an Officer. A " + JOB_ALT_SECURITY_CADET + " has no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/officer
/datum/alt_title/intern_crg
title = "Jr. Cargo Tech"
title_blurb = "A Jr. Cargo Tech attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \
often in training to become a Cargo Technician. A Jr. Cargo Tech has no real authority."
title = JOB_ALT_JR_CARGO_TECH
title_blurb = "A " + JOB_ALT_JR_CARGO_TECH + " attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \
often in training to become a " + JOB_CARGO_TECHNICIAN + ". A " + JOB_ALT_JR_CARGO_TECH + " has no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/cargo
//CHOMP explo keep removed a wide comment field here
/datum/alt_title/intern_exp
title = "Jr. Explorer"
title_blurb = "A Jr. Explorer attempts to provide whatever the Exploration department needs. They are not proper Explorers, and are \
often in training to become an Explorer. A Jr. Explorer has no real authority."
title = "Jr. " + JOB_EXPLORER + ""
title_blurb = "A Jr. " + JOB_EXPLORER + " attempts to provide whatever the Exploration department needs. They are not proper " + JOB_EXPLORER + "s, and are \
often in training to become an " + JOB_EXPLORER + ". A Jr. " + JOB_EXPLORER + " has no real authority."
title_outfit = /decl/hierarchy/outfit/job/assistant/explorer
//CHOMP explo keep removed the end of the wide comment field here
/datum/alt_title/server
title = "Server"
title_blurb = "A Server helps out kitchen and diner staff with various tasks, primarily food delivery. A Server has no real authority."
title = JOB_ALT_SERVER
title_blurb = "A " + JOB_ALT_SERVER + " helps out kitchen and diner staff with various tasks, primarily food delivery. A " + JOB_ALT_SERVER + " has no real authority."
title_outfit = /decl/hierarchy/outfit/job/service/server
/datum/alt_title/assistant
title = "Assistant"
title_blurb = "An assistant helps out wherever they might be needed. They have no authority, but can volunteer to help if help is needed."
title = JOB_ALT_ASSISTANT
title_blurb = "An " + JOB_ALT_ASSISTANT + " helps out wherever they might be needed. They have no authority, but can volunteer to help if help is needed."
title_outfit = /decl/hierarchy/outfit/job/service/server
/datum/job/intern/New()
@@ -93,9 +93,9 @@
//////////////////////////////////
/datum/job/assistant // Visitor
title = USELESS_JOB
title = JOB_ALT_VISITOR
supervisors = "nobody! You don't work here"
job_description = "A Visitor is just there to visit the place. They have no real authority or responsibility."
job_description = "A " + JOB_ALT_VISITOR + " is just there to visit the place. They have no real authority or responsibility."
timeoff_factor = 0
requestable = FALSE
alt_titles = list("Guest" = /datum/alt_title/guest, "Traveler" = /datum/alt_title/traveler)

View File

@@ -1,12 +1,12 @@
/datum/job/blueshield
title = "Blueshield Guard"
title = JOB_BLUESHIELD_GUARD
flag = BLUESHIELD //this may be used later.
departments = list(DEPARTMENT_COMMAND)
department_flag = ENGSEC
faction = "Station"
total_positions = 1
spawn_positions = 1
supervisors = "the Colony Director and Central Command" //Reports directly to CD, or failing that, CC
supervisors = "the " + JOB_ALT_COLONY_DIRECTOR + " and Central Command" //Reports directly to CD, or failing that, CC
selection_color = "#006cb3"
req_admin_notify = 1
minimum_character_age = 25
@@ -25,4 +25,4 @@
/datum/job/blueshield/equip(var/mob/living/carbon/human/H)
. = ..()
if(.)
H.implant_loyalty(src)
H.implant_loyalty(src)

View File

@@ -5,13 +5,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
//////////////////////////////////
/datum/job/captain
title = "Site Manager"
title = JOB_SITE_MANAGER
flag = CAPTAIN
departments = list(DEPARTMENT_COMMAND)
sorting_order = 3 // Above everyone.
departments_managed = list(DEPARTMENT_COMMAND)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "company officials and Corporate Regulations"
@@ -25,14 +25,14 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
minimum_character_age = 25
min_age_by_species = list(SPECIES_HUMAN_VATBORN = 14)
ideal_character_age = 70 // Old geezer captains ftw
ideal_age_by_species = list(SPECIES_HUMAN_VATBORN = 55) /// Vatborn live shorter, no other race eligible for captain besides human/skrell
ideal_age_by_species = list(SPECIES_HUMAN_VATBORN = 55) /// Vatborn live shorter, no other race eligible for captain besides human/skrell
banned_job_species = list(SPECIES_UNATHI, SPECIES_TAJ, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "mechanical", "digital")
outfit_type = /decl/hierarchy/outfit/job/captain
job_description = "The Site Manager manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \
they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The Site Manager is expected to \
job_description = "The " + JOB_SITE_MANAGER + " manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \
they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The " + JOB_SITE_MANAGER + " is expected to \
have an understanding of Standard Operating Procedure, and is subject to it, and legal action, in the same way as every other crew member."
alt_titles = list("Overseer"= /datum/alt_title/overseer,"Colony Director"= /datum/alt_title/colonydirector) //CHOMPEdit
alt_titles = list(JOB_ALT_OVERSEER= /datum/alt_title/overseer,JOB_ALT_COLONY_DIRECTOR= /datum/alt_title/colonydirector) //CHOMPEdit
/*
@@ -48,23 +48,25 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
// Captain Alt Titles
/datum/alt_title/overseer
title = "Overseer"
title = JOB_ALT_OVERSEER
/datum/alt_title/colonydirector //CHOMPEdit
title = "Colony Director" //CHOMPEdit
title = JOB_ALT_COLONY_DIRECTOR //CHOMPEdit
//////////////////////////////////
// Head of Personnel
//////////////////////////////////
/datum/job/hop
title = "Head of Personnel"
title = JOB_HEAD_OF_PERSONNEL
flag = HOP
departments = list(DEPARTMENT_COMMAND, DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO)
sorting_order = 2 // Above the QM, below captain.
departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Site Manager"
supervisors = "the " + JOB_SITE_MANAGER
selection_color = "#1D1D4F"
req_admin_notify = 1
minimal_player_age = 10
@@ -77,10 +79,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital", SPECIES_DIONA)
outfit_type = /decl/hierarchy/outfit/job/hop
job_description = "The Head of Personnel manages the Service department and most other civilians. They also \
manage the Supply department, through the Quartermaster. In addition, the Head of Personnel oversees the personal accounts \
of the crew, including their money and access. If necessary, the Head of Personnel is first in line to assume Acting Command." //YW EDIT
alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro)
job_description = "The " + JOB_HEAD_OF_PERSONNEL + " manages the Service department and most other civilians. They also \
manage the Supply department, through the " + JOB_QUARTERMASTER + ". In addition, the " + JOB_HEAD_OF_PERSONNEL + " oversees the personal accounts \
of the crew, including their money and access. If necessary, the " + JOB_HEAD_OF_PERSONNEL + " is first in line to assume Acting Command." //YW EDIT
alt_titles = list(JOB_ALT_CREW_RESOURCE_OFFICER = /datum/alt_title/cro)
access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
@@ -97,19 +99,19 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
// HOP Alt Titles
/datum/alt_title/cro
title = "Crew Resources Officer"
title = JOB_ALT_CREW_RESOURCE_OFFICER
//////////////////////////////////
// Command Secretary
//////////////////////////////////
/datum/job/secretary
title = "Command Secretary"
title = JOB_COMMAND_SECRETARY
flag = BRIDGE
departments = list(DEPARTMENT_COMMAND)
department_accounts = list(DEPARTMENT_COMMAND)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "command staff"
@@ -121,6 +123,5 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
minimal_access = list(access_heads, access_keycard_auth, access_RC_announce)//YAWN EDIT
outfit_type = /decl/hierarchy/outfit/job/secretary
job_description = "A Command Secretary handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \
job_description = "A " + JOB_COMMAND_SECRETARY + " handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \
They are not Heads of Staff, and have no real authority."

View File

@@ -2,17 +2,17 @@
disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN
dept_time_required = 80 //Pending something more complicated
alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor,
"Captain" = /datum/alt_title/captain)
alt_titles = list(JOB_ALT_OVERSEER= /datum/alt_title/overseer, JOB_ALT_FACILITY_DIRECTOR = /datum/alt_title/facility_director, JOB_ALT_CHIEF_SUPERVISOR = /datum/alt_title/chief_supervisor,
JOB_ALT_CAPTAIN = /datum/alt_title/captain)
/datum/alt_title/facility_director
title = "Facility Director"
title = JOB_ALT_FACILITY_DIRECTOR
/datum/alt_title/chief_supervisor
title = "Chief Supervisor"
title = JOB_ALT_CHIEF_SUPERVISOR
/datum/alt_title/captain
title = "Captain"
title = JOB_ALT_CAPTAIN
/datum/job/captain/get_request_reasons()
return list("Training crew", "Assembling expedition team")
@@ -24,9 +24,9 @@
departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET)
dept_time_required = 60
alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Director" = /datum/alt_title/deputy_director, "Staff Manager" = /datum/alt_title/staff_manager,
"Facility Steward" = /datum/alt_title/facility_steward //CHOMPEdit
, "Performance Management Supervisor" = /datum/alt_title/performance_management_supervisor) //CHOMPEdit
alt_titles = list(JOB_ALT_CREW_RESOURCE_OFFICER = /datum/alt_title/cro, JOB_ALT_DEPUTY_MANAGER = /datum/alt_title/deputy_manager, JOB_ALT_STAFF_MANAGER = /datum/alt_title/staff_manager,
JOB_ALT_FACILITY_STEWARD = /datum/alt_title/facility_steward, JOB_ALT_FIRST_MATE = /datum/alt_title/first_mate //CHOMPEdit
, JOB_ALT_PERFORMANCE_MANAGEMENT_SUPERVISOR = /datum/alt_title/performance_management_supervisor) //CHOMPEdit
access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
@@ -41,16 +41,22 @@
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway, access_entertainment)
/datum/alt_title/deputy_director
title = "Deputy Director"
/datum/alt_title/deputy_manager
title = JOB_ALT_DEPUTY_MANAGER
/datum/alt_title/staff_manager
title = "Staff Manager"
title = JOB_ALT_STAFF_MANAGER
/datum/alt_title/facility_steward
title = "Facility Steward"
title = JOB_ALT_FACILITY_STEWARD
/datum/alt_title/first_mate
title = JOB_ALT_FIRST_MATE
//CHOMPEDIT START: More Alt titles
/datum/alt_title/performance_management_supervisor
title = JOB_ALT_PERFORMANCE_MANAGEMENT_SUPERVISOR //This one can be somewhat seen as an analogue to the captains "Chief Supervisor" role
//CHOMPEDIT END
/datum/job/hop/get_request_reasons()
return list("ID modification", "Training crew", "Assembling expedition team")
@@ -59,27 +65,22 @@
/datum/job/secretary
disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN
alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern,
"Bridge Secretary" = /datum/alt_title/bridge_secretary, "Bridge Assistant" = /datum/alt_title/bridge_assistant,
"Bridge Officer" = /datum/alt_title/bridge_officer //ChompEDIT add bridge officer
alt_titles = list(JOB_ALT_COMMAND_LIAISON = /datum/alt_title/command_liaison, JOB_ALT_COMMAND_ASSISTANT = /datum/alt_title/command_assistant, JOB_ALT_COMMAND_INTERN = /datum/alt_title/command_intern,
JOB_ALT_BRIDGE_SECRETARY = /datum/alt_title/bridge_secretary, JOB_ALT_BRIDGE_ASSISTANT = /datum/alt_title/bridge_assistant,
JOB_ALT_BRIDGE_OFFICER = /datum/alt_title/bridge_officer //ChompEDIT add bridge officer
)
/datum/alt_title/command_liaison
title = "Command Liaison"
title = JOB_ALT_COMMAND_LIAISON
/datum/alt_title/command_assistant
title = "Command Assistant"
title = JOB_ALT_COMMAND_ASSISTANT
/datum/alt_title/command_intern
title = "Command Intern"
title = JOB_ALT_COMMAND_INTERN
/datum/alt_title/bridge_secretary
title = "Bridge Secretary"
title = JOB_ALT_BRIDGE_SECRETARY
/datum/alt_title/bridge_assistant
title = "Bridge Assistant"
//CHOMPEDIT START: More Alt titles
/datum/alt_title/performance_management_supervisor
title = "Performance Management Supervisor" //This one can be somewhat seen as an analogue to the captains "Chief Supervisor" role
//CHOMPEDIT END
title = JOB_ALT_BRIDGE_ASSISTANT

View File

@@ -5,26 +5,26 @@
//////////////////////////////////
/datum/job/bartender
title = "Bartender"
title = JOB_BARTENDER
flag = BARTENDER
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_bar)
outfit_type = /decl/hierarchy/outfit/job/service/bartender
job_description = "A Bartender mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons."
alt_titles = list("Barista" = /datum/alt_title/barista)
job_description = "A " + JOB_BARTENDER + " mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons."
alt_titles = list(JOB_ALT_BARISTA = /datum/alt_title/barista)
// Bartender Alt Titles
/datum/alt_title/barista
title = "Barista"
title_blurb = "A barista mans the Cafe, serving primarily non-alcoholic drinks to the crew. They generally have permission to charge for drinks \
title = JOB_ALT_BARISTA
title_blurb = "A " + JOB_ALT_BARISTA + " mans the Cafe, serving primarily non-alcoholic drinks to the crew. They generally have permission to charge for drinks \
or deny service to unruly patrons."
title_outfit = /decl/hierarchy/outfit/job/service/bartender/barista
@@ -33,68 +33,68 @@
//////////////////////////////////
/datum/job/chef
title = "Chef"
title = JOB_CHEF
flag = CHEF
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Head of Personnel"
supervisors = "the "+ JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_kitchen)
outfit_type = /decl/hierarchy/outfit/job/service/chef
job_description = "A Chef cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners."
alt_titles = list("Cook" = /datum/alt_title/cook)
job_description = "A " + JOB_CHEF + " cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners."
alt_titles = list(JOB_ALT_COOK = /datum/alt_title/cook)
// Chef Alt Titles
/datum/alt_title/cook
title = "Cook"
title_blurb = "A Cook has the same duties, though they may be less experienced."
title = JOB_ALT_COOK
title_blurb = "A " + JOB_ALT_COOK + " has the same duties, though they may be less experienced."
//////////////////////////////////
// Botanist
//////////////////////////////////
/datum/job/hydro
title = "Botanist"
title = JOB_BOTANIST
flag = BOTANIST
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_hydroponics)
outfit_type = /decl/hierarchy/outfit/job/service/gardener
job_description = "A Botanist grows plants for the Chef and Bartender."
alt_titles = list("Gardener" = /datum/alt_title/gardener)
job_description = "A " + JOB_BOTANIST+ " grows plants for the " + JOB_CHEF + " and " + JOB_BARTENDER + "."
alt_titles = list(JOB_ALT_GARDENER = /datum/alt_title/gardener)
//Botanist Alt Titles
/datum/alt_title/gardener
title = "Gardener"
title_blurb = "A Gardener may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere."
title = JOB_ALT_GARDENER
title_blurb = "A " + JOB_ALT_GARDENER + " may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere."
//Cargo
//////////////////////////////////
// Quartermaster
//////////////////////////////////
/datum/job/qm
title = "Quartermaster"
title = JOB_QUARTERMASTER
flag = QUARTERMASTER
departments = list(DEPARTMENT_CARGO)
sorting_order = 1 // QM is above the cargo techs, but below the HoP.
departments_managed = list(DEPARTMENT_CARGO)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#9b633e"
economic_modifier = 5
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
@@ -104,31 +104,31 @@
ideal_character_age = 40
outfit_type = /decl/hierarchy/outfit/job/cargo/qm
job_description = "The Quartermaster manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed."
alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief)
job_description = "The " + JOB_QUARTERMASTER + " manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed."
alt_titles = list(JOB_ALT_SUPPLY_CHIEF = /datum/alt_title/supply_chief)
// Quartermaster Alt Titles
/datum/alt_title/supply_chief
title = "Supply Chief"
title = JOB_ALT_SUPPLY_CHIEF
//////////////////////////////////
// Cargo Tech
//////////////////////////////////
/datum/job/cargo_tech
title = "Cargo Technician"
title = JOB_CARGO_TECHNICIAN
flag = CARGOTECH
departments = list(DEPARTMENT_CARGO)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Quartermaster and the Head of Personnel"
supervisors = "the " + JOB_QUARTERMASTER + " and the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#7a4f33"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
outfit_type = /decl/hierarchy/outfit/job/cargo/cargo_tech
job_description = "A Cargo Technician fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \
job_description = "A " + JOB_CARGO_TECHNICIAN + " fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \
because Central Command gives a partial refund."
//////////////////////////////////
@@ -136,82 +136,82 @@
//////////////////////////////////
/datum/job/mining
title = "Shaft Miner"
title = JOB_SHAFT_MINER
flag = MINER
departments = list(DEPARTMENT_CARGO)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 3
spawn_positions = 3
supervisors = "the Quartermaster and the Head of Personnel"
supervisors = "the " + JOB_QUARTERMASTER + " and the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#7a4f33"
economic_modifier = 5
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
minimal_access = list(access_mining, access_mining_station, access_mailsorting)
outfit_type = /decl/hierarchy/outfit/job/cargo/mining
job_description = "A Shaft Miner mines and processes minerals to be delivered to departments that need them."
alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech)
job_description = "A " + JOB_SHAFT_MINER + " mines and processes minerals to be delivered to departments that need them."
alt_titles = list(JOB_ALT_DRILL_TECHNICIAN = /datum/alt_title/drill_tech)
/datum/alt_title/drill_tech
title = "Drill Technician"
title_blurb = "A Drill Technician specializes in operating and maintaining the machinery needed to extract ore from veins deep below the surface."
title = JOB_ALT_DRILL_TECHNICIAN
title_blurb = "A " + JOB_ALT_DRILL_TECHNICIAN + " specializes in operating and maintaining the machinery needed to extract ore from veins deep below the surface."
//Service
//////////////////////////////////
// Janitor
//////////////////////////////////
/datum/job/janitor
title = "Janitor"
title = JOB_JANITOR
flag = JANITOR
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_janitor, access_maint_tunnels)
minimal_access = list(access_janitor, access_maint_tunnels)
outfit_type = /decl/hierarchy/outfit/job/service/janitor
job_description = "A Janitor keeps the station clean, as long as it doesn't interfere with active crime scenes."
alt_titles = list("Custodian" = /datum/alt_title/custodian)
job_description = "A " + JOB_JANITOR + " keeps the station clean, as long as it doesn't interfere with active crime scenes."
alt_titles = list(JOB_ALT_CUSTODIAN = /datum/alt_title/custodian)
// Janitor Alt Titles
/datum/alt_title/custodian
title = "Custodian"
title = JOB_ALT_CUSTODIAN
//More or less assistants
//////////////////////////////////
// Librarian
//////////////////////////////////
/datum/job/librarian
title = "Librarian"
title = JOB_LIBRARIAN
flag = LIBRARIAN
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_library, access_maint_tunnels)
minimal_access = list(access_library)
outfit_type = /decl/hierarchy/outfit/job/librarian
job_description = "The Librarian curates the book selection in the Library, so the crew might enjoy it."
alt_titles = list("Journalist" = /datum/alt_title/journalist, "Writer" = /datum/alt_title/writer)
job_description = "The " + JOB_LIBRARIAN + " curates the book selection in the Library, so the crew might enjoy it."
alt_titles = list(JOB_ALT_JOURNALIST = /datum/alt_title/journalist, JOB_ALT_WRITER = /datum/alt_title/writer)
// Librarian Alt Titles
/datum/alt_title/journalist
title = "Journalist"
title = JOB_ALT_JOURNALIST
title_outfit = /decl/hierarchy/outfit/job/librarian/journalist
title_blurb = "The Journalist uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera."
title_blurb = "The " + JOB_ALT_JOURNALIST + " uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera."
/datum/alt_title/writer
title = "Writer"
title_blurb = "The Writer uses the Library as a quiet place to write whatever it is they choose to write."
title = JOB_ALT_WRITER
title_blurb = "The " + JOB_ALT_WRITER + " uses the Library as a quiet place to write whatever it is they choose to write."
//////////////////////////////////
// Internal Affairs Agent
@@ -219,11 +219,11 @@
//var/global/lawyer = 0//Checks for another lawyer //This changed clothes on 2nd lawyer, both IA get the same dreds.
/datum/job/lawyer
title = "Internal Affairs Agent"
title = JOB_INTERNAL_AFFAIRS_AGENT
flag = LAWYER
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "company officials and Corporate Regulations"
@@ -235,7 +235,7 @@
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_ZADDAT, "digital")
outfit_type = /decl/hierarchy/outfit/job/internal_affairs_agent
job_description = "An Internal Affairs Agent makes sure that the crew is following Standard Operating Procedure. They also \
job_description = "An " + JOB_INTERNAL_AFFAIRS_AGENT + " makes sure that the crew is following Standard Operating Procedure. They also \
handle complaints against crew members, and can have issues brought to the attention of Central Command, \
assuming their paperwork is in order."

View File

@@ -1,4 +1,4 @@
/datum/alt_title/mailman
title = "Mail Carrier"
title = JOB_ALT_MAILMAN
title_blurb = "A Mail Carrier is tasked with delivering packages or mail to whoever it might adress."
title_outfit = /decl/hierarchy/outfit/job/cargo/cargo_tech/mailman

View File

@@ -1,25 +1,25 @@
//Due to how large this one is it gets its own file
/datum/job/chaplain
title = "Chaplain"
title = JOB_CHAPLAIN
flag = CHAPLAIN
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
minimal_access = list(access_chapel_office, access_crematorium)
outfit_type = /decl/hierarchy/outfit/job/chaplain
job_description = "The Chaplain ministers to the spiritual needs of the crew."
alt_titles = list("Counselor" = /datum/alt_title/counselor)
job_description = "The " + JOB_CHAPLAIN + " ministers to the spiritual needs of the crew."
alt_titles = list(JOB_ALT_COUNSELOR = /datum/alt_title/counselor)
// Chaplain Alt Titles
/datum/alt_title/counselor
title = "Counselor"
title_blurb = "The Counselor attends to the emotional needs of the crew, without a specific medicinal or spiritual focus."
title = JOB_ALT_COUNSELOR
title_blurb = "The " + JOB_ALT_COUNSELOR + " attends to the emotional needs of the crew, without a specific medicinal or spiritual focus."
/datum/job/chaplain/equip(var/mob/living/carbon/human/H, var/alt_title, var/ask_questions = TRUE)
. = ..()
@@ -111,7 +111,7 @@
var/bible_name = "Bible"
var/bible_icon_state = "bible"
var/bible_item_state = "bible"
var/title = "Chaplain"
var/title = JOB_CHAPLAIN
var/configured = FALSE
/datum/religion/New(var/r, var/d, var/bn, var/bis, var/bits, var/t)

View File

@@ -1,65 +1,65 @@
/datum/job/bartender
pto_type = PTO_CIVILIAN
alt_titles = list("Barkeeper" = /datum/alt_title/barkeeper, "Barmaid" = /datum/alt_title/barmaid, "Barista" = /datum/alt_title/barista, "Mixologist" = /datum/alt_title/mixologist)
alt_titles = list(JOB_ALT_BARKEEPR = /datum/alt_title/barkeeper, JOB_ALT_BARMAID = /datum/alt_title/barmaid, JOB_ALT_BARISTA = /datum/alt_title/barista, JOB_ALT_MIXOLOGIST = /datum/alt_title/mixologist)
/datum/alt_title/barkeeper
title = "Barkeeper"
title = JOB_ALT_BARKEEPR
/datum/alt_title/barmaid
title = "Barmaid"
title = JOB_ALT_BARMAID
/datum/alt_title/mixologist
title = "Mixologist"
title = JOB_ALT_MIXOLOGIST
/datum/job/chef
total_positions = 2 //IT TAKES A LOT TO MAKE A STEW
spawn_positions = 2 //A PINCH OF SALT AND LAUGHTER, TOO
pto_type = PTO_CIVILIAN
alt_titles = list("Sous-chef" = /datum/alt_title/souschef,"Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker)
alt_titles = list(JOB_ALT_SOUSCHEF = /datum/alt_title/souschef, JOB_ALT_COOK = /datum/alt_title/cook, JOB_ALT_KITCHEN_WORKER = /datum/alt_title/kitchen_worker)
/datum/alt_title/souschef
title = "Sous-chef"
title = JOB_ALT_SOUSCHEF
/datum/alt_title/kitchen_worker
title = "Kitchen Worker"
title_blurb = "A Kitchen Worker has the same duties, though they may be less experienced."
title = JOB_ALT_KITCHEN_WORKER
title_blurb = "A " + JOB_ALT_KITCHEN_WORKER + " has the same duties, though they may be less experienced."
/datum/job/hydro
spawn_positions = 2
pto_type = PTO_CIVILIAN
alt_titles = list("Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer,
"Gardener" = /datum/alt_title/gardener, "Florist" = /datum/alt_title/florsit, "Rancher" = /datum/alt_title/rancher)
alt_titles = list(JOB_ALT_HYDROPONICIST = /datum/alt_title/hydroponicist, JOB_ALT_CULTIVATOR = /datum/alt_title/cultivator, JOB_ALT_FARMER = /datum/alt_title/farmer,
JOB_ALT_GARDENER = /datum/alt_title/gardener, JOB_ALT_FLORIST = /datum/alt_title/florsit, JOB_ALT_RANCHER = /datum/alt_title/rancher)
/datum/alt_title/hydroponicist
title = "Hydroponicist"
title = JOB_ALT_HYDROPONICIST
/datum/alt_title/cultivator
title = "Cultivator"
title = JOB_ALT_CULTIVATOR
/datum/alt_title/farmer
title = "Farmer"
title = JOB_ALT_FARMER
/datum/alt_title/florsit
title = "Florist"
title_blurb = "A Florist may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere."
title = JOB_ALT_FLORIST
title_blurb = "A " + JOB_ALT_FLORIST + " may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere."
/datum/alt_title/rancher
title = "Rancher"
title_blurb = "A Rancher is tasked with the care, feeding, raising, and harvesting of livestock."
title = JOB_ALT_RANCHER
title_blurb = "A " + JOB_ALT_RANCHER + " is tasked with the care, feeding, raising, and harvesting of livestock."
/datum/job/qm
pto_type = PTO_CARGO
dept_time_required = 20
alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief, "Logistics Manager" = /datum/alt_title/logistics_manager, "Cargo Supervisor" = /datum/alt_title/cargo_supervisor)
alt_titles = list(JOB_ALT_SUPPLY_CHIEF = /datum/alt_title/supply_chief, JOB_ALT_LOGISTICS_MANAGER = /datum/alt_title/logistics_manager, JOB_ALT_CARGO_SUPERVISOR = /datum/alt_title/cargo_supervisor)
/datum/alt_title/logistics_manager
title = "Logistics Manager"
title = JOB_ALT_LOGISTICS_MANAGER
/datum/alt_title/cargo_supervisor
title = "Cargo Supervisor"
title = JOB_ALT_CARGO_SUPERVISOR
/datum/job/qm/get_request_reasons()
return list("Training crew")
@@ -69,42 +69,41 @@
total_positions = 3
spawn_positions = 3
pto_type = PTO_CARGO
alt_titles = list("Cargo Loader" = /datum/alt_title/cargo_loader, "Cargo Handler" = /datum/alt_title/cargo_handler, "Supply Courier" = /datum/alt_title/supply_courier,
"Disposals Sorter" = /datum/alt_title/disposal_sorter, "Mailman" = /datum/alt_title/mailman) // CHOMPEdit: Adds Mailman title.
alt_titles = list(JOB_ALT_CARGO_LOADER = /datum/alt_title/cargo_loader, JOB_ALT_CARGO_HANDLER = /datum/alt_title/cargo_handler, JOB_ALT_SUPPLY_COURIER = /datum/alt_title/supply_courier,
JOB_ALT_DISPOSALS_SORTER = /datum/alt_title/disposal_sorter, JOB_ALT_MAILMAN = /datum/alt_title/mailman) // CHOMPEdit: Adds Mailman title.
/datum/alt_title/supply_courier
title = "Supply Courier"
title_blurb = "A Supply Courier is usually tasked with delivering packages or cargo directly to whoever requires it." // CHOMPEdit: Fixes a typo.
title = JOB_ALT_SUPPLY_COURIER
title_blurb = "A " + JOB_ALT_SUPPLY_COURIER + " is usually tasked with delivering packages or cargo directly to whoever requires it."
/datum/alt_title/cargo_loader
title = "Cargo Loader"
title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle."
title = JOB_ALT_CARGO_LOADER
title_blurb = "A " + JOB_ALT_CARGO_LOADER + " is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle."
/datum/alt_title/cargo_handler
title = "Cargo Handler"
title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle."
title = JOB_ALT_CARGO_HANDLER
title_blurb = "A " + JOB_ALT_CARGO_HANDLER + " is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle."
/datum/alt_title/disposal_sorter
title = "Disposals Sorter"
title_blurb = "A Disposals Sorter is usually tasked with operating disposals delivery system, sorting the trash and tagging parcels for delivery."
title = JOB_ALT_DISPOSALS_SORTER
title_blurb = "A " + JOB_ALT_DISPOSALS_SORTER + " is usually tasked with operating disposals delivery system, sorting the trash and tagging parcels for delivery."
/datum/job/mining
total_positions = 4
spawn_positions = 4
pto_type = PTO_CARGO
alt_titles = list(/*CHOMPEdit Removal "Deep Space Miner" = /datum/alt_title/deep_space_miner*/, "Drill Technician" = /datum/alt_title/drill_tech, "Prospector" = /datum/alt_title/prospector,
"Excavator" = /datum/alt_title/excavator)
alt_titles = list(/*CHOMPEdit Removal JOB_ALT_DEEP_SPACE_MINER = /datum/alt_title/deep_space_miner*/, JOB_ALT_DRILL_TECHNICIAN = /datum/alt_title/drill_tech, JOB_ALT_PROSPECTOR = /datum/alt_title/prospector,
JOB_ALT_EXCAVATOR = /datum/alt_title/excavator)
/datum/alt_title/deep_space_miner
title = "Deep Space Miner"
title_blurb = "A Deep Space Miner specializes primarily in mining operations in zero-g environments, mostly in asteroid and debris fields."
title = JOB_ALT_DEEP_SPACE_MINER
title_blurb = "A " + JOB_ALT_DEEP_SPACE_MINER + " specializes primarily in mining operations in zero-g environments, mostly in asteroid and debris fields."
/datum/alt_title/prospector
title = "Prospector"
title = JOB_ALT_PROSPECTOR
/datum/alt_title/excavator
title = "Excavator"
title = JOB_ALT_EXCAVATOR
/datum/job/mining/get_request_reasons()
return list("Assembling expedition team")
@@ -114,96 +113,96 @@
total_positions = 3
spawn_positions = 3
pto_type = PTO_CIVILIAN
alt_titles = list("Custodian" = /datum/alt_title/custodian, "Sanitation Technician" = /datum/alt_title/sanitation_tech,
"Maid" = /datum/alt_title/maid, "Garbage Collector" = /datum/alt_title/garbage_collector)
alt_titles = list(JOB_ALT_CUSTODIAN = /datum/alt_title/custodian, JOB_ALT_SANITATION_TECHNICIAN = /datum/alt_title/sanitation_tech,
JOB_ALT_MAID = /datum/alt_title/maid, JOB_ALT_GARBAGE_COLLECTOR = /datum/alt_title/garbage_collector)
/datum/alt_title/sanitation_tech
title = "Sanitation Technician"
title = JOB_ALT_SANITATION_TECHNICIAN
/datum/alt_title/maid
title = "Maid"
title = JOB_ALT_MAID
/datum/alt_title/garbage_collector
title = "Garbage Collector"
title_blurb = "A Garbage Collector keeps the station clean, though focuses moreso on collecting larger trash, with wet cleaning being secondary task."
title = JOB_ALT_GARBAGE_COLLECTOR
title_blurb = "A " + JOB_ALT_GARBAGE_COLLECTOR + " keeps the station clean, though focuses moreso on collecting larger trash, with wet cleaning being secondary task."
/datum/job/librarian
total_positions = 2
spawn_positions = 2
alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = /datum/alt_title/reporter, "Writer" = /datum/alt_title/writer,
"Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor,
"Academic" = /datum/alt_title/academic, "Philosopher" = /datum/alt_title/philosopher, "Curator" = /datum/alt_title/curator)
alt_titles = list(JOB_ALT_JOURNALIST = /datum/alt_title/journalist, JOB_ALT_REPORTER = /datum/alt_title/reporter, JOB_ALT_WRITER = /datum/alt_title/writer,
JOB_ALT_HISTORIAN = /datum/alt_title/historian, JOB_ALT_ARCHIVIST = /datum/alt_title/archivist, JOB_ALT_PROFESSOR = /datum/alt_title/professor,
JOB_ALT_ACADEMIC = /datum/alt_title/academic, JOB_ALT_PHILOSOPHER = /datum/alt_title/philosopher, JOB_ALT_CURATOR = /datum/alt_title/curator)
pto_type = PTO_CIVILIAN
/datum/alt_title/reporter
title = "Reporter"
title_blurb = "The Reporter uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera."
title = JOB_ALT_REPORTER
title_blurb = "The " + JOB_ALT_REPORTER + " uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera."
/datum/alt_title/historian
title = "Historian"
title_blurb = "The Historian uses the Library as a base of operation to record any important events occurring on station."
title = JOB_ALT_HISTORIAN
title_blurb = "The " + JOB_ALT_HISTORIAN + " uses the Library as a base of operation to record any important events occurring on station."
/datum/alt_title/archivist
title = "Archivist"
title_blurb = "The Archivist uses the Library as a base of operation to record any important events occurring on station."
title = JOB_ALT_ARCHIVIST
title_blurb = "The " + JOB_ALT_ARCHIVIST + " uses the Library as a base of operation to record any important events occurring on station."
/datum/alt_title/professor
title = "Professor"
title_blurb = "The Professor uses the Library as a base of operations to share their vast knowledge with the crew."
title = JOB_ALT_PROFESSOR
title_blurb = "The " + JOB_ALT_PROFESSOR + " uses the Library as a base of operations to share their vast knowledge with the crew."
/datum/alt_title/academic
title = "Academic"
title_blurb = "The Academic uses the Library as a base of operations to share their vast knowledge with the crew."
title = JOB_ALT_ACADEMIC
title_blurb = "The " + JOB_ALT_ACADEMIC + " uses the Library as a base of operations to share their vast knowledge with the crew."
/datum/alt_title/philosopher
title = "Philosopher"
title_blurb = "The Philosopher uses the Library as a base of operation to ruminate on nature of life and other great questions, and share their opinions with the crew."
title = JOB_ALT_PHILOSOPHER
title_blurb = "The " + JOB_ALT_PHILOSOPHER + " uses the Library as a base of operation to ruminate on nature of life and other great questions, and share their opinions with the crew."
/datum/alt_title/curator
title = "Curator"
title_blurb = "The Curator uses the Library as a base of operation to gather the finest of art for display and preservation."
title = JOB_ALT_CURATOR
title_blurb = "The " + JOB_ALT_CURATOR + " uses the Library as a base of operation to gather the finest of art for display and preservation."
/datum/job/lawyer
disallow_jobhop = TRUE
pto_type = PTO_CIVILIAN
alt_titles = list("Internal Affairs Liaison" = /datum/alt_title/ia_liaison, "Internal Affairs Delegate" = /datum/alt_title/ia_delegate,
"Internal Affairs Investigator" = /datum/alt_title/ia_investigator)
alt_titles = list(JOB_ALT_INTERNAL_AFFAIRS_LIAISON = /datum/alt_title/ia_liaison, JOB_ALT_INTERNAL_AFFAIRS_DELEGATE = /datum/alt_title/ia_delegate,
JOB_ALT_INTERNAL_AFFAIRS_INVESTIGATOR = /datum/alt_title/ia_investigator)
/datum/alt_title/ia_liaison
title = "Internal Affairs Liaison"
title = JOB_ALT_INTERNAL_AFFAIRS_LIAISON
/datum/alt_title/ia_delegate
title = "Internal Affairs Delegate"
title = JOB_ALT_INTERNAL_AFFAIRS_DELEGATE
/datum/alt_title/ia_investigator
title = "Internal Affairs Investigator"
title = JOB_ALT_INTERNAL_AFFAIRS_INVESTIGATOR
/datum/job/chaplain
pto_type = PTO_CIVILIAN
alt_titles = list("Missionary" = /datum/alt_title/missionary, "Preacher" = /datum/alt_title/preacher, "Priest" = /datum/alt_title/priest,
"Nun" = /datum/alt_title/nun, "Monk" = /datum/alt_title/monk, "Counselor" = /datum/alt_title/counselor,
"Guru" = /datum/alt_title/guru)
alt_titles = list(JOB_ALT_MISSIONARY = /datum/alt_title/missionary, JOB_ALT_PREACHER = /datum/alt_title/preacher, JOB_ALT_PRIEST = /datum/alt_title/priest,
JOB_ALT_NUN = /datum/alt_title/nun, JOB_ALT_MONK = /datum/alt_title/monk, JOB_ALT_COUNSELOR = /datum/alt_title/counselor,
JOB_ALT_GURU = /datum/alt_title/guru)
/datum/alt_title/guru
title = "Guru"
title_blurb = "The Guru primarily tries to offer spiritual guidance to those who come seeking it."
title = JOB_ALT_GURU
title_blurb = "The " + JOB_ALT_GURU + " primarily tries to offer spiritual guidance to those who come seeking it."
/datum/alt_title/missionary
title = "Missionary"
title = JOB_ALT_MISSIONARY
/datum/alt_title/preacher
title = "Preacher"
title = JOB_ALT_PREACHER
/datum/alt_title/priest
title = "Priest"
title = JOB_ALT_PRIEST
/datum/alt_title/nun
title = "Nun"
title = JOB_ALT_NUN
/datum/alt_title/monk
title = "Monk"
title = JOB_ALT_MONK
/*CHOMP Remove Start: because we have our own in maps/southern_cross/southern_cross_jobs.dm
@@ -212,14 +211,14 @@
//////////////////////////////////
/datum/job/pilot
title = "Pilot"
title = JOB_PILOT
flag = PILOT
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 5 //CHOMP explo keep
spawn_positions = 5 //CHOMP explo keep
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
economic_modifier = 5
minimal_player_age = 3
@@ -227,18 +226,18 @@
access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
outfit_type = /decl/hierarchy/outfit/job/pilot
job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System."
alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman)
job_description = "A " + JOB_PILOT + " flies the various shuttles in the Virgo-Erigone System."
alt_titles = list(JOB_ALT_COPILOT = /datum/alt_title/co_pilot, JOB_ALT_NAVIGATOR = /datum/alt_title/navigator, JOB_ALT_HELMSMAN = /datum/alt_title/helmsman)
/datum/alt_title/co_pilot
title = "Co-Pilot"
title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them"
title = JOB_ALT_COPILOT
title_blurb = "A Co-" + JOB_ALT_COPILOT + " is there primarily to assist main pilot as well as learn from them"
/datum/alt_title/navigator
title = "Navigator"
title = JOB_ALT_NAVIGATOR
/datum/alt_title/helmsman
title = "Helmsman"
title = JOB_ALT_HELMSMAN
*/ //CHOMP Remove end
/datum/job/pilot/get_request_reasons()
@@ -249,189 +248,189 @@
//////////////////////////////////
/datum/job/entertainer
title = "Entertainer"
title = JOB_ENTERTAINER
flag = ENTERTAINER
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 4
spawn_positions = 4
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_entertainment)
minimal_access = list(access_entertainment)
pto_type = PTO_CIVILIAN
outfit_type = /decl/hierarchy/outfit/job/assistant/entertainer
job_description = "An entertainer does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic."
alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand,
"Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer,
"Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian,
"Clown" = /datum/alt_title/clown, "Jester" = /datum/alt_title/clown/jester,"Fool" = /datum/alt_title/clown/fool,
"Mime"= /datum/alt_title/mime,"Poseur"= /datum/alt_title/mime/poseur, //CHOMPEDIT: Adding clown + mime and their alts as alts of entertainer
"Artist" = /datum/alt_title/artist, "Fitness Instructor" = /datum/alt_title/fitnessinstructor, "Game Master" = /datum/alt_title/game_master)
job_description = "An " + JOB_ENTERTAINER + " does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic."
alt_titles = list(JOB_ALT_PERFORMER = /datum/alt_title/performer, JOB_ALT_MUSICIAN = /datum/alt_title/musician, JOB_ALT_STAGEHAND = /datum/alt_title/stagehand,
JOB_ALT_ACTOR = /datum/alt_title/actor, JOB_ALT_DANCER = /datum/alt_title/dancer, JOB_ALT_SINGER = /datum/alt_title/singer,
JOB_ALT_MAGICIAN = /datum/alt_title/magician, JOB_ALT_COMEDIAN = /datum/alt_title/comedian, JOB_ALT_ARTIST = /datum/alt_title/tragedian,
JOB_CLOWN = /datum/alt_title/clown, JOB_ALT_JESTER = /datum/alt_title/clown/jester,JOB_ALT_FOOL = /datum/alt_title/clown/fool,
JOB_MIME= /datum/alt_title/mime,JOB_ALT_PASEUR= /datum/alt_title/mime/poseur, //CHOMPEDIT: Adding clown + mime and their alts as alts of entertainer
JOB_ALT_ARTIST = /datum/alt_title/artist, JOB_ALT_FITNESS_INSTRUCTOR = /datum/alt_title/fitnessinstructor, JOB_ALT_GAME_MASTER = /datum/alt_title/game_master)
// Entertainer Alt Titles
/datum/alt_title/actor
title = "Actor"
title_blurb = "An Actor is someone who acts out a role! Whatever sort of character it is, get into it and impress people with power of comedy and tragedy!"
title = JOB_ALT_ACTOR
title_blurb = "An " + JOB_ALT_ACTOR + " is someone who acts out a role! Whatever sort of character it is, get into it and impress people with power of comedy and tragedy!"
/datum/alt_title/performer
title = "Performer"
title_blurb = "A Performer is someone who performs! Whatever sort of performance will come to your mind, the world's a stage!"
title = JOB_ALT_PERFORMER
title_blurb = "A " + JOB_ALT_PERFORMER + " is someone who performs! Whatever sort of performance will come to your mind, the world's a stage!"
/datum/alt_title/musician
title = "Musician"
title_blurb = "A Musician is someone who makes music with a wide variety of musical instruments!"
title = JOB_ALT_MUSICIAN
title_blurb = "A " + JOB_ALT_MUSICIAN + " is someone who makes music with a wide variety of musical instruments!"
/datum/alt_title/stagehand
title = "Stagehand"
title_blurb = "A Stagehand typically performs everything the rest of the entertainers don't. Operate lights, shutters, windows, or narrate through your voicebox!"
title = JOB_ALT_STAGEHAND
title_blurb = "A " + JOB_ALT_STAGEHAND + " typically performs everything the rest of the entertainers don't. Operate lights, shutters, windows, or narrate through your voicebox!"
/datum/alt_title/dancer
title = "Dancer"
title_blurb = "A Dancer is someone who impresses people through power of their own body! From waltz to breakdance, as long as crowd as cheering!"
title = JOB_ALT_DANCER
title_blurb = "A " + JOB_ALT_DANCER + " is someone who impresses people through power of their own body! From waltz to breakdance, as long as crowd as cheering!"
/datum/alt_title/singer
title = "Singer"
title_blurb = "A Singer is someone with gift of melodious voice! Impress people with your vocal range!"
title = JOB_ALT_SINGER
title_blurb = "A " + JOB_ALT_SINGER + " is someone with gift of melodious voice! Impress people with your vocal range!"
/datum/alt_title/magician
title = "Magician"
title_blurb = "A Magician is someone who awes those around them with impossible! Show off your repertoire of magic tricks, while keeping the secret hidden!"
title = JOB_ALT_MAGICIAN
title_blurb = "A " + JOB_ALT_MAGICIAN + " is someone who awes those around them with impossible! Show off your repertoire of magic tricks, while keeping the secret hidden!"
/datum/alt_title/comedian
title = "Comedian"
title_blurb = "A Comedian will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!"
title = JOB_ALT_COMEDIAN
title_blurb = "A " + JOB_ALT_COMEDIAN + " will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!"
/datum/alt_title/tragedian
title = "Tragedian"
title_blurb = "A Tragedian will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?"
title = JOB_ALT_ARTIST
title_blurb = "A " + JOB_ALT_ARTIST + " will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?"
/datum/alt_title/artist
title = "Artist"
title_blurb = "An Artist's calling is to create beautiful arts! Whatever form may they take, create and have people astonished with your creativity."
title = JOB_ALT_ARTIST
title_blurb = "An " + JOB_ALT_ARTIST + "'s calling is to create beautiful arts! Whatever form may they take, create and have people astonished with your creativity."
/datum/alt_title/game_master
title = "Game Master"
title_blurb = "A Game Master provides recreation for the crew by hosting variety of games. From cards to roleplaying to something more personalized."
title = JOB_ALT_GAME_MASTER
title_blurb = "A " + JOB_ALT_GAME_MASTER + " provides recreation for the crew by hosting variety of games. From cards to roleplaying to something more personalized."
//////////////////////////////////
// Entrepreneur
//////////////////////////////////
/datum/job/entrepreneur
title = "Entrepreneur"
title = JOB_ENTREPRENEUR
flag = ENTREPRENEUR
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
faction = FACTION_STATION
total_positions = 4
spawn_positions = 4
supervisors = "the Head of Personnel"
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list()
minimal_access = list()
pto_type = PTO_CIVILIAN
outfit_type = /decl/hierarchy/outfit/job/assistant/entrepreneur
job_description = "An entrepreneur is basically a visitor that obtained special permission to offer personal services to people on station. \
job_description = "An " + JOB_ENTREPRENEUR + " is basically a visitor that obtained special permission to offer personal services to people on station. \
They will offer people these services and, potentially, even demand payment!"
alt_titles = list("Lawyer" = /datum/alt_title/lawyer, "Private Eye" = /datum/alt_title/private_eye, "Bodyguard" = /datum/alt_title/bodyguard,
"Personal Physician" = /datum/alt_title/personal_physician, "Dentist" = /datum/alt_title/dentist, "Fitness Instructor" = /datum/alt_title/fitness_instructor,
"Yoga Teacher" = /datum/alt_title/yoga_teacher, "Masseuse" = /datum/alt_title/masseuse, "Tradesperson" = /datum/alt_title/tradesperson,
"Streamer" = /datum/alt_title/streamer, "Influencer" = /datum/alt_title/influencer, "Paranormal Investigator" = /datum/alt_title/paranormal_investigator,
"Personal Secretary" = /datum/alt_title/personal_secretary, "Stylist" = /datum/alt_title/stylist, "Fisher" = /datum/alt_title/fisher,
"Fortune Teller" = /datum/alt_title/fortune_teller, "Spirit Healer" = /datum/alt_title/spirit_healer)
alt_titles = list(JOB_ALT_LAWYER = /datum/alt_title/lawyer, JOB_ALT_PRIVATE_EYE = /datum/alt_title/private_eye, JOB_ALT_BODYGUARD = /datum/alt_title/bodyguard,
JOB_ALT_PERSONAL_PHYSICIAN = /datum/alt_title/personal_physician, JOB_ALT_DENTIST = /datum/alt_title/dentist, JOB_ALT_FITNESS_INSTRUCTOR = /datum/alt_title/fitness_instructor,
JOB_ALT_YOGA_TEACHER = /datum/alt_title/yoga_teacher, JOB_ALT_MASSEUSE = /datum/alt_title/masseuse, JOB_ALT_TRADESPERSON = /datum/alt_title/tradesperson,
JOB_ALT_STREAMER = /datum/alt_title/streamer, JOB_ALT_INFLUENCER = /datum/alt_title/influencer, JOB_ALT_PARANORMAL_INVESTIGATOR = /datum/alt_title/paranormal_investigator,
JOB_ALT_PERSONAL_SECRETARY = /datum/alt_title/personal_secretary, JOB_ALT_STYLIST = /datum/alt_title/stylist, JOB_ALT_FISHER = /datum/alt_title/fisher,
JOB_ALT_FORTUNE_TELLER = /datum/alt_title/fortune_teller, JOB_ALT_SPIRIT_HEALER = /datum/alt_title/spirit_healer)
/datum/alt_title/lawyer
title = "Lawyer"
title_blurb = "A Lawyer is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen."
title = JOB_ALT_LAWYER
title_blurb = "A " + JOB_ALT_LAWYER + " is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
/datum/alt_title/private_eye
title = "Private Eye"
title_blurb = "A Private Eye is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to."
title = JOB_ALT_PRIVATE_EYE
title_blurb = "A " + JOB_ALT_PRIVATE_EYE + " is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye
/datum/alt_title/bodyguard
title = "Bodyguard"
title_blurb = "A Bodyguard offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough."
title = JOB_ALT_BODYGUARD
title_blurb = "A " + JOB_ALT_BODYGUARD + " offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard
/datum/alt_title/personal_physician
title = "Personal Physician"
title_blurb = "A Personal Physicial is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be."
title = JOB_ALT_PERSONAL_PHYSICIAN
title_blurb = "A " + JOB_ALT_PERSONAL_PHYSICIAN + " is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician
/datum/alt_title/dentist
title = "Dentist"
title_blurb = "A Dentist is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will."
title = JOB_ALT_DENTIST
title_blurb = "A " + JOB_ALT_DENTIST + " is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/dentist
/datum/alt_title/fitness_instructor
title = "Fitness Instructor"
title_blurb = "A Fitness Instructor dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
title = JOB_ALT_FITNESS_INSTRUCTOR
title_blurb = "A " + JOB_ALT_FITNESS_INSTRUCTOR + " dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor
/datum/alt_title/yoga_teacher
title = "Yoga Teacher"
title_blurb = "A Yoga Teacher is similar to fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony."
title = JOB_ALT_YOGA_TEACHER
title_blurb = "A " + JOB_ALT_YOGA_TEACHER + " is similar to a fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher
/datum/alt_title/masseuse
title = "Masseuse"
title_blurb = "A Masseuse is master of physical therapy and working others' bodies with their hands."
title = JOB_ALT_MASSEUSE
title_blurb = "A " + JOB_ALT_MASSEUSE + " is master of physical therapy and working others' bodies with their hands."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse
/datum/alt_title/tradesperson
title = "Tradesperson"
title_blurb = "A Tradesperson is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..."
title = JOB_ALT_TRADESPERSON
title_blurb = "A " + JOB_ALT_TRADESPERSON + " is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson
/datum/alt_title/streamer
title = "Streamer"
title_blurb = "A Streamer is here to entertain. Not the crew! Their audience across exonet!"
title = JOB_ALT_STREAMER
title_blurb = "A " + JOB_ALT_STREAMER + " is here to entertain. Not the crew! Their audience across exonet!"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/streamer
/datum/alt_title/influencer
title = "Influencer"
title_blurb = "An Influencer has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head."
title = JOB_ALT_INFLUENCER
title_blurb = "An " + JOB_ALT_INFLUENCER + " has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/influencer
/datum/alt_title/paranormal_investigator
title = "Paranormal Investigator"
title_blurb = "A Paranormal Investigator looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!"
title = JOB_ALT_PARANORMAL_INVESTIGATOR
title_blurb = "A " + JOB_ALT_PARANORMAL_INVESTIGATOR + " looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator
/datum/alt_title/personal_secretary
title = "Personal Secretary"
title_blurb = "A Personal Secretary offers services of general assistance. Although it's doubtful anyone will ever actually need those."
title = JOB_ALT_PERSONAL_SECRETARY
title_blurb = "A " + JOB_ALT_PERSONAL_SECRETARY + " offers services of general assistance. Although it's doubtful anyone will ever actually need those."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary
/datum/alt_title/stylist
title = "Stylist"
title_blurb = "A Stylist offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards."
title = JOB_ALT_STYLIST
title_blurb = "A " + JOB_ALT_STYLIST + " offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards."
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/stylist
/datum/alt_title/fisher
title = "Fisher"
title_blurb = "A Fisher is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!"
title = JOB_ALT_FISHER
title_blurb = "A " + JOB_ALT_FISHER + " is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fisher
/datum/alt_title/fortune_teller
title = "Fortune Teller"
title_blurb = "A Fortune Teller peers into the future, and offers these visions to others. Occasionally those visions may even come true!"
title = JOB_ALT_FORTUNE_TELLER
title_blurb = "A " + JOB_ALT_FORTUNE_TELLER + " peers into the future, and offers these visions to others. Occasionally those visions may even come true!"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller
/datum/alt_title/spirit_healer
title = "Spirit Healer"
title_blurb = "A Spirit Healer offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?"
title = JOB_ALT_SPIRIT_HEALER
title_blurb = "A " + JOB_ALT_SPIRIT_HEALER + " offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?"
title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer
// ChompADD
/datum/alt_title/fitnessinstructor
title = "Fitness Instructor"
title_blurb = "A Fitness Instructor dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
title = JOB_ALT_FITNESS_INSTRUCTOR
title_blurb = "A " + JOB_ALT_FITNESS_INSTRUCTOR + " dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help."
// ChompADD END

View File

@@ -77,4 +77,4 @@
short_name = "Centcom"
color = "#A52A2A"
sorting_order = 20 // Above Command.
centcom_only = TRUE
centcom_only = TRUE

View File

@@ -2,16 +2,16 @@
// Chief Engineer
//////////////////////////////////
/datum/job/chief_engineer
title = "Chief Engineer"
title = JOB_CHIEF_ENGINEER
flag = CHIEF
departments_managed = list(DEPARTMENT_ENGINEERING)
departments = list(DEPARTMENT_ENGINEERING, DEPARTMENT_COMMAND)
sorting_order = 2
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Site Manager"
supervisors = "the "+ JOB_SITE_MANAGER
selection_color = "#7F6E2C"
req_admin_notify = 1
economic_modifier = 10
@@ -34,7 +34,7 @@
minimal_player_age = 7
outfit_type = /decl/hierarchy/outfit/job/engineering/chief_engineer
job_description = "The Chief Engineer manages the Engineering Department, ensuring that the Engineers work on what needs to be done, handling distribution \
job_description = "The " + JOB_CHIEF_ENGINEER + " manages the Engineering Department, ensuring that the Engineers work on what needs to be done, handling distribution \
of manpower as much as they handle hands-on operations and repairs. They are also expected to keep the rest of the station informed of \
any structural threats to the station that may be hazardous to health or disruptive to work."
@@ -42,56 +42,56 @@
// Engineer
//////////////////////////////////
/datum/job/engineer
title = "Engineer"
title = JOB_ENGINEER
flag = ENGINEER
departments = list(DEPARTMENT_ENGINEERING)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 5
spawn_positions = 5
supervisors = "the Chief Engineer"
supervisors = "the "+ JOB_CHIEF_ENGINEER
selection_color = "#5B4D20"
economic_modifier = 5
access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech,
"Engine Technician" = /datum/alt_title/engine_tech, "Electrician" = /datum/alt_title/electrician)
alt_titles = list(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech,
JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech, JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician)
minimal_player_age = 3
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
outfit_type = /decl/hierarchy/outfit/job/engineering/engineer
job_description = "An Engineer keeps the station running. They repair damages, keep the atmosphere stable, and ensure that power is being \
job_description = "An " + JOB_ENGINEER + " keeps the station running. They repair damages, keep the atmosphere stable, and ensure that power is being \
generated and distributed. On quiet shifts, they may be called upon to make cosmetic alterations to the station."
// Engineer Alt Titles
/datum/alt_title/maint_tech
title = "Maintenance Technician"
title_blurb = "A Maintenance Technician is generally a junior Engineer, and can be expected to run the mildly unpleasant or boring tasks that other \
title = JOB_ALT_MAINTENANCE_TECHNICIAN
title_blurb = "A " + JOB_ALT_MAINTENANCE_TECHNICIAN + " is generally a junior Engineer, and can be expected to run the mildly unpleasant or boring tasks that other \
Engineers don't care to do."
/datum/alt_title/engine_tech
title = "Engine Technician"
title_blurb = "An Engine Technician tends to the engine, most commonly a Supermatter crystal. They are expected to be able to keep it stable, and \
title = JOB_ALT_ENGINE_TECHNICIAN
title_blurb = "An " + JOB_ALT_ENGINE_TECHNICIAN + " tends to the engine, most commonly a Supermatter crystal. They are expected to be able to keep it stable, and \
possibly even run it beyond normal tolerances."
/datum/alt_title/electrician
title = "Electrician"
title_blurb = "An Electrician's primary duty is making sure power is properly distributed thoughout the station, utilizing solars, substations, and other \
title = JOB_ALT_ELECTRICIAN
title_blurb = "An " + JOB_ALT_ELECTRICIAN + "'s primary duty is making sure power is properly distributed thoughout the station, utilizing solars, substations, and other \
methods to ensure every department has power in an emergency."
//////////////////////////////////
// Atmos Tech
//////////////////////////////////
/datum/job/atmos
title = "Atmospheric Technician"
title = JOB_ATMOSPHERIC_TECHNICIAN
flag = ATMOSTECH
departments = list(DEPARTMENT_ENGINEERING)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
supervisors = "the Chief Engineer"
supervisors = "the " + JOB_CHIEF_ENGINEER
selection_color = "#5B4D20"
economic_modifier = 5
access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_external_airlocks)
@@ -101,5 +101,5 @@
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
outfit_type = /decl/hierarchy/outfit/job/engineering/atmos
job_description = "An Atmospheric Technician is primarily concerned with keeping the station's atmosphere breathable. They are expected to have a good \
job_description = "An " + JOB_ATMOSPHERIC_TECHNICIAN + " is primarily concerned with keeping the station's atmosphere breathable. They are expected to have a good \
understanding of the pipes, vents, and scrubbers that move gasses around the station, and to be familiar with proper firefighting procedure."

View File

@@ -12,16 +12,16 @@
access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
access_heads, access_construction,
access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager)
alt_titles = list(JOB_ALT_HEAD_ENGINEER = /datum/alt_title/head_engineer, JOB_ALT_FOREMAN = /datum/alt_title/foreman, JOB_ALT_MAINTENANCE_MANAGER = /datum/alt_title/maintenance_manager)
/datum/alt_title/head_engineer
title = "Head Engineer"
title = JOB_ALT_HEAD_ENGINEER
/datum/alt_title/foreman
title = "Foreman"
title = JOB_ALT_FOREMAN
/datum/alt_title/maintenance_manager
title = "Maintenance Manager"
title = JOB_ALT_MAINTENANCE_MANAGER
/datum/job/chief_engineer/get_request_reasons()
return list("Engine setup", "Construction project", "Repairs necessary", "Training crew", "Assembling expedition team")
@@ -29,17 +29,17 @@
/datum/job/engineer
pto_type = PTO_ENGINEERING
alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech,
"Electrician" = /datum/alt_title/electrician, "Construction Engineer" = /datum/alt_title/construction_engi, "Engineering Contractor" = /datum/alt_title/engineering_contractor)
alt_titles = list(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech, JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech,
JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician, JOB_ALT_CONSTRUCTION_ENGINEER = /datum/alt_title/construction_engi, JOB_ALT_ENGINEERING_CONTRACTOR = /datum/alt_title/engineering_contractor)
/datum/alt_title/construction_engi
title = "Construction Engineer"
title_blurb = "A Construction Engineer fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \
title = JOB_ALT_CONSTRUCTION_ENGINEER
title_blurb = "A " + JOB_ALT_CONSTRUCTION_ENGINEER + " fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \
as additions to station layout."
/datum/alt_title/engineering_contractor
title = "Engineering Contractor"
title_blurb = "An Engineering Contractor fulfills similar duties to other engineers, but isn't directly employed by NT proper."
title = JOB_ALT_ENGINEERING_CONTRACTOR
title_blurb = "An " + JOB_ALT_ENGINEERING_CONTRACTOR + " fulfills similar duties to other engineers, but isn't directly employed by NT proper."
/datum/job/engineer/get_request_reasons()
return list("Engine setup", "Construction project", "Repairs necessary", "Assembling expedition team")
@@ -50,17 +50,21 @@
/datum/job/atmos
spawn_positions = 3
pto_type = PTO_ENGINEERING
alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, /*CHOMPEdit "Disposals Technician" = /datum/alt_title/disposals_tech*/)
alt_titles = list(JOB_ALT_ATMOSPHERIC_ENGINEER = /datum/alt_title/atmos_engi, JOB_ALT_ATMOSPHERIC_MAINTAINER = /datum/alt_title/atmos_maint, /*CHOMPEdit JOB_ALT_DISPOSALS_TECHNICIAN = /datum/alt_title/disposals_tech*/
JOB_ALT_FUEL_TECHNICIAN = /datum/alt_title/refuel_tech)
/datum/alt_title/atmos_maint
title = "Atmospheric Maintainer"
title = JOB_ALT_ATMOSPHERIC_MAINTAINER
/datum/alt_title/atmos_engi
title = "Atmospheric Engineer"
title = JOB_ALT_ATMOSPHERIC_ENGINEER
/datum/alt_title/disposals_tech
title = "Disposals Technician"
title_blurb = "A Disposals Technician is an Atmospheric Technician still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations."
title = JOB_ALT_DISPOSALS_TECHNICIAN
title_blurb = "A " + JOB_ALT_DISPOSALS_TECHNICIAN + " is an " + JOB_ATMOSPHERIC_TECHNICIAN + " still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations."
/datum/alt_title/refuel_tech
title = JOB_ALT_FUEL_TECHNICIAN
/datum/job/atmos/get_request_reasons()
return list("Construction project", "Repairs necessary", "Assembling expedition team")

View File

@@ -1,6 +1,6 @@
/obj/item/weapon/card/id/medical/sar
assignment = "Field Medic"
rank = "Field Medic"
assignment = JOB_FIELD_MEDIC
rank = JOB_FIELD_MEDIC
icon_state = "cyan"
primary_color = rgb(47,189,189)
secondary_color = rgb(127,223,223)
@@ -11,6 +11,7 @@
icon_state = "cyan"
primary_color = rgb(47,189,189)
secondary_color = rgb(127,223,223)
rank = JOB_EXPLORER
/obj/item/weapon/card/id/explorer/head
name = "identification card"
@@ -18,6 +19,7 @@
icon_state = "cyanGold"
primary_color = rgb(47,189,189)
secondary_color = rgb(127,223,223)
rank = JOB_PATHFINDER
/datum/department/planetside
name = DEPARTMENT_PLANET
@@ -27,16 +29,16 @@
/datum/job/pathfinder
title = "Pathfinder"
title = JOB_PATHFINDER
flag = PATHFINDER
departments = list(DEPARTMENT_PLANET)
departments_managed = list(DEPARTMENT_PLANET)
sorting_order = 1 // above the other explorers
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Research Director" //CHOMPedit
supervisors = "the " + JOB_RESEARCH_DIRECTOR //CHOMPedit
selection_color = "#d6d05c"
economic_modifier = 8
minimal_player_age = 7
@@ -46,14 +48,14 @@
access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)
minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)
outfit_type = /decl/hierarchy/outfit/job/pathfinder
job_description = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions."
alt_titles = list("Expedition Lead" = /datum/alt_title/expedition_lead, "Exploration Manager" = /datum/alt_title/exploration_manager)
job_description = "The " + JOB_PATHFINDER + "'s job is to lead and manage expeditions, and is the primary authority on all off-station expeditions."
alt_titles = list(JOB_ALT_EXPEDITION_LEAD = /datum/alt_title/expedition_lead, JOB_ALT_EXPLORATION_MANAGER = /datum/alt_title/exploration_manager)
/datum/alt_title/expedition_lead
title = "Expedition Lead"
title = JOB_ALT_EXPEDITION_LEAD
/datum/alt_title/exploration_manager
title = "Exploration Manager"
title = JOB_ALT_EXPLORATION_MANAGER
/datum/job/pathfinder/get_request_reasons()
return list("Training crew", "Assembling expedition team")
@@ -90,41 +92,41 @@
/datum/job/explorer
title = "Explorer"
title = JOB_EXPLORER
flag = EXPLORER
departments = list(DEPARTMENT_PLANET)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 3
spawn_positions = 3
supervisors = "the Pathfinder" //CHOMPedit
supervisors = "the " + JOB_PATHFINDER //CHOMPedit
selection_color = "#999440"
economic_modifier = 6
pto_type = PTO_EXPLORATION
access = list(access_explorer, access_external_airlocks, access_eva)
minimal_access = list(access_explorer, access_external_airlocks, access_eva)
outfit_type = /decl/hierarchy/outfit/job/explorer2
job_description = "An Explorer searches for interesting things, and returns them to the station."
alt_titles = list("Surveyor" = /datum/alt_title/surveyor, "Offsite Scout" = /datum/alt_title/offsite_scout)
job_description = "An " + JOB_EXPLORER + " searches for interesting things, and returns them to the station."
alt_titles = list(JOB_ALT_SURVEYOR = /datum/alt_title/surveyor, JOB_ALT_OFFSITE_SCOUT = /datum/alt_title/offsite_scout)
/datum/alt_title/surveyor
title = "Surveyor"
title = JOB_ALT_SURVEYOR
/datum/alt_title/offsite_scout
title = "Offsite Scout"
title = JOB_ALT_OFFSITE_SCOUT
/datum/job/explorer/get_request_reasons()
return list("Assembling expedition team")
/datum/job/sar
title = "Field Medic"
title = JOB_FIELD_MEDIC
flag = SAR
departments = list(DEPARTMENT_PLANET, DEPARTMENT_MEDICAL)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Pathfinder" //CHOMPedit
supervisors = "the " + JOB_PATHFINDER //CHOMPedit
selection_color = "#999440"
economic_modifier = 6
minimal_player_age = 3
@@ -132,14 +134,14 @@
access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks,access_explorer) // CHOMPedit: No more pilot, surgery or chemistry access.
minimal_access = list(access_medical, access_medical_equip, access_morgue,access_explorer) // CHOMPedit: No more pilot access.
outfit_type = /decl/hierarchy/outfit/job/medical/sar
job_description = "A Field medic works as the field doctor of expedition teams."
alt_titles = list("Expedition Medic" = /datum/alt_title/expedition_medic, "Offsite Medic" = /datum/alt_title/offsite_medic)
job_description = "A " + JOB_FIELD_MEDIC + " works as the field doctor of expedition teams."
alt_titles = list(JOB_ALT_EXPEDITION_MEDIC = /datum/alt_title/expedition_medic, JOB_ALT_OFFSITE_MEDIC = /datum/alt_title/offsite_medic)
/datum/alt_title/expedition_medic
title = "Expedition Medic"
title = JOB_ALT_EXPEDITION_MEDIC
/datum/alt_title/offsite_medic
title = "Offsite Medic"
title = JOB_ALT_OFFSITE_MEDIC
/datum/job/sar/get_request_reasons()
return list("Assembling expedition team")

View File

@@ -7,7 +7,7 @@
var/list/access = list() // Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!)
var/flag = 0 // Bitflags for the job
var/department_flag = 0
var/faction = "None" // Players will be allowed to spawn in as jobs that are set to "Station"
var/faction = FACTION_NONE // Players will be allowed to spawn in as jobs that are set to FACTION_STATION
var/total_positions = 0 // How many players can be this job
var/spawn_positions = 0 // How many players can spawn in as this job
var/current_positions = 0 // How many players have this job

View File

@@ -2,16 +2,16 @@
// Chief Medical Officer
//////////////////////////////////
/datum/job/cmo
title = "Chief Medical Officer"
title = JOB_CHIEF_MEDICAL_OFFICER
flag = CMO
departments_managed = list(DEPARTMENT_MEDICAL)
departments = list(DEPARTMENT_MEDICAL, DEPARTMENT_COMMAND)
sorting_order = 2
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Site Manager"
supervisors = "the " + JOB_SITE_MANAGER
selection_color = "#026865"
req_admin_notify = 1
economic_modifier = 10
@@ -39,54 +39,54 @@
// Medical Doctor
//////////////////////////////////
/datum/job/doctor
title = "Medical Doctor"
title = JOB_MEDICAL_DOCTOR
flag = DOCTOR
departments = list(DEPARTMENT_MEDICAL)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 5
spawn_positions = 3
supervisors = "the Chief Medical Officer"
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 7
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_eva)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva)
outfit_type = /decl/hierarchy/outfit/job/medical/doctor
job_description = "A Medical Doctor is a Jack-of-All-Trades Medical title, covering a variety of skill levels and minor specializations. They are likely \
job_description = "A " + JOB_MEDICAL_DOCTOR + " is a Jack-of-All-Trades Medical title, covering a variety of skill levels and minor specializations. They are likely \
familiar with basic first aid, and a number of accompanying medications, and can generally save, if not cure, a majority of the \
patients they encounter."
alt_titles = list(
"Surgeon" = /datum/alt_title/surgeon,
"Emergency Physician" = /datum/alt_title/emergency_physician,
"Nurse" = /datum/alt_title/nurse,
"Virologist" = /datum/alt_title/virologist)
JOB_ALT_SURGEON = /datum/alt_title/surgeon,
JOB_ALT_EMERGENCY_PHYSICIAN = /datum/alt_title/emergency_physician,
JOB_ALT_NURSE = /datum/alt_title/nurse,
JOB_ALT_VIROLOGIST = /datum/alt_title/virologist)
min_age_by_species = list(SPECIES_PROMETHEAN = 3)
//Medical Doctor Alt Titles
/datum/alt_title/surgeon
title = "Surgeon"
title_blurb = "A Surgeon specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \
title = JOB_ALT_SURGEON
title_blurb = "A " + JOB_ALT_SURGEON + " specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \
to know the ins and outs of anesthesia and surgery."
title_outfit = /decl/hierarchy/outfit/job/medical/doctor/surgeon
/datum/alt_title/emergency_physician
title = "Emergency Physician"
title_blurb = "An Emergency Physician is a Medical professional trained for stabilizing and treating severely injured and/or dying patients. \
title = JOB_ALT_EMERGENCY_PHYSICIAN
title_blurb = "An " + JOB_ALT_EMERGENCY_PHYSICIAN + " is a Medical professional trained for stabilizing and treating severely injured and/or dying patients. \
They are generally the first response for any such individual brought to the Medbay, and can sometimes be expected to help their patients \
make a full recovery."
title_outfit = /decl/hierarchy/outfit/job/medical/doctor/emergency_physician
/datum/alt_title/nurse
title = "Nurse"
title_blurb = "A Nurse acts as a general purpose Doctor's Aide, providing basic care to non-critical patients, and stabilizing critical patients during \
busy periods. They frequently watch the suit sensors console, to help manage the time of other Doctors. In rare occasions, a Nurse can be \
title = JOB_ALT_NURSE
title_blurb = "A " + JOB_ALT_NURSE + " acts as a general purpose Doctor's Aide, providing basic care to non-critical patients, and stabilizing critical patients during \
busy periods. They frequently watch the suit sensors console, to help manage the time of other Doctors. In rare occasions, a " + JOB_ALT_NURSE + " can be \
called upon to revive deceased crew members."
title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse
/datum/alt_title/virologist
title = "Virologist"
title_blurb = "A Virologist cures active diseases in the crew, and prepares antibodies for possible infections. They also have the skills \
title = JOB_ALT_VIROLOGIST
title_blurb = "A " + JOB_ALT_VIROLOGIST + " cures active diseases in the crew, and prepares antibodies for possible infections. They also have the skills \
to produce the various types of virus foods or mutagens."
title_outfit = /decl/hierarchy/outfit/job/medical/doctor/virologist
@@ -95,14 +95,14 @@
// Chemist
//////////////////////////////////
/datum/job/chemist
title = "Chemist"
title = JOB_CHEMIST
flag = CHEMIST
departments = list(DEPARTMENT_MEDICAL)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Chief Medical Officer"
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 5
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
@@ -111,62 +111,62 @@
min_age_by_species = list(SPECIES_PROMETHEAN = 3)
outfit_type = /decl/hierarchy/outfit/job/medical/chemist
job_description = "A Chemist produces and maintains a stock of basic to advanced chemicals for medical and occasionally research use. \
job_description = "A " + JOB_CHEMIST + " produces and maintains a stock of basic to advanced chemicals for medical and occasionally research use. \
They are likely to know the use and dangers of many lab-produced chemicals."
alt_titles = list("Pharmacist" = /datum/alt_title/pharmacist)
alt_titles = list(JOB_ALT_PHARMACIST = /datum/alt_title/pharmacist)
// Chemist Alt Titles
/datum/alt_title/pharmacist
title = "Pharmacist"
title_blurb = "A Pharmacist focuses on the chemical needs of the Medical Department, and often offers to fill crew prescriptions at their discretion."
title = JOB_ALT_PHARMACIST
title_blurb = "A " + JOB_ALT_PHARMACIST + " focuses on the chemical needs of the Medical Department, and often offers to fill crew prescriptions at their discretion."
//////////////////////////////////
// Geneticist
//////////////////////////////////
/datum/job/geneticist
title = "Geneticist"
title = JOB_GENETICIST
flag = GENETICIST
departments = list(DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Chief Medical Officer and Research Director"
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER + " and " + JOB_RESEARCH_DIRECTOR
selection_color = "#013D3B"
economic_modifier = 7
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research)
minimal_access = list(access_medical, access_morgue, access_genetics, access_research)
outfit_type = /decl/hierarchy/outfit/job/medical/geneticist
job_description = "A Geneticist operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \
job_description = "A " + JOB_GENETICIST + " operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \
When required, geneticists have the skills to clone, and are the superior choice when available for doing so."
//////////////////////////////////
// Psychiatrist
//////////////////////////////////
/datum/job/psychiatrist
title = "Psychiatrist"
title = JOB_PSYCHIATRIST
flag = PSYCHIATRIST
departments = list(DEPARTMENT_MEDICAL)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
economic_modifier = 5
supervisors = "the Chief Medical Officer"
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
access = list(access_medical, access_medical_equip, access_morgue, access_psychiatrist)
minimal_access = list(access_medical, access_medical_equip, access_psychiatrist)
outfit_type = /decl/hierarchy/outfit/job/medical/psychiatrist
job_description = "A Psychiatrist provides mental health services to crew members in need. They may also be called upon to determine whatever \
job_description = "A " + JOB_PSYCHIATRIST + " provides mental health services to crew members in need. They may also be called upon to determine whatever \
ails the mentally unwell, frequently under Security supervision. They understand the effects of various psychoactive drugs."
alt_titles = list("Psychologist" = /datum/alt_title/psychologist)
alt_titles = list(JOB_ALT_PSYCHOLOGIST = /datum/alt_title/psychologist)
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_DIONA)
//Psychiatrist Alt Titles
/datum/alt_title/psychologist
title = "Psychologist"
title_blurb = "A Psychologist provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
title = JOB_ALT_PSYCHOLOGIST
title_blurb = "A " + JOB_ALT_PSYCHOLOGIST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
called upon to determine whatever ails the mentally unwell, frequently under Security supervision."
title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
@@ -174,29 +174,29 @@
// Paramedic
//////////////////////////////////
/datum/job/paramedic
title = "Paramedic"
title = JOB_PARAMEDIC
flag = PARAMEDIC
departments = list(DEPARTMENT_MEDICAL)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Chief Medical Officer"
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 5 //CHOMPstation edit - "Makes Parameds make as much as offduty medical."
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks)
outfit_type = /decl/hierarchy/outfit/job/medical/paramedic
job_description = "A Paramedic is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \
job_description = "A " + JOB_PARAMEDIC + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \
They may also be called upon to keep patients stable when Medical is busy or understaffed."
alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt)
alt_titles = list(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN = /datum/alt_title/emt)
banned_job_species = list(SPECIES_DIONA)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
// Paramedic Alt Titles
/datum/alt_title/emt
title = "Emergency Medical Technician"
title_blurb = "An Emergency Medical Technician is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
title = JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN
title_blurb = "An " + JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training."
title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt

View File

@@ -10,16 +10,16 @@
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter,//CHOMPEdit
access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, /*CHOMPEdit Removal"Healthcare Manager" = /datum/alt_title/healthcare_manager*/)
alt_titles = list(JOB_ALT_CHIEF_PHYSICIAN = /datum/alt_title/chief_physician, JOB_ALT_MEDICAL_DIRECTOR = /datum/alt_title/medical_director, /*CHOMPEdit RemovalJOB_ALT_HEALTHCARE_MANAGER = /datum/alt_title/healthcare_manager*/)
/datum/alt_title/chief_physician
title = "Chief Physician"
title = JOB_ALT_CHIEF_PHYSICIAN
/datum/alt_title/medical_director
title = "Medical Director"
title = JOB_ALT_MEDICAL_DIRECTOR
/datum/alt_title/healthcare_manager
title = "Healthcare Manager"
title = JOB_ALT_HEALTHCARE_MANAGER
/datum/job/cmo/get_request_reasons()
return list("Surgery pending", "Viral outbreak", "Training crew", "Assembling expedition team")
@@ -28,25 +28,25 @@
/datum/job/doctor
spawn_positions = 5
pto_type = PTO_MEDICAL
alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon,
"Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly,
"Virologist" = /datum/alt_title/virologist, "Medical Contractor" = /datum/alt_title/medical_contractor)
alt_titles = list(JOB_ALT_PHYSICIAN = /datum/alt_title/physician, JOB_ALT_MEDICAL_PRACTITIONER = /datum/alt_title/medical_practitioner, JOB_ALT_SURGEON = /datum/alt_title/surgeon,
JOB_ALT_EMERGENCY_PHYSICIAN = /datum/alt_title/emergency_physician, JOB_ALT_NURSE = /datum/alt_title/nurse, JOB_ALT_ORDERLY = /datum/alt_title/orderly,
JOB_ALT_VIROLOGIST = /datum/alt_title/virologist, JOB_ALT_MEDICAL_CONTRACTOR = /datum/alt_title/medical_contractor)
/datum/alt_title/physician
title = "Physician"
title = JOB_ALT_PHYSICIAN
/datum/alt_title/medical_practitioner
title = "Medical Practitioner"
title = JOB_ALT_MEDICAL_PRACTITIONER
/datum/alt_title/orderly
title = "Orderly"
title_blurb = "An Orderly acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \
title = JOB_ALT_ORDERLY
title_blurb = "An " + JOB_ALT_ORDERLY + " acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \
and dirty labor around the department."
title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse
/datum/alt_title/medical_contractor
title = "Medical Contractor"
title_blurb = "A Medical Contractor can be anything from a full-blown doctor to the likes of a nurse or orderly, but isn't directly employed by NT proper."
title = JOB_ALT_MEDICAL_CONTRACTOR
title_blurb = "A " + JOB_ALT_MEDICAL_CONTRACTOR + " can be anything from a full-blown doctor to the likes of a nurse or orderly, but isn't directly employed by NT proper."
/datum/job/doctor/get_request_reasons()
return list("Surgery pending", "Viral outbreak", "Assembling expedition team")
@@ -54,45 +54,45 @@
/datum/job/chemist
pto_type = PTO_MEDICAL
alt_titles = list("Pharmacist" = /datum/alt_title/pharmacist, "Pharmacologist" = /datum/alt_title/pharmacologist)
alt_titles = list(JOB_ALT_PHARMACIST = /datum/alt_title/pharmacist, JOB_ALT_PHARMACOLOGIST = /datum/alt_title/pharmacologist)
/datum/alt_title/pharmacologist
title = "Pharmacologist"
title_blurb = "A Pharmacologist focuses on the chemical needs of the Medical Department, primarily specializing in producing more advanced forms of medicine."
title = JOB_ALT_PHARMACOLOGIST
title_blurb = "A " + JOB_ALT_PHARMACOLOGIST + " focuses on the chemical needs of the Medical Department, primarily specializing in producing more advanced forms of medicine."
/datum/job/psychiatrist
pto_type = PTO_MEDICAL
alt_titles = list("Psychologist" = /datum/alt_title/psychologist, "Psychoanalyst" = /datum/alt_title/psychoanalyst, "Psychotherapist" = /datum/alt_title/psychotherapist)
alt_titles = list(JOB_ALT_PSYCHOLOGIST = /datum/alt_title/psychologist, JOB_ALT_PSYCHOANALYST = /datum/alt_title/psychoanalyst, JOB_ALT_PSYCHOTHERAPIST = /datum/alt_title/psychotherapist)
/datum/alt_title/psychoanalyst
title = "Psychoanalyst"
title_blurb = "A Psychoanalyst provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
title = JOB_ALT_PSYCHOANALYST
title_blurb = "A " + JOB_ALT_PSYCHOANALYST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
called upon to determine whatever ails the mentally unwell, frequently under Security supervision."
title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
/datum/alt_title/psychotherapist
title = "Psychotherapist"
title_blurb = "A Psychotherapist provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
title = JOB_ALT_PSYCHOTHERAPIST
title_blurb = "A " + JOB_ALT_PSYCHOTHERAPIST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \
called upon to determine whatever ails the mentally unwell, frequently under Security supervision."
title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist
/datum/job/paramedic
pto_type = PTO_MEDICAL
alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder) //CHOMPedit: Removed SAR because that's an actual job here
alt_titles = list(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN = /datum/alt_title/emt, JOB_ALT_MEDICAL_RESPONDER = /datum/alt_title/medical_responder) //CHOMPedit: Removed SAR because that's an actual job here
// total_positions = 3 //CHOMP Remove these two lines were added by the Virgo Explo Removal, because I guess they wanted more station paramedics because no more field medics on their code
// spawn_positions = 3 //CHOMP Remove ^
/datum/alt_title/medical_responder
title = "Medical Responder"
title_blurb = "A Medical Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
title = JOB_ALT_MEDICAL_RESPONDER
title_blurb = "A " + JOB_ALT_MEDICAL_RESPONDER + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \
own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training."
title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt
/* //CHOMPedit: Commented out because this is an actual job here
/datum/alt_title/sar
title = "Search and Rescue"
title = "JOB_SEARCH_AND_RESCUE // CHOMPEdit
*/
/datum/job/paramedic/get_request_reasons()

View File

@@ -3,11 +3,11 @@
//
/datum/job/offduty_civilian
title = "Off-duty Worker"
title = JOB_OFFDUTY_WORKER
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#9b633e"
@@ -19,11 +19,11 @@
economic_modifier = 2
/datum/job/offduty_cargo
title = "Off-duty Cargo"
title = JOB_OFFDUTY_CARGO
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#9b633e"
@@ -35,11 +35,11 @@
economic_modifier = 2
/datum/job/offduty_engineering
title = "Off-duty Engineer"
title = JOB_OFFDUTY_ENGINEER
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#5B4D20"
@@ -51,11 +51,11 @@
economic_modifier = 5
/datum/job/offduty_medical
title = "Off-duty Medic"
title = JOB_OFFDUTY_MEDIC
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#013D3B"
@@ -67,11 +67,11 @@
economic_modifier = 5
/datum/job/offduty_science
title = "Off-duty Scientist"
title = JOB_OFFDUTY_SCIENTIST
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#633D63"
@@ -83,11 +83,11 @@
economic_modifier = 5
/datum/job/offduty_security
title = "Off-duty Officer"
title = JOB_OFFDUTY_OFFICER
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#601C1C"
@@ -99,11 +99,11 @@
economic_modifier = 5
/datum/job/offduty_exploration
title = "Off-duty Explorer"
title = JOB_OFFDUTY_EXPLORER
latejoin_only = TRUE
timeoff_factor = -1
total_positions = -1
faction = "Station"
faction = FACTION_STATION
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#999440"

View File

@@ -2,16 +2,16 @@
// Research Director
//////////////////////////////////
/datum/job/rd
title = "Research Director"
title = JOB_RESEARCH_DIRECTOR
flag = RD
departments_managed = list(DEPARTMENT_RESEARCH)
departments = list(DEPARTMENT_RESEARCH, DEPARTMENT_COMMAND)
sorting_order = 2
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Site Manager"
supervisors = "the " + JOB_SITE_MANAGER
selection_color = "#AD6BAD"
req_admin_notify = 1
economic_modifier = 15
@@ -33,29 +33,29 @@
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital")
outfit_type = /decl/hierarchy/outfit/job/science/rd
job_description = "The Research Director manages and maintains the Research department. They are required to ensure the safety of the entire crew, \
job_description = "The " + JOB_RESEARCH_DIRECTOR + " manages and maintains the Research department. They are required to ensure the safety of the entire crew, \
at least with regards to anything occurring in the Research department, and to inform the crew of any disruptions that \
might originate from Research. The Research Director often has at least passing knowledge of most of the Research department, but \
might originate from Research. The " + JOB_RESEARCH_DIRECTOR + " often has at least passing knowledge of most of the Research department, but \
are encouraged to allow their staff to perform their own duties."
alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor)
alt_titles = list(JOB_ALT_RESEARCH_SUPERVISOR = /datum/alt_title/research_supervisor)
// Research Director Alt Titles
// " + JOB_RESEARCH_DIRECTOR + " Alt Titles
/datum/alt_title/research_supervisor
title = "Research Supervisor"
title = JOB_ALT_RESEARCH_SUPERVISOR
//////////////////////////////////
// Scientist
//////////////////////////////////
/datum/job/scientist
title = "Scientist"
title = JOB_SCIENTIST
flag = SCIENTIST
departments = list(DEPARTMENT_RESEARCH)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 5
spawn_positions = 3
supervisors = "the Research Director"
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
@@ -66,41 +66,41 @@
minimal_player_age = 3
outfit_type = /decl/hierarchy/outfit/job/science/scientist
job_description = "A Scientist is a generalist working in the Research department, with general knowledge of the scientific process, as well as \
job_description = "A " + JOB_SCIENTIST + " is a generalist working in the Research department, with general knowledge of the scientific process, as well as \
the principles and requirements of Research and Development. They may also formulate experiments of their own devising, if \
they find an appropriate topic."
alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Anomalist" = /datum/alt_title/anomalist, \
"Phoron Researcher" = /datum/alt_title/phoron_research)
alt_titles = list(JOB_ALT_XENOARCHAEOLOGIST = /datum/alt_title/xenoarch, JOB_ALT_ANOMALIST = /datum/alt_title/anomalist, \
JOB_ALT_PHORON_RESEARCHER = /datum/alt_title/phoron_research)
// Scientist Alt Titles
/datum/alt_title/xenoarch
title = "Xenoarchaeologist"
title_blurb = "A Xenoarchaeologist enters digsites in search of artifacts of alien origin. These digsites are frequently in vacuum or other inhospitable \
locations, and as such a Xenoarchaeologist should be prepared to handle hostile evironmental conditions."
title = JOB_ALT_XENOARCHAEOLOGIST
title_blurb = "A " + JOB_ALT_XENOARCHAEOLOGIST + " enters digsites in search of artifacts of alien origin. These digsites are frequently in vacuum or other inhospitable \
locations, and as such a " + JOB_ALT_XENOARCHAEOLOGIST + " should be prepared to handle hostile evironmental conditions."
/datum/alt_title/anomalist
title = "Anomalist"
title_blurb = "An Anomalist is a Scientist whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \
function. They work closely with Xenoarchaeologists, or Miners, if either role is present."
title = JOB_ALT_ANOMALIST
title_blurb = "An " + JOB_ALT_ANOMALIST + " is a " + JOB_SCIENTIST + " whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \
function. They work closely with " + JOB_ALT_XENOARCHAEOLOGIST + "s, or Miners, if either role is present."
/datum/alt_title/phoron_research
title = "Phoron Researcher"
title_blurb = "A Phoron Researcher is a specialist in the practical applications of phoron, and has knowledge of its practical uses and dangers. \
Many Phoron Researchers are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \
title = JOB_ALT_PHORON_RESEARCHER
title_blurb = "A " + JOB_ALT_PHORON_RESEARCHER + " is a specialist in the practical applications of phoron, and has knowledge of its practical uses and dangers. \
Many " + JOB_ALT_PHORON_RESEARCHER + "s are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \
of working with the substance in that state."
//////////////////////////////////
// Xenobiologist
//////////////////////////////////
/datum/job/xenobiologist
title = "Xenobiologist"
title = JOB_XENOBIOLOGIST
flag = XENOBIOLOGIST
departments = list(DEPARTMENT_RESEARCH)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
supervisors = "the Research Director"
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_hydroponics)
@@ -111,15 +111,15 @@
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist
job_description = "A Xenobiologist studies esoteric lifeforms, usually in the relative safety of their lab. They attempt to find ways to benefit \
job_description = "A " + JOB_XENOBIOLOGIST + " studies esoteric lifeforms, usually in the relative safety of their lab. They attempt to find ways to benefit \
from the byproducts of these lifeforms, and their main subject at present is the Giant Slime."
/*VR edit start
alt_titles = list("Xenobotanist" = /datum/alt_title/xenobot)
alt_titles = list(JOB_XENOBOTANIST = /datum/alt_title/xenobot)
Xenibiologist Alt Titles
/datum/alt_title/xenobot
title = "Xenobotanist"
title_blurb = "A Xenobotanist grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \
title = JOB_XENOBOTANIST
title_blurb = "A " + JOB_XENOBOTANIST + " grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \
is both safe and beneficial to the station, they may choose to introduce it to the rest of the crew."
VR edit end*/
@@ -127,14 +127,14 @@ VR edit end*/
// Roboticist
//////////////////////////////////
/datum/job/roboticist
title = "Roboticist"
title = JOB_ROBOTICIST
flag = ROBOTICIST
departments = list(DEPARTMENT_RESEARCH)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Research Director"
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 5
access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
@@ -144,17 +144,17 @@ VR edit end*/
banned_job_species = list("digital")
outfit_type = /decl/hierarchy/outfit/job/science/roboticist
job_description = "A Roboticist maintains and repairs the station's synthetics, including crew with prosthetic limbs. \
job_description = "A " + JOB_ROBOTICIST + " maintains and repairs the station's synthetics, including crew with prosthetic limbs. \
They can also assist the station by producing simple robots and even pilotable exosuits."
alt_titles = list("Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech)
alt_titles = list(JOB_ALT_BIOMECHANICAL_ENGINEER = /datum/alt_title/biomech, JOB_ALT_MECHATRONIC_ENGINEER = /datum/alt_title/mech_tech)
// Roboticist Alt Titles
/datum/alt_title/biomech
title = "Biomechanical Engineer"
title_blurb = "A Biomechanical Engineer primarily works on prosthetics, and the organic parts attached to them. They may have some \
title = JOB_ALT_BIOMECHANICAL_ENGINEER
title_blurb = "A " + JOB_ALT_BIOMECHANICAL_ENGINEER + " primarily works on prosthetics, and the organic parts attached to them. They may have some \
knowledge of the relatively simple surgical procedures used in making cyborgs and attaching prosthesis."
/datum/alt_title/mech_tech
title = "Mechatronic Engineer"
title_blurb = "A Mechatronic Engineer focuses on the construction and maintenance of Exosuits, and should be well versed in their use. \
title = JOB_ALT_MECHATRONIC_ENGINEER
title_blurb = "A " + JOB_ALT_MECHATRONIC_ENGINEER + " focuses on the construction and maintenance of Exosuits, and should be well versed in their use. \
They may also be called upon to work on synthetics and prosthetics, if needed."

View File

@@ -13,17 +13,17 @@
access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network,
access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany
alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager,
"Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist)
alt_titles = list(JOB_ALT_RESEARCH_SUPERVISOR = /datum/alt_title/research_supervisor, JOB_ALT_RESEARCH_MANAGER = /datum/alt_title/research_manager,
JOB_ALT_HEAD_OF_DEVELOPMENT = /datum/alt_title/head_of_development,JOB_ALT_HEAD_SCIENTIST = /datum/alt_title/head_scientist)
/datum/alt_title/research_manager
title = "Research Manager"
title = JOB_ALT_RESEARCH_MANAGER
/datum/alt_title/head_of_development
title = "Head of Development"
title = JOB_ALT_HEAD_OF_DEVELOPMENT
/datum/alt_title/head_scientist
title = "Head Scientist"
title = JOB_ALT_HEAD_SCIENTIST
/datum/job/rd/get_request_reasons()
return list("Repairs needed", "Training crew", "Assembling expedition team")
@@ -31,41 +31,41 @@
/datum/job/scientist
spawn_positions = 5
pto_type = PTO_SCIENCE
alt_titles = list("Researcher" = /datum/alt_title/researcher, "Lab Assistant" = /datum/alt_title/lab_assistant, "Xenoarchaeologist" = /datum/alt_title/xenoarch,
"Xenopaleontologist" = /datum/alt_title/xenopaleontologist, "Anomalist" = /datum/alt_title/anomalist, "Phoron Researcher" = /datum/alt_title/phoron_research,
"Gas Physicist" = /datum/alt_title/gas_physicist, "Circuit Designer" = /datum/alt_title/circuit_designer, "Circuit Programmer" = /datum/alt_title/circuit_programmer)
alt_titles = list(JOB_ALT_RESEARCHER = /datum/alt_title/researcher, JOB_ALT_LAB_ASSISTANT = /datum/alt_title/lab_assistant, JOB_ALT_XENOARCHAEOLOGIST = /datum/alt_title/xenoarch,
JOB_ALT_XENOPALEONTOLOGIST = /datum/alt_title/xenopaleontologist, JOB_ALT_ANOMALIST = /datum/alt_title/anomalist, JOB_ALT_PHORON_RESEARCHER = /datum/alt_title/phoron_research,
JOB_ALT_GAS_PHYSICIST = /datum/alt_title/gas_physicist, JOB_ALT_CIRCUIT_DESIGNER = /datum/alt_title/circuit_designer, JOB_ALT_CIRCUIT_PROGRAMMER = /datum/alt_title/circuit_programmer)
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany)
minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch) // Unchanged (for now?), mostly here for reference
/datum/alt_title/researcher
title = "Researcher"
title = JOB_ALT_RESEARCHER
/datum/alt_title/lab_assistant
title = "Lab Assistant"
title_blurb = "A Lab Assistant is a lower-level member of research staff, whose main purpose is to help scientists with their specialized work in more menial fashion, while also \
title = JOB_ALT_LAB_ASSISTANT
title_blurb = "A " + JOB_ALT_LAB_ASSISTANT + " is a lower-level member of research staff, whose main purpose is to help scientists with their specialized work in more menial fashion, while also \
learning the specializations in process."
/datum/alt_title/xenopaleontologist
title = "Xenopaleontologist"
title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \
locations, and as such a Xenopaleontologist should be prepared to handle hostile evironmental conditions."
title = JOB_ALT_XENOPALEONTOLOGIST
title_blurb = "A " + JOB_ALT_XENOPALEONTOLOGIST + " enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \
locations, and as such a " + JOB_ALT_XENOPALEONTOLOGIST + " should be prepared to handle hostile evironmental conditions."
/datum/alt_title/gas_physicist
title = "Gas Physicist"
title_blurb = "A Gas Physicist is a specialist in various practical applications of gasses, but currently focuses their attention on phoron, and has knowledge of its practical uses and dangers. \
Many Gas Physicists are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \
title = JOB_ALT_GAS_PHYSICIST
title_blurb = "A " + JOB_ALT_GAS_PHYSICIST + " is a specialist in various practical applications of gasses, but currently focuses their attention on phoron, and has knowledge of its practical uses and dangers. \
Many " + JOB_ALT_GAS_PHYSICIST + "s are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \
of working with the substance in that state."
/datum/alt_title/circuit_designer
title = "Circuit Designer"
title_blurb = "A Circuit Designer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \
title = JOB_ALT_CIRCUIT_DESIGNER
title_blurb = "A " + JOB_ALT_CIRCUIT_DESIGNER + " is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \
They work to create various useful devices using the capabilities of integrated circuitry."
/datum/alt_title/circuit_programmer
title = "Circuit Programmer"
title_blurb = "A Circuit Programmer is a Scientist whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \
title = JOB_ALT_CIRCUIT_PROGRAMMER
title_blurb = "A " + JOB_ALT_CIRCUIT_PROGRAMMER + " is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \
They work to create various useful devices using the capabilities of integrated circuitry."
/datum/job/scientist/get_request_reasons()
@@ -74,23 +74,23 @@
/datum/job/xenobiologist
spawn_positions = 3
pto_type = PTO_SCIENCE
alt_titles = list("Xenozoologist" = /datum/alt_title/xenozoologist, "Xenoanthropologist" = /datum/alt_title/xenoanthropologist)
alt_titles = list(JOB_ALT_XENOZOOLOGIST = /datum/alt_title/xenozoologist, JOB_ALT_XENOANTHROPOLOGIST = /datum/alt_title/xenoanthropologist)
/datum/alt_title/xenozoologist
title = "Xenozoologist"
title = JOB_ALT_XENOZOOLOGIST
/datum/alt_title/xenoanthropologist
title = "Xenoanthropologist"
title_blurb = "Xenoanthropologist still heavily focuses their study on alien lifeforms, but their specialty leans more towards fellow sapient beings than simple animals."
title = JOB_ALT_XENOANTHROPOLOGIST
title_blurb = JOB_ALT_XENOANTHROPOLOGIST + " still heavily focuses their study on alien lifeforms, but their specialty leans more towards fellow sapient beings than simple animals."
/datum/job/roboticist
total_positions = 3
pto_type = PTO_SCIENCE
alt_titles = list("Assembly Technician" = /datum/alt_title/assembly_tech, "Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech)
alt_titles = list(JOB_ALT_ASSEMBLY_TECHNICIAN = /datum/alt_title/assembly_tech, JOB_ALT_BIOMECHANICAL_ENGINEER = /datum/alt_title/biomech, JOB_ALT_MECHATRONIC_ENGINEER = /datum/alt_title/mech_tech)
/datum/alt_title/assembly_tech
title = "Assembly Technician"
title = JOB_ALT_ASSEMBLY_TECHNICIAN
/datum/job/roboticist/get_request_reasons()
return list("Repairs needed")
@@ -99,14 +99,14 @@
// Xenobotanist
//////////////////////////////////
/datum/job/xenobotanist
title = "Xenobotanist"
title = JOB_XENOBOTANIST
flag = XENOBOTANIST
departments = list(DEPARTMENT_RESEARCH)
department_flag = MEDSCI
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Research Director"
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobotany, access_hydroponics, access_xenobiology) //CHOMPS KSC 9/2/2020 - Added "access_xenobiology" to their access so they can enter Xenobotany.
@@ -116,12 +116,12 @@
minimal_player_age = 14
outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist
job_description = "A Xenobotanist grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \
job_description = "A " + JOB_XENOBOTANIST + " grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \
are both safe and beneficial to the station, they may choose to introduce it to the rest of the crew."
alt_titles = list("Xenohydroponicist" = /datum/alt_title/xenohydroponicist, "Xenoflorist" = /datum/alt_title/xenoflorist)
alt_titles = list(JOB_ALT_XENOHYDROPONICIST = /datum/alt_title/xenohydroponicist, JOB_ALT_XENOFLORIST = /datum/alt_title/xenoflorist)
/datum/alt_title/xenoflorist
title = "Xenoflorist"
title = JOB_ALT_XENOFLORIST
/datum/alt_title/xenohydroponicist
title = "Xenohydroponicist"
title = JOB_ALT_XENOHYDROPONICIST

View File

@@ -2,16 +2,16 @@
// Head of Security
//////////////////////////////////
/datum/job/hos
title = "Head of Security"
title = JOB_HEAD_OF_SECURITY
flag = HOS
departments_managed = list(DEPARTMENT_SECURITY)
departments = list(DEPARTMENT_SECURITY, DEPARTMENT_COMMAND)
sorting_order = 2
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Site Manager"
supervisors = "the " + JOB_SITE_MANAGER
selection_color = "#8E2929"
req_admin_notify = 1
economic_modifier = 10
@@ -31,18 +31,18 @@
banned_job_species = list(SPECIES_TESHARI, SPECIES_DIONA, SPECIES_PROMETHEAN, SPECIES_ZADDAT, "digital", SPECIES_UNATHI, "mechanical")
outfit_type = /decl/hierarchy/outfit/job/security/hos
job_description = " The Head of Security manages the Security Department, keeping the station safe and making sure the rules are followed. They are expected to \
job_description = " The " + JOB_HEAD_OF_SECURITY + " manages the Security Department, keeping the station safe and making sure the rules are followed. They are expected to \
keep the other Department Heads, and the rest of the crew, aware of developing situations that may be a threat. If necessary, the HoS may \
perform the duties of absent Security roles, such as distributing gear from the Armory."
alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief)
alt_titles = list(JOB_ALT_SECURITY_COMMANDER = /datum/alt_title/sec_commander, JOB_ALT_CHIEF_OF_SECURITY = /datum/alt_title/sec_chief)
// Head of Security Alt Titles
/datum/alt_title/sec_commander
title = "Security Commander"
title = JOB_ALT_SECURITY_COMMANDER
/datum/alt_title/sec_chief
title = "Chief of Security"
title = JOB_ALT_CHIEF_OF_SECURITY
//YW ADDITION START: LOYALTY IMPLANT FOR HOS
/datum/job/hos/equip(var/mob/living/carbon/human/H)
@@ -52,15 +52,15 @@
//YW ADDITION END
/datum/job/warden
title = "Warden"
title = JOB_WARDEN
flag = WARDEN
departments = list(DEPARTMENT_SECURITY)
sorting_order = 1
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the Head of Security"
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
economic_modifier = 5
access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_morgue, access_external_airlocks)
@@ -69,23 +69,23 @@
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_DIONA)
outfit_type = /decl/hierarchy/outfit/job/security/warden
job_description = "The Warden watches over the physical Security Department, making sure the Brig and Armoury are secure and in order at all times. They oversee \
prisoners that have been processed and brigged, and are responsible for their well being. The Warden is also in charge of distributing \
Armoury gear in a crisis, and retrieving it when the crisis has passed. In an emergency, the Warden may be called upon to direct the \
job_description = "The " + JOB_WARDEN + " watches over the physical Security Department, making sure the Brig and Armoury are secure and in order at all times. They oversee \
prisoners that have been processed and brigged, and are responsible for their well being. The " + JOB_WARDEN + " is also in charge of distributing \
Armoury gear in a crisis, and retrieving it when the crisis has passed. In an emergency, the " + JOB_WARDEN + " may be called upon to direct the \
Security Department as a whole."
//////////////////////////////////
// Detective
//////////////////////////////////
/datum/job/detective
title = "Detective"
title = JOB_DETECTIVE
flag = DETECTIVE
departments = list(DEPARTMENT_SECURITY)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the Head of Security"
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks, access_brig) //Vorestation edit - access_brig
minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
@@ -94,28 +94,28 @@
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_DIONA)
outfit_type = /decl/hierarchy/outfit/job/security/detective
job_description = "A Detective works to help Security find criminals who have not properly been identified, through interviews and forensic work. \
job_description = "A " + JOB_DETECTIVE + " works to help Security find criminals who have not properly been identified, through interviews and forensic work. \
For crimes only witnessed after the fact, or those with no survivors, they attempt to piece together what they can from pure evidence."
alt_titles = list("Forensic Technician" = /datum/alt_title/forensic_tech)
alt_titles = list(JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech)
// Detective Alt Titles
/datum/alt_title/forensic_tech
title = "Forensic Technician"
title_blurb = "A Forensic Technician works more with hard evidence and labwork than a Detective, but they share the purpose of solving crimes."
title = JOB_ALT_FORENSIC_TECHNICIAN
title_blurb = "A " + JOB_ALT_FORENSIC_TECHNICIAN + " works more with hard evidence and labwork than a " + JOB_DETECTIVE + ", but they share the purpose of solving crimes."
title_outfit = /decl/hierarchy/outfit/job/security/detective/forensic
//////////////////////////////////
// Security Officer
//////////////////////////////////
/datum/job/officer
title = "Security Officer"
title = JOB_SECURITY_OFFICER
flag = OFFICER
departments = list(DEPARTMENT_SECURITY)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 4
spawn_positions = 4
supervisors = "the Head of Security"
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
economic_modifier = 5 //CHOMPstation edit - "Offduty officers make more than working, and this brings it in line with the rest of the jobs in sec barring HOS"
access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks)
@@ -124,16 +124,16 @@
banned_job_species = list(SPECIES_ZADDAT, SPECIES_TESHARI, SPECIES_DIONA)
outfit_type = /decl/hierarchy/outfit/job/security/officer
job_description = "A Security Officer is concerned with maintaining the safety and security of the station as a whole, dealing with external threats and \
apprehending criminals. A Security Officer is responsible for the health, safety, and processing of any prisoner they arrest. \
job_description = "A " + JOB_SECURITY_OFFICER + " is concerned with maintaining the safety and security of the station as a whole, dealing with external threats and \
apprehending criminals. A " + JOB_SECURITY_OFFICER + " is responsible for the health, safety, and processing of any prisoner they arrest. \
No one is above the Law, not Security or Command."
alt_titles = list("Junior Officer" = /datum/alt_title/junior_officer)
alt_titles = list(JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer)
min_age_by_species = list(SPECIES_PROMETHEAN = 3)
// Security Officer Alt Titles
/datum/alt_title/junior_officer
title = "Junior Officer"
title_blurb = "A Junior Officer is an inexperienced Security Officer. They likely have training, but not experience, and are frequently \
title = JOB_ALT_JUNIOR_OFFICER
title_blurb = "A " + JOB_ALT_JUNIOR_OFFICER + " is an inexperienced " + JOB_SECURITY_OFFICER + ". They likely have training, but not experience, and are frequently \
paired off with a more senior co-worker. Junior Officers may also be expected to take over the boring duties of other Officers \
including patrolling the station or maintaining specific posts."

View File

@@ -11,10 +11,10 @@
access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm.
alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief, "Security Manager" = /datum/alt_title/security_manager)
alt_titles = list(JOB_ALT_SECURITY_COMMANDER = /datum/alt_title/sec_commander, JOB_ALT_CHIEF_OF_SECURITY = /datum/alt_title/sec_chief, JOB_ALT_SECURITY_MANAGER = /datum/alt_title/security_manager)
/datum/alt_title/security_manager
title = "Security Manager"
title = JOB_ALT_SECURITY_MANAGER
/datum/job/hos/get_request_reasons()
return list("Wildlife management", "Forensic investigation", "Training crew", "Assembling expedition team")
@@ -23,13 +23,16 @@
/datum/job/warden
pto_type = PTO_SECURITY
dept_time_required = 20
alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent)
alt_titles = list(JOB_ALT_BRIG_SENTRY = /datum/alt_title/brig_sentry, JOB_ALT_ARMORY_SUPERINTENDENT = /datum/alt_title/armory_superintendent, JOB_ALT_MASTERATARMS = /datum/alt_title/master_at_arms)
/datum/alt_title/brig_sentry
title = "Brig Sentry"
title = JOB_ALT_BRIG_SENTRY
/datum/alt_title/armory_superintendent
title = "Armory Superintendent"
title = JOB_ALT_ARMORY_SUPERINTENDENT
/datum/alt_title/master_at_arms
title = JOB_ALT_MASTERATARMS
/datum/job/warden/get_request_reasons()
return list("Wildlife management")
@@ -37,13 +40,13 @@
/datum/job/detective
pto_type = PTO_SECURITY
alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, "Forensic Technician" = /datum/alt_title/forensic_tech)
alt_titles = list(JOB_ALT_INVESTIGATOR = /datum/alt_title/investigator, JOB_ALT_SECURITY_INSPECTOR = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech)
/datum/alt_title/investigator
title = "Investigator"
title = JOB_ALT_INVESTIGATOR
/datum/alt_title/security_inspector
title = "Security Inspector"
title = JOB_ALT_SECURITY_INSPECTOR
/datum/job/detective/get_request_reasons()
return list("Forensic investigation")
@@ -53,20 +56,20 @@
total_positions = 5
spawn_positions = 5
pto_type = PTO_SECURITY
alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard,
"Security Deputy" = /datum/alt_title/security_guard, "Junior Officer" = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor)
alt_titles = list(JOB_ALT_PATROL_OFFICER = /datum/alt_title/patrol_officer, JOB_ALT_SECURITY_GUARD = /datum/alt_title/security_guard,
JOB_ALT_SECURITY_DEPUTY = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, JOB_ALT_SECURITY_CONTRACTOR = /datum/alt_title/security_contractor)
/datum/alt_title/patrol_officer
title = "Patrol Officer"
title = JOB_ALT_PATROL_OFFICER
/datum/alt_title/security_guard
title = "Security Guard"
title = JOB_ALT_SECURITY_GUARD
/datum/alt_title/security_deputy
title = "Security Deputy"
title = JOB_ALT_SECURITY_DEPUTY
/datum/alt_title/security_contractor
title = "Security Contractor"
title = JOB_ALT_SECURITY_CONTRACTOR
/datum/job/officer/get_request_reasons()
return list("Wildlife management", "Assembling expedition team")

View File

@@ -15,7 +15,7 @@
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_external_airlocks, access_secpilot)
/datum/job/security/pilot
title = "Security Pilot"
title = JOB_SECURITY_PILOT
flag = SECPILOT
departments = list(DEPARTMENT_SECURITY)
department_flag = ENGSEC
@@ -32,8 +32,8 @@
pto_type = PTO_SECURITY
job_description = "Tasked with flying, operating, and sometimes even maintaining small spacecraft and personal exosuits such as the Durand or Gygax, \
Security Pilots are responsible for transporting criminals to more permanent holding facilities, and patrolling \
" + JOB_SECURITY_PILOT + "s are responsible for transporting criminals to more permanent holding facilities, and patrolling \
for potential threats to their workplace. They may also be expected to step in to standard Security duties if \
there's a shortage of regular officers."
// alt_titles = list("Mech Operator" = /datum/alt_title/sec_mech_operator)
// alt_titles = list("Mech Operator" = /datum/alt_title/sec_mech_operator)

View File

@@ -2,12 +2,12 @@
// AI
//////////////////////////////////
/datum/job/ai
title = "AI"
title = JOB_AI
flag = AI
departments = list(DEPARTMENT_SYNTHETIC)
sorting_order = 1 // Be above their borgs.
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 0 // Not used for AI, see is_position_available below and modules/mob/living/silicon/ai/latejoin.dm
spawn_positions = 1
selection_color = "#3F823F"
@@ -20,9 +20,9 @@
assignable = FALSE
mob_type = JOB_SILICON_AI
outfit_type = /decl/hierarchy/outfit/job/silicon/ai
job_description = "The AI oversees the operation of the station and its crew, but has no real authority over them. \
The AI is required to follow its Laws, and Lawbound Synthetics that are linked to it are expected to follow \
the AI's commands, and their own Laws."
job_description = "The " + JOB_AI + " oversees the operation of the station and its crew, but has no real authority over them. \
The " + JOB_AI + " is required to follow its Laws, and Lawbound Synthetics that are linked to it are expected to follow \
the " + JOB_AI + "'s commands, and their own Laws."
// AI procs
/datum/job/ai/equip(var/mob/living/carbon/human/H)
@@ -41,14 +41,14 @@
// Cyborg
//////////////////////////////////
/datum/job/cyborg
title = "Cyborg"
title = JOB_CYBORG
flag = CYBORG
departments = list(DEPARTMENT_SYNTHETIC)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "your Laws and the AI" //Nodrak
supervisors = "your Laws and the " + JOB_AI //Nodrak
selection_color = "#254C25"
minimal_player_age = 1
account_allowed = 0
@@ -57,18 +57,18 @@
assignable = FALSE
mob_type = JOB_SILICON_ROBOT
outfit_type = /decl/hierarchy/outfit/job/silicon/cyborg
job_description = "A Cyborg is a mobile station synthetic, piloted by a cybernetically preserved brain. It is considered a person, but is still required \
job_description = "A " + JOB_CYBORG + " is a mobile station synthetic, piloted by a cybernetically preserved brain. It is considered a person, but is still required \
to follow its Laws."
alt_titles = list("Robot" = /datum/alt_title/robot, "Drone" = /datum/alt_title/drone)
alt_titles = list(JOB_ALT_ROBOT = /datum/alt_title/robot, JOB_ALT_DRONE = /datum/alt_title/drone)
// Cyborg Alt Titles
/datum/alt_title/robot
title = "Robot"
title = JOB_ALT_ROBOT
title_blurb = "A Robot is a mobile station synthetic, piloted by an advanced piece of technology called a Positronic Brain. It is considered a person, \
legally, but is required to follow its Laws."
/datum/alt_title/drone
title = "Drone"
title = JOB_ALT_DRONE
title_blurb = "A Drone is a mobile station synthetic, piloted by a simple computer-based AI. As such, it is not a person, but rather an expensive and \
and important piece of station property, and is expected to follow its Laws."

View File

@@ -2,7 +2,7 @@
title = "CentCom Officer"
departments = list("Central Command")
department_accounts = list(DEPARTMENT_COMMAND, DEPARTMENT_ENGINEERING, DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH, DEPARTMENT_SECURITY, DEPARTMENT_CARGO, DEPARTMENT_PLANET, DEPARTMENT_CIVILIAN)
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 1
supervisors = "company officials and Corporate Regulations"
@@ -77,7 +77,7 @@
title = "Emergency Responder"
departments = list("Central Command")
department_accounts = list(DEPARTMENT_COMMAND, DEPARTMENT_ENGINEERING, DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH, DEPARTMENT_SECURITY, DEPARTMENT_CARGO, DEPARTMENT_PLANET, DEPARTMENT_CIVILIAN)
faction = "Station"
faction = FACTION_STATION
total_positions = 2
spawn_positions = 1
supervisors = "company officials and Corporate Regulations"
@@ -100,29 +100,29 @@
return get_all_accesses().Copy()
/* CHOMPEDIT: Removing Clown/Mime job from being initialized at all (These are alt titles of Entertainer on our codebase)
/datum/job/clown
title = "Clown"
title = JOB_CLOWN
flag = CLOWN
departments = list(DEPARTMENT_CIVILIAN)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
spawn_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
supervisors = "the spirit of laughter"
selection_color = "#515151"
economic_modifier = 1
job_description = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
job_description = "A " + JOB_CLOWN + " is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
whitelist_only = 1
latejoin_only = 0
requestable = FALSE
outfit_type = /decl/hierarchy/outfit/job/clown
pto_type = PTO_CIVILIAN
alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool)
alt_titles = list(JOB_ALT_JESTER = /datum/alt_title/jester, JOB_ALT_FOOL = /datum/alt_title/fool)
/datum/alt_title/jester
title = "Jester"
title = JOB_ALT_JESTER
/datum/alt_title/fool
title = "Fool"
title = JOB_ALT_FOOL
/datum/job/clown/get_access()
if(CONFIG_GET(flag/assistant_maint)) // CHOMPEdit
@@ -131,18 +131,18 @@
return list(access_entertainment, access_clown, access_tomfoolery)
/datum/job/mime
title = "Mime"
title = JOB_MIME
flag = MIME
departments = list(DEPARTMENT_CIVILIAN)
department_flag = ENGSEC
faction = "Station"
faction = FACTION_STATION
total_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
spawn_positions = -1 //CHOMP Edit: Disable. Change to + integer to enable.
supervisors = "the spirit of performance"
selection_color = "#515151"
economic_modifier = 1
job_description = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
alt_titles = list("Poseur" = /datum/alt_title/poseur)
job_description = "A " + JOB_MIME + " is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
alt_titles = list(JOB_ALT_PASEUR = /datum/alt_title/poseur)
whitelist_only = 1
latejoin_only = 0
requestable = FALSE
@@ -150,7 +150,7 @@
pto_type = PTO_CIVILIAN
/datum/alt_title/poseur
title = "Poseur"
title = JOB_ALT_PASEUR
/datum/job/mime/get_access()
if(CONFIG_GET(flag/assistant_maint)) // CHOMPEdit

View File

@@ -1,31 +1,31 @@
/datum/job/entertainer
alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand,
"Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer,
"Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian,
"Clown" = /datum/alt_title/clown, "Jester" = /datum/alt_title/clown/jester,"Fool" = /datum/alt_title/clown/fool,
"Mime"= /datum/alt_title/mime,"Poseur"= /datum/alt_title/mime/poseur, "Fitness Instructor" = /datum/alt_title/fitness) //CHOMPEDIT: Adding clown + mime and their alts as alts of entertainer, as well as fitness instructor
alt_titles = list(JOB_ALT_PERFORMER = /datum/alt_title/performer, JOB_ALT_MUSICIAN = /datum/alt_title/musician, JOB_ALT_STAGEHAND = /datum/alt_title/stagehand,
JOB_ALT_ACTOR = /datum/alt_title/actor, JOB_ALT_DANCER = /datum/alt_title/dancer, JOB_ALT_SINGER = /datum/alt_title/singer,
JOB_ALT_MAGICIAN = /datum/alt_title/magician, JOB_ALT_COMEDIAN = /datum/alt_title/comedian, JOB_ALT_TRAGEDIAN = /datum/alt_title/tragedian,
JOB_CLOWN = /datum/alt_title/clown, JOB_ALT_JESTER = /datum/alt_title/clown/jester,JOB_ALT_FOOL = /datum/alt_title/clown/fool,
JOB_MIME= /datum/alt_title/mime,JOB_ALT_PASEUR= /datum/alt_title/mime/poseur, JOB_ALT_FITNESS_INSTRUCTOR = /datum/alt_title/fitness) //CHOMPEDIT: Adding clown + mime and their alts as alts of entertainer, as well as fitness instructor
/datum/alt_title/fitness
title = "Fitness Instructor"
title_blurb = "A Fitness Instructor's goal is to keep the station in shape. Get the crew shaving up those built up pounds and get them to eat something other than chocolate bars and burgers for once"
title = JOB_ALT_FITNESS_INSTRUCTOR
title_blurb = "A " + JOB_ALT_FITNESS_INSTRUCTOR + "'s goal is to keep the station in shape. Get the crew shaving up those built up pounds and get them to eat something other than chocolate bars and burgers for once"
//Below, well sort off, these are the clown and mime returning! as entertainer alts
//They even get their respective outfits.
/datum/alt_title/clown
title = "Clown"
title_blurb = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
title = JOB_CLOWN
title_blurb = "A " + JOB_CLOWN + " is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
title_outfit = /decl/hierarchy/outfit/job/clown
/datum/alt_title/clown/jester
title = "Jester"
title = JOB_ALT_JESTER
/datum/alt_title/clown/fool
title = "Fool"
title = JOB_ALT_FOOL
/datum/alt_title/mime
title = "Mime"
title_blurb = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
title = JOB_MIME
title_blurb = "A " + JOB_MIME + " is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
title_outfit = /decl/hierarchy/outfit/job/mime
/datum/alt_title/mime/poseur
title = "Poseur"
title = JOB_ALT_PASEUR

View File

@@ -10,7 +10,7 @@ var/global/datum/controller/occupations/job_master
//Cache of icons for job info window
var/list/job_icons = list()
/datum/controller/occupations/proc/SetupOccupations(var/faction = "Station")
/datum/controller/occupations/proc/SetupOccupations(var/faction = FACTION_STATION)
occupations = list()
//var/list/all_jobs = typesof(/datum/job)
var/list/all_jobs = list(/datum/job/assistant) | using_map.allowed_jobs
@@ -140,7 +140,7 @@ var/global/datum/controller/occupations/job_master
if(job.is_species_banned(player.client.prefs.species, player.client.prefs.organ_data["brain"]) == TRUE)
continue
if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant
if(istype(job, GetJob(JOB_ALT_VISITOR))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant
continue
if(SSjob.is_job_in_department(job.title, DEPARTMENT_COMMAND)) //If you want a command position, select it!
@@ -242,7 +242,7 @@ var/global/datum/controller/occupations/job_master
//Holder for Triumvirate is stored in the ticker, this just processes it
if(ticker && ticker.triai)
for(var/datum/job/A in occupations)
if(A.title == "AI")
if(A.title == JOB_AI)
A.spawn_positions = 3
break
@@ -266,7 +266,7 @@ var/global/datum/controller/occupations/job_master
Debug("AC1, Candidates: [assistant_candidates.len]")
for(var/mob/new_player/player in assistant_candidates)
Debug("AC1 pass, Player: [player]")
AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant
AssignRole(player, JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
assistant_candidates -= player
Debug("DO, AC1 end")
@@ -353,7 +353,7 @@ var/global/datum/controller/occupations/job_master
for(var/mob/new_player/player in unassigned)
if(player.client.prefs.alternate_option == BE_ASSISTANT)
Debug("AC2 Assistant located, Player: [player]")
AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant
AssignRole(player, JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
//For ones returning to lobby
for(var/mob/new_player/player in unassigned)
@@ -512,9 +512,9 @@ var/global/datum/controller/occupations/job_master
return H
// TWEET PEEP
if(rank == "Site Manager" && announce)
if(rank == JOB_SITE_MANAGER && announce)
var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP) ? null : sound('sound/misc/boatswain.ogg', volume=20)
captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)
captain_announcement.Announce("All hands, [alt_title ? alt_title : JOB_SITE_MANAGER] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)
//Deferred item spawning.
if(spawn_in_storage && spawn_in_storage.len)

View File

@@ -75,94 +75,94 @@ var/list/assistant_occupations = list(
var/list/command_positions = list(
"Site Manager",
"Head of Personnel",
"Head of Security",
"Chief Engineer",
"Research Director",
"Chief Medical Officer",
"Command Secretary",
"Blueshield Guard" // YW Edit
JOB_SITE_MANAGER,
JOB_HEAD_OF_PERSONNEL,
JOB_HEAD_OF_SECURITY,
JOB_CHIEF_ENGINEER,
JOB_RESEARCH_DIRECTOR,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_COMMAND_SECRETARY,
JOB_BLUESHIELD_GUARD // YW Edit
)
var/list/engineering_positions = list(
"Chief Engineer",
"Station Engineer",
"Atmospheric Technician"
JOB_CHIEF_ENGINEER,
JOB_ENGINEER,
JOB_ATMOSPHERIC_TECHNICIAN
)
var/list/medical_positions = list(
"Chief Medical Officer",
"Medical Doctor",
"Geneticist",
"Psychiatrist",
"Chemist",
"Paramedic"
JOB_CHIEF_MEDICAL_OFFICER,
JOB_MEDICAL_DOCTOR,
JOB_GENETICIST,
JOB_PSYCHIATRIST,
JOB_CHEMIST,
JOB_PARAMEDIC
)
var/list/science_positions = list(
"Research Director",
"Scientist",
"Geneticist", //Part of both medical and science
"Roboticist",
"Xenobiologist"
JOB_RESEARCH_DIRECTOR,
JOB_SCIENTIST,
JOB_GENETICIST, //Part of both medical and science
JOB_ROBOTICIST,
JOB_XENOBIOLOGIST
)
//BS12 EDIT
var/list/cargo_positions = list(
"Quartermaster",
"Cargo Technician",
"Shaft Miner"
JOB_QUARTERMASTER,
JOB_CARGO_TECHNICIAN,
JOB_SHAFT_MINER
)
var/list/civilian_positions = list(
"Head of Personnel",
"Bartender",
"Botanist",
"Chef",
"Janitor",
"Librarian",
"Lawyer",
"Chaplain",
USELESS_JOB, //VOREStation Edit - Visitor not Assistant
"Intern" //VOREStation Edit - Intern
JOB_HEAD_OF_PERSONNEL,
JOB_BARTENDER,
JOB_BOTANIST,
JOB_CHEF,
JOB_JANITOR,
JOB_LIBRARIAN,
JOB_ENTREPRENEUR,
JOB_CHAPLAIN,
JOB_ALT_VISITOR, //VOREStation Edit - Visitor not Assistant
JOB_INTERN //VOREStation Edit - Intern
)
var/list/security_positions = list(
"Head of Security",
"Warden",
"Detective",
"Security Officer"
JOB_HEAD_OF_SECURITY,
JOB_WARDEN,
JOB_DETECTIVE,
JOB_SECURITY_OFFICER
)
var/list/planet_positions = list(
"Pathfinder", // VOREStation Edit - Added Pathfinder
"Explorer",
"Pilot",
"Field Medic" // VOREStation Edit - Field Medic
JOB_PATHFINDER, // VOREStation Edit - Added Pathfinder
JOB_EXPLORER,
JOB_PILOT,
JOB_FIELD_MEDIC // VOREStation Edit - Field Medic
)
var/list/nonhuman_positions = list(
"AI",
"Cyborg",
"pAI"
JOB_AI,
JOB_CYBORG,
JOB_PAI
)
var/list/whitelisted_positions = list(
"Site Manager",
"Head of Personnel",
"Head of Security",
"Chief Engineer",
"Research Director",
"Chief Medical Officer",
"Internal Affairs Agent",
"AI"
JOB_SITE_MANAGER,
JOB_HEAD_OF_PERSONNEL,
JOB_HEAD_OF_SECURITY,
JOB_CHIEF_ENGINEER,
JOB_RESEARCH_DIRECTOR,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_INTERNAL_AFFAIRS_AGENT,
JOB_AI
) //CHOMPEdit: end
/proc/guest_jobbans(var/job)

View File

@@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals
var/datum/job/job = job_master.GetJob(rank)
if(!job.whitelist_only)
return 1
if(rank == USELESS_JOB) //VOREStation Edit - Visitor not Assistant
if(rank == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
return 1
if(check_rights(R_ADMIN, 0) || check_rights(R_DEBUG, 0) || check_rights(R_EVENT, 0)) // CHOMPedit
return 1
@@ -30,6 +30,7 @@ GLOBAL_LIST_EMPTY(job_whitelist) // CHOMPEdit - Managed Globals
return 1
if(findtext(s,"[M.ckey] - All"))
return 1
return 0
//ChompEDIT START - admin reload buttons
/client/proc/reload_jobwhitelist()

View File

@@ -138,7 +138,7 @@
to_chat(user, "<span class='warning'>Sticking a dead [P] into the frame would sort of defeat the purpose.</span>")
return
if(jobban_isbanned(M.brainmob, "AI"))
if(jobban_isbanned(M.brainmob, JOB_AI))
to_chat(user, "<span class='warning'>This [P] does not seem to fit.</span>")
return

View File

@@ -59,7 +59,7 @@
if(!istype(id_card))
return ..()
if(!scan && (access_change_ids in id_card.access) && (user.unEquip(id_card) || (id_card.loc == user && istype(user,/mob/living/silicon/robot)))) //Grippers. Again. ~Mechoid
if(!scan && (access_change_ids in id_card.GetAccess()) && (user.unEquip(id_card) || (id_card.loc == user && istype(user,/mob/living/silicon/robot)))) //Grippers. Again. ~Mechoid
user.drop_item()
id_card.forceMove(src)
scan = id_card
@@ -129,7 +129,7 @@
all_centcom_access.Add(list(list(
"desc" = replacetext(get_centcom_access_desc(access), " ", "&nbsp;"),
"ref" = access,
"allowed" = (access in modify.access) ? 1 : 0)))
"allowed" = (access in modify.GetAccess()) ? 1 : 0)))
else if(modify)
for(var/i in ACCESS_REGION_SECURITY to ACCESS_REGION_SUPPLY)
var/list/accesses = list()
@@ -138,7 +138,7 @@
accesses.Add(list(list(
"desc" = replacetext(get_access_desc(access), " ", "&nbsp;"),
"ref" = access,
"allowed" = (access in modify.access) ? 1 : 0)))
"allowed" = (access in modify.GetAccess()) ? 1 : 0)))
regions.Add(list(list(
"name" = get_region_accesses_name(i),

View File

@@ -165,9 +165,9 @@
var/list/area_list = list()
data["access"] = null
if(giver && giver.access)
data["access"] = giver.access
for (var/A in giver.access)
if(giver && giver.GetAccess())
data["access"] = giver.GetAccess()
for (var/A in giver.GetAccess())
if(A in accesses)
area_list.Add(list(list("area" = A, "area_name" = get_access_desc(A), "on" = 1)))
else
@@ -212,7 +212,7 @@
if(A in accesses)
accesses.Remove(A)
else
if(A in giver.access) //Let's make sure the ID card actually has the access.
if(A in giver.GetAccess()) //Let's make sure the ID card actually has the access.
accesses.Add(A)
else
to_chat(usr, "<span class='warning'>Invalid selection, please consult technical support if there are any issues.</span>")

View File

@@ -236,7 +236,7 @@
rank = scan.assignment
else if(login_type == LOGIN_TYPE_AI && isAI(usr))
authenticated = usr.name
rank = "AI"
rank = JOB_AI
else if(login_type == LOGIN_TYPE_ROBOT && isrobot(usr))
authenticated = usr.name
var/mob/living/silicon/robot/R = usr

View File

@@ -221,7 +221,7 @@
rank = scan.assignment
else if(login_type == LOGIN_TYPE_AI && isAI(usr))
authenticated = usr.name
rank = "AI"
rank = JOB_AI
else if(login_type == LOGIN_TYPE_ROBOT && isrobot(usr))
authenticated = usr.name
var/mob/living/silicon/robot/R = usr

View File

@@ -179,7 +179,7 @@
rank = scan.assignment
else if(login_type == LOGIN_TYPE_AI && isAI(usr))
authenticated = usr.name
rank = "AI"
rank = JOB_AI
else if(login_type == LOGIN_TYPE_ROBOT && isrobot(usr))
authenticated = usr.name
var/mob/living/silicon/robot/R = usr

View File

@@ -25,12 +25,12 @@ var/specops_shuttle_timeleft = 0
/proc/specops_return()
var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky.
announcer.config(list("Response Team" = 0))
announcer.config(list(CHANNEL_RESPONSE_TEAM = 0))
var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN\""//Initial message shown.
if(announcer)
announcer.autosay(message, "A.L.I.C.E.", "Response Team")
announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM)
while(specops_shuttle_time - world.timeofday > 0)
var/ticksleft = specops_shuttle_time - world.timeofday
@@ -46,7 +46,7 @@ var/specops_shuttle_timeleft = 0
message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\""
if(rounded_time_left==0)
message = "\"ALERT: TAKEOFF\""
announcer.autosay(message, "A.L.I.C.E.", "Response Team")
announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM)
message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle.
//Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.
@@ -100,14 +100,14 @@ var/specops_shuttle_timeleft = 0
/proc/specops_process()
var/area/centcom/specops/special_ops = locate()//Where is the specops area located?
var/obj/item/device/radio/intercom/announcer = new /obj/item/device/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky.
announcer.config(list("Response Team" = 0))
announcer.config(list(CHANNEL_RESPONSE_TEAM = 0))
var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH\""//Initial message shown.
if(announcer)
announcer.autosay(message, "A.L.I.C.E.", "Response Team")
announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM)
// message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD"
// announcer.autosay(message, "A.L.I.C.E.", "Response Team")
// announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM)
while(specops_shuttle_time - world.timeofday > 0)
var/ticksleft = specops_shuttle_time - world.timeofday
@@ -123,7 +123,7 @@ var/specops_shuttle_timeleft = 0
message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\""
if(rounded_time_left==0)
message = "\"ALERT: TAKEOFF\""
announcer.autosay(message, "A.L.I.C.E.", "Response Team")
announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM)
message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle.
//Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.

View File

@@ -36,7 +36,7 @@
jobs_all += "<table><tr><td></td><td><b>Command</b></td>"
jobs_all += "</tr><tr height='20'><td><b>Special</b></td>"//Site Manager in special because he is head of heads ~Intercross21
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Site Manager'>Site Manager</a></td>"
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign="+JOB_SITE_MANAGER+"'>"+JOB_SITE_MANAGER+"</a></td>"
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Custom'>Custom</a></td>"
counter = 0
@@ -123,7 +123,7 @@
for(var/i = 1; i <= 7; i++)
accesses += "<td style='width:14%' valign='top'>"
for(var/A in get_region_accesses(i))
if(A in writer.access)
if(A in writer.GetAccess())
accesses += topic_link(src,"access=[A]","<font color='red'>[replacetext(get_access_desc(A), " ", "&nbsp")]</font>") + " "
else
accesses += topic_link(src,"access=[A]",replacetext(get_access_desc(A), " ", "&nbsp")) + " "
@@ -189,7 +189,7 @@
// These are here partly in order to be overwritten by the centcom card computer code
/datum/file/program/card_comp/proc/authenticate()
if(access_change_ids in reader.access)
if(access_change_ids in reader.GetAccess())
return 1
if(istype(usr,/mob/living/silicon/ai))
return 1
@@ -335,13 +335,13 @@
/datum/file/program/card_comp/centcom/accessblock()
var/accesses = "<h5>[using_map.boss_name]:</h5>"
for(var/A in get_all_centcom_access())
if(A in writer.access)
if(A in writer.GetAccess())
accesses += topic_link(src,"access=[A]","<font color='red'>[replacetext(get_centcom_access_desc(A), " ", "&nbsp")]</font>") + " "
else
accesses += topic_link(src,"access=[A]",replacetext(get_centcom_access_desc(A), " ", "&nbsp")) + " "
return accesses
/datum/file/program/card_comp/centcom/authenticate()
if(access_cent_captain in reader.access)
if(access_cent_captain in reader.GetAccess())
return 1
return 0

View File

@@ -131,16 +131,16 @@
id = R.idcard
// Nothing
if(!id || !id.access)
if(!id || !id.GetAccess())
return list()
// Has engineer access, can put any access
else if(has_access(null, apply_any_access, id.access))
else if(has_access(null, apply_any_access, id.GetAccess()))
return get_all_station_access()
// Not an engineer, can only pick your own accesses to program
else
return id.access
return id.GetAccess()
/obj/item/weapon/airlock_electronics/secure
name = "secure airlock electronics"

View File

@@ -513,7 +513,7 @@ var/list/dispenser_presets = list()
req_one_access = list(access_atmospherics)
/datum/gear_disp/voidsuit/station/paramedic
name = "Paramedic (Voidsuit)"
name = JOB_PARAMEDIC + " (Voidsuit)"
voidsuit_type = /obj/item/clothing/suit/space/void/medical/emt
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/medical/emt
refit = TRUE

View File

@@ -124,7 +124,7 @@
req_one_access = list(access_syndicate)
enabled = TRUE
check_all = TRUE
faction = "syndicate" // Make sure this equals the faction that the mobs in the POI have or they will fight each other.
faction = FACTION_SYNDICATE // Make sure this equals the faction that the mobs in the POI have or they will fight each other.
/obj/machinery/porta_turret/ai_defense
name = "defense turret"

View File

@@ -44,8 +44,8 @@
departmentType = RC_ASSIST|RC_SUPPLY
/obj/machinery/requests_console/preset/janitor
name = "Janitor RC"
department = "Janitorial"
name = JOB_JANITOR + " RC"
department = JOB_JANITOR + "ial"
departmentType = RC_ASSIST
/obj/machinery/requests_console/preset/bridge
@@ -57,26 +57,26 @@
// Heads
/obj/machinery/requests_console/preset/ce
name = "Chief Engineer RC"
department = "Chief Engineer's Desk"
name = JOB_CHIEF_ENGINEER + " RC"
department = JOB_CHIEF_ENGINEER + "'s Desk"
departmentType = RC_ASSIST|RC_INFO
announcementConsole = 1
/obj/machinery/requests_console/preset/cmo
name = "Chief Medical Officer RC"
department = "Chief Medical Officer's Desk"
name = JOB_CHIEF_MEDICAL_OFFICER + " RC"
department = JOB_CHIEF_MEDICAL_OFFICER + "'s Desk"
departmentType = RC_ASSIST|RC_INFO
announcementConsole = 1
/obj/machinery/requests_console/preset/hos
name = "Head of Security RC"
department = "Head of Security's Desk"
name = JOB_HEAD_OF_SECURITY + " RC"
department = JOB_HEAD_OF_SECURITY + "'s Desk"
departmentType = RC_ASSIST|RC_INFO
announcementConsole = 1
/obj/machinery/requests_console/preset/rd
name = "Research Director RC"
department = "Research Director's Desk"
name = JOB_RESEARCH_DIRECTOR + " RC"
department = JOB_RESEARCH_DIRECTOR +"'s Desk"
departmentType = RC_ASSIST|RC_INFO
announcementConsole = 1
@@ -87,8 +87,8 @@
announcementConsole = 1
/obj/machinery/requests_console/preset/ai
name = "AI RC"
department = "AI"
name = JOB_AI + " RC"
department = JOB_AI
departmentType = RC_ASSIST|RC_INFO
/obj/machinery/requests_console/preset/hop //yw edit

View File

@@ -109,4 +109,4 @@
model_text = "Vintage Master"
limit_departments = list(
/datum/suit_cycler_choice/department/vintage
)
)

View File

@@ -43,7 +43,7 @@
updateUsrDialog()
return
var/mob/M = locate(href_list["traitormob"])
if(M.mind.special_role || jobban_isbanned(M, "Syndicate"))
if(M.mind.special_role || jobban_isbanned(M, JOB_SYNDICATE))
temptext = "<i>We have no need for you at this time. Have a pleasant day.</i><br>"
updateUsrDialog()
return

View File

@@ -25,7 +25,7 @@
updateUsrDialog()
return
var/mob/M = locate(href_list["traitormob"])
if(M.mind.tcrystals > 0 || jobban_isbanned(M, "Syndicate"))
if(M.mind.tcrystals > 0 || jobban_isbanned(M, JOB_SYNDICATE))
temptext = "<i>We have no need for you at this time. Have a pleasant day.</i><br>"
updateUsrDialog()
return

View File

@@ -2143,15 +2143,15 @@
if(istype(I, /obj/item/device/pda))
var/obj/item/device/pda/pda = I
I = pda.id
if(!istype(I) || !I.access) //not ID or no access
if(!istype(I) || !I.GetAccess()) //not ID or no access
return 0
if(access_list==src.operation_req_access)
for(var/req in access_list)
if(!(req in I.access)) //doesn't have this access
if(!(req in I.GetAccess())) //doesn't have this access
return 0
else if(access_list==src.internals_req_access)
for(var/req in access_list)
if(req in I.access)
if(req in I.GetAccess())
return 1
return 1
@@ -2385,7 +2385,7 @@
for(var/a in operation_req_access)
output += "[get_access_desc(a)] - <a href='?src=\ref[src];del_req_access=[a];user=\ref[user];id_card=\ref[id_card]'>Delete</a><br>"
output += "<hr><h1>Following keycodes were detected on portable device:</h1>"
for(var/a in id_card.access)
for(var/a in id_card.GetAccess())
if(a in operation_req_access) continue
var/a_name = get_access_desc(a)
if(!a_name) continue //there's some strange access without a name

View File

@@ -1,98 +1,102 @@
/obj/effect/landmark/start/captain
name = "Site Manager"
name = JOB_SITE_MANAGER
/obj/effect/landmark/start/hop
name = "Head of Personnel"
name = JOB_HEAD_OF_PERSONNEL
/obj/effect/landmark/start/commandsecretary
name = "Command Secretary"
name = JOB_COMMAND_SECRETARY
/obj/effect/landmark/start/hos
name = "Head of Security"
name = JOB_HEAD_OF_SECURITY
/obj/effect/landmark/start/warden
name = "Warden"
name = JOB_WARDEN
/obj/effect/landmark/start/detective
name = "Detective"
name = JOB_DETECTIVE
/obj/effect/landmark/start/security
name = "Security Officer"
name = JOB_SECURITY_OFFICER
/obj/effect/landmark/start/ce
name = "Chief Engineer"
name = JOB_CHIEF_ENGINEER
/obj/effect/landmark/start/atmostech
name = "Atmospheric Technician"
name = JOB_ATMOSPHERIC_TECHNICIAN
/obj/effect/landmark/start/engineer
name = "Engineer"
name = JOB_ENGINEER
/obj/effect/landmark/start/cmo
name = "Chief Medical Officer"
name = JOB_CHIEF_MEDICAL_OFFICER
/obj/effect/landmark/start/chemist
name = "Chemist"
name = JOB_CHEMIST
/obj/effect/landmark/start/medical
name = "Medical Doctor"
name = JOB_MEDICAL_DOCTOR
/obj/effect/landmark/start/paramedic
name = "Paramedic"
name = JOB_PARAMEDIC
/obj/effect/landmark/start/psych
name = "Psychiatrist"
name = JOB_PSYCHIATRIST
/obj/effect/landmark/start/rd
name = "Research Director"
name = JOB_RESEARCH_DIRECTOR
/obj/effect/landmark/start/roboticist
name = "Roboticist"
name = JOB_ROBOTICIST
/obj/effect/landmark/start/scientist
name = "Scientist"
name = JOB_SCIENTIST
/obj/effect/landmark/start/xenobio
name = "Xenobiologist"
name = JOB_XENOBIOLOGIST
/obj/effect/landmark/start/xenobot
name = "Xenobotanist"
name = JOB_XENOBOTANIST
/obj/effect/landmark/start/qm
name = "Quartermaster"
name = JOB_QUARTERMASTER
/obj/effect/landmark/start/cargo
name = "Cargo Technician"
name = JOB_CARGO_TECHNICIAN
/obj/effect/landmark/start/miner
name = "Shaft Miner"
name = JOB_SHAFT_MINER
//CHOMP explo keep removed wide comment field
/obj/effect/landmark/start/pf
name = "Pathfinder"
name = JOB_PATHFINDER
/obj/effect/landmark/start/explorer
name = "Explorer"
name = JOB_EXPLORER
/obj/effect/landmark/start/fieldmedic
name = "Field Medic"
name = JOB_FIELD_MEDIC
//CHOMP explo keep removed wide comment field end
/obj/effect/landmark/start/bartender
name = "Bartender"
name = JOB_BARTENDER
/obj/effect/landmark/start/botanist
name = "Botanist"
name = JOB_BOTANIST
/obj/effect/landmark/start/chaplain
name = "Chaplain"
name = JOB_CHAPLAIN
/obj/effect/landmark/start/chef
name = "Chef"
name = JOB_CHEF
/obj/effect/landmark/start/clown
name = "Clown"
name = JOB_CLOWN
/obj/effect/landmark/start/entertainer
name = "Entertainer"
name = JOB_ENTERTAINER
/obj/effect/landmark/start/entrepreneur
name = "Entrepreneur"
name = JOB_ENTREPRENEUR
/obj/effect/landmark/start/intern
name = "Intern"
name = JOB_INTERN
/obj/effect/landmark/start/iaa
name = "Internal Affairs Agent"
name = JOB_INTERNAL_AFFAIRS_AGENT
/obj/effect/landmark/start/janitor
name = "Janitor"
name = JOB_JANITOR
/obj/effect/landmark/start/librarian
name = "Librarian"
name = JOB_LIBRARIAN
/obj/effect/landmark/start/mime
name = "Mime"
name = JOB_MIME
/obj/effect/landmark/start/pilot
name = "Pilot"
name = JOB_PILOT
/obj/effect/landmark/start/visitor
name = "Visitor"
name = JOB_ALT_VISITOR
/obj/effect/landmark/start/ai
name = "AI"
name = JOB_AI
/obj/effect/landmark/start/cyborg
name = "Cyborg"
name = JOB_CYBORG
/obj/effect/landmark/start/taloncap
name = "Talon Captain"
name = JOB_TALON_CAPTAIN
/obj/effect/landmark/start/talondoc
name = "Talon Doctor"
name = JOB_TALON_DOCTOR
/obj/effect/landmark/start/taloneng
name = "Talon Engineer"
name = JOB_TALON_ENGINEER
/obj/effect/landmark/start/talonguard
name = "Talon Guard"
name = JOB_TALON_GUARD
/obj/effect/landmark/start/talonpilot
name = "Talon Pilot"
name = JOB_TALON_PILOT
/obj/effect/landmark/start/talonminer
name = "Talon Miner"
name = JOB_TALON_MINER
/obj/effect/landmark/start/outsider
name = JOB_OUTSIDER
/obj/effect/landmark/start/anomaly
name = JOB_ANOMALY

View File

@@ -96,7 +96,7 @@
var/spiders_min = 6
var/spiders_max = 24
var/spider_type = /obj/effect/spider/spiderling
var/faction = "spiders"
var/faction = FACTION_SPIDERS
/obj/effect/spider/eggcluster/Initialize()
pixel_x = rand(3,-3)
@@ -155,7 +155,7 @@
var/obj/machinery/atmospherics/unary/vent_pump/entry_vent
var/travelling_in_vent = 0
var/list/grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/hunter)
var/faction = "spiders"
var/faction = FACTION_SPIDERS
var/stunted = FALSE

View File

@@ -105,7 +105,7 @@
to_chat(new_voice, "<b>If you want to end the call, use the 'Hang Up' verb. The other person can also hang up at any time.</b>")
to_chat(new_voice, "<b>Remember, your character does not know anything you've learned from observing!</b>")
if(new_voice.mind)
new_voice.mind.assigned_role = "Disembodied Voice"
new_voice.mind.assigned_role = JOB_DISEMBODIED_VOICE
if(user)
to_chat(user, "<span class='notice'>[icon2html(src,new_voice.client)] Your communicator is now connected to [candidate]'s communicator.</span>")

Some files were not shown because too many files have changed in this diff Show More