diff --git a/code/__defines/faction.dm b/code/__defines/faction.dm new file mode 100644 index 0000000000..0d46529297 --- /dev/null +++ b/code/__defines/faction.dm @@ -0,0 +1,115 @@ +#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" diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index e28e1f06f7..2b7dd18425 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -5,6 +5,7 @@ #define JOB_HEAD_OF_SECURITY "Head of Security" #define JOB_CHIEF_ENGINEER "Chief Engineer" #define JOB_RESEARCH_DIRECTOR "Research Director" +#define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer" // Station Security jobs #define JOB_WARDEN "Warden" @@ -15,6 +16,9 @@ #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" #define JOB_ENGINEER "Engineer" +// Station Medical jobs +#define JOB_CHEMIST "Chemist" +#define JOB_MEDICAL_DOCTOR "Medical Doctor" @@ -25,6 +29,10 @@ #define JOB_ALT_FORENSIC_TECHNICIAN "Forensic Technician" #define JOB_ALT_JUNIOR_OFFICER "Junior Officer" +// Medical alt titles +#define JOB_ALT_PHARMACIST "Pharmacist" +#define JOB_ALT_PHARMACOLOGIST "Pharmacologist" + //Assistant/Visitor/Whatever #define USELESS_JOB "Visitor" diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index c137582c7c..f117284275 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(job) setup_occupations() return ..() -/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) diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index b474f92f72..720c45556c 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -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/regular @@ -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 diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index e958f8133f..d7f6ac8016 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -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,7 +187,7 @@ ) cost = 20 containertype = /obj/structure/closet/crate/secure/nanomed - containername = "Chemist equipment" + containername = JOB_CHEMIST + " equipment" access = access_chemistry /datum/supply_pack/med/paramedicgear diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index 51c0b246d0..7a5670cd61 100644 --- a/code/game/antagonist/station/revolutionary.dm +++ b/code/game/antagonist/station/revolutionary.dm @@ -30,8 +30,8 @@ var/datum/antagonist/revolutionary/revs faction_invisible = 1 avoid_silicons = TRUE - protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "Internal Affairs Agent", JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_RESEARCH_DIRECTOR, "Chief Medical Officer") - roundstart_restricted = list("Internal Affairs Agent", JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_RESEARCH_DIRECTOR, "Chief Medical Officer") + protected_jobs = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, "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("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() ..() diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm index 0417b0c535..adf4525959 100644 --- a/code/game/gamemodes/epidemic/epidemic.dm +++ b/code/game/gamemodes/epidemic/epidemic.dm @@ -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 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 17c64661eb..111467b40b 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -638,7 +638,7 @@ var/global/list/all_objectives = list() return /datum/objective/heist/kidnap/choose_target() - var/list/roles = list(JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,"Roboticist","Chemist",JOB_ENGINEER) + var/list/roles = list(JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,"Roboticist",JOB_CHEMIST,JOB_ENGINEER) var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm index 7b2ab146a2..e5ba7c94f1 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm @@ -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. diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 1056d8e455..7d71b5b03e 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -247,7 +247,7 @@ /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 diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 9551ffd59a..adc1b801b9 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -7,7 +7,7 @@ departments = list(DEPARTMENT_CIVILIAN) sorting_order = -1 department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = -1 spawn_positions = -1 supervisors = "absolutely everyone" diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index fa3b3bad9a..3b5183f7fa 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -7,7 +7,7 @@ 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" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 73a94278ce..89a5ac06be 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -11,7 +11,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) 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" @@ -60,7 +60,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) 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 " + JOB_SITE_MANAGER @@ -108,7 +108,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) 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" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 058ffb61c5..806a521c4d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -9,7 +9,7 @@ flag = BARTENDER departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_HEAD_OF_PERSONNEL @@ -37,7 +37,7 @@ flag = CHEF departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the "+ JOB_HEAD_OF_PERSONNEL @@ -63,7 +63,7 @@ flag = BOTANIST departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_HEAD_OF_PERSONNEL @@ -91,7 +91,7 @@ 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 " + JOB_HEAD_OF_PERSONNEL @@ -119,7 +119,7 @@ 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 " + JOB_HEAD_OF_PERSONNEL @@ -140,7 +140,7 @@ 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 " + JOB_HEAD_OF_PERSONNEL @@ -166,7 +166,7 @@ flag = JANITOR departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_HEAD_OF_PERSONNEL @@ -191,7 +191,7 @@ flag = LIBRARIAN departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 1 spawn_positions = 1 supervisors = "the " + JOB_HEAD_OF_PERSONNEL @@ -223,7 +223,7 @@ 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" diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 8922c829b4..22c650c417 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -4,7 +4,7 @@ flag = CHAPLAIN departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 1 spawn_positions = 1 supervisors = "the " + JOB_HEAD_OF_PERSONNEL diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index be5932cb73..1539078005 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -215,7 +215,7 @@ flag = PILOT departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_HEAD_OF_PERSONNEL @@ -251,7 +251,7 @@ flag = ENTERTAINER departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 4 spawn_positions = 4 supervisors = "the " + JOB_HEAD_OF_PERSONNEL @@ -321,7 +321,7 @@ flag = ENTREPRENEUR departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 4 spawn_positions = 4 supervisors = "the " + JOB_HEAD_OF_PERSONNEL diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 998287ccbc..fcb201c7af 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -8,7 +8,7 @@ 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 "+ JOB_SITE_MANAGER @@ -46,7 +46,7 @@ flag = ENGINEER departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 5 spawn_positions = 5 supervisors = "the "+ JOB_CHIEF_ENGINEER @@ -88,7 +88,7 @@ flag = ATMOSTECH departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 3 spawn_positions = 2 supervisors = "the " + JOB_CHIEF_ENGINEER diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 14bb3c46fd..d68308c576 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -33,7 +33,7 @@ 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 " + JOB_HEAD_OF_PERSONNEL @@ -63,7 +63,7 @@ flag = EXPLORER departments = list(DEPARTMENT_PLANET) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 3 spawn_positions = 3 supervisors = "the Pathfinder and the " + JOB_HEAD_OF_PERSONNEL @@ -88,10 +88,10 @@ 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 and the Chief Medical Officer" + supervisors = "the Pathfinder and the " + JOB_CHIEF_MEDICAL_OFFICER selection_color = "#999440" economic_modifier = 6 minimal_player_age = 3 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 269f9dd18d..18bce75303 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -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 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index d011b7b6d1..b1deec226e 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -2,13 +2,13 @@ // 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 " + JOB_SITE_MANAGER @@ -39,20 +39,20 @@ // 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( @@ -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,14 +111,14 @@ 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." /* I'm commenting out Geneticist so you can't actually see it in the job menu, given that you can't play as one - Jon. ////////////////////////////////// @@ -129,10 +129,10 @@ flag = GENETICIST departments = list(DEPARTMENT_MEDICAL, DEPARTMENT_RESEARCH) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 0 spawn_positions = 0 - supervisors = "the Chief Medical Officer and " + JOB_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) @@ -151,11 +151,11 @@ 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) @@ -180,10 +180,10 @@ 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 = 4 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) diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 8999d2d051..89db6f648a 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -54,11 +54,11 @@ /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 diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index 665c6f46a0..a3cda63230 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -7,7 +7,7 @@ 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" @@ -23,7 +23,7 @@ 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" @@ -39,7 +39,7 @@ 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" @@ -55,7 +55,7 @@ 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" @@ -71,7 +71,7 @@ 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" @@ -87,7 +87,7 @@ 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" @@ -103,7 +103,7 @@ 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" diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index a0457d77e1..48ff69ea81 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -8,7 +8,7 @@ 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 " + JOB_SITE_MANAGER @@ -51,7 +51,7 @@ flag = SCIENTIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 5 spawn_positions = 3 supervisors = "the " + JOB_RESEARCH_DIRECTOR @@ -96,7 +96,7 @@ flag = XENOBIOLOGIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 3 spawn_positions = 2 supervisors = "the " + JOB_RESEARCH_DIRECTOR @@ -130,7 +130,7 @@ VR edit end*/ flag = ROBOTICIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_RESEARCH_DIRECTOR diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 9c68b6b719..e793503fd7 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -102,7 +102,7 @@ flag = XENOBOTANIST departments = list(DEPARTMENT_RESEARCH) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_RESEARCH_DIRECTOR diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 0ceaf623bb..13896f1648 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -8,7 +8,7 @@ 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 " + JOB_SITE_MANAGER @@ -53,7 +53,7 @@ departments = list(DEPARTMENT_SECURITY) sorting_order = 1 department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 1 spawn_positions = 1 supervisors = "the " + JOB_HEAD_OF_SECURITY @@ -78,7 +78,7 @@ flag = DETECTIVE departments = list(DEPARTMENT_SECURITY) department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the " + JOB_HEAD_OF_SECURITY @@ -108,7 +108,7 @@ flag = OFFICER departments = list(DEPARTMENT_SECURITY) department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 4 spawn_positions = 4 supervisors = "the " + JOB_HEAD_OF_SECURITY diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index 06ec638ee3..e32a3d308a 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -7,7 +7,7 @@ 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" @@ -45,7 +45,7 @@ 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 diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index 295a2ad278..26a7609b4d 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -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" @@ -28,7 +28,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" @@ -55,7 +55,7 @@ flag = CLOWN departments = list(DEPARTMENT_CIVILIAN) department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 1 spawn_positions = 1 supervisors = "the spirit of laughter" @@ -86,7 +86,7 @@ flag = MIME departments = list(DEPARTMENT_CIVILIAN) department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 1 spawn_positions = 1 supervisors = "the spirit of performance" diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 33fa4e7b3f..8f94892f1f 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -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 diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 451472c7bf..b9329afb4c 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -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" diff --git a/code/game/machinery/requests_console_vr.dm b/code/game/machinery/requests_console_vr.dm index f20da2a78f..93003cad72 100644 --- a/code/game/machinery/requests_console_vr.dm +++ b/code/game/machinery/requests_console_vr.dm @@ -63,14 +63,14 @@ 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 diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 9794dd637b..24214b771f 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -19,11 +19,11 @@ /obj/effect/landmark/start/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" /obj/effect/landmark/start/psych diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 776b2e69d7..f18cecc6f3 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -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 diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 2610c67eef..65c3236d66 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -311,8 +311,8 @@ playsound(src, 'sound/machines/click.ogg', 20, 1) /obj/item/toy/figure/cmo - name = "Chief Medical Officer action figure" - desc = "A \"Space Life\" brand Chief Medical Officer action figure." + name = JOB_CHIEF_MEDICAL_OFFICER + " action figure" + desc = "A \"Space Life\" brand " + JOB_CHIEF_MEDICAL_OFFICER + " action figure." icon_state = "cmo" toysay = "Suit sensors!" @@ -377,8 +377,8 @@ toysay = "I swear it's not human meat." /obj/item/toy/figure/chemist - name = "Chemist action figure" - desc = "A \"Space Life\" brand Chemist action figure." + name = JOB_CHEMIST + " action figure" + desc = "A \"Space Life\" brand " + JOB_CHEMIST + " action figure." icon_state = "chemist" toysay = "Get your pills!" @@ -455,8 +455,8 @@ toysay = "One day while..." /obj/item/toy/figure/md - name = "Medical Doctor action figure" - desc = "A \"Space Life\" brand Medical Doctor action figure." + name = JOB_MEDICAL_DOCTOR + " action figure" + desc = "A \"Space Life\" brand " + JOB_MEDICAL_DOCTOR + " action figure." icon_state = "md" toysay = "The patient is already dead!" diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index a022aba2f0..919809687c 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -85,10 +85,12 @@ /obj/item/weapon/card/id/medical name = "Medical ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n") + rank = JOB_MEDICAL_DOCTOR /obj/item/weapon/card/id/medical/chemist - name = "Chemist's ID" + name = JOB_CHEMIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-orange") + rank = JOB_CHEMIST /obj/item/weapon/card/id/medical/geneticist name = "Geneticist's ID" @@ -107,8 +109,9 @@ initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue") /obj/item/weapon/card/id/medical/head - name = "Chief Medical Officer's ID" + name = JOB_CHIEF_MEDICAL_OFFICER + "'s ID" initial_sprite_stack = list("base-stamp-silver", "top-medblu", "stamp-n", "pips-gold") + rank = JOB_CHIEF_MEDICAL_OFFICER //Security diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 5f29c26cb0..193adcabf9 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -218,14 +218,15 @@ icon_state = "medical-id" primary_color = rgb(189,237,237) secondary_color = rgb(223,255,255) + rank = JOB_MEDICAL_DOCTOR /obj/item/weapon/card/id/medical/head name = "identification card" desc = "A card which represents care and compassion." primary_color = rgb(189,237,237) secondary_color = rgb(255,223,127) - assignment = "Chief Medical Officer" - rank = "Chief Medical Officer" + assignment = JOB_CHIEF_MEDICAL_OFFICER + rank = JOB_CHIEF_MEDICAL_OFFICER /obj/item/weapon/card/id/security name = "identification card" @@ -547,8 +548,8 @@ "Xenobotanist" = "itg_purple", "Pathfinder" = "itg_purple", "Explorer" = "itg_purple", - "Chemist" = "itg_white", - "Medical Doctor" = "itg_white", + JOB_CHEMIST = "itg_white", + JOB_MEDICAL_DOCTOR = "itg_white", "Paramedic" = "itg_white", "Psychiatrist" = "itg_white", "Field Medic" = "itg_white", @@ -578,7 +579,7 @@ /obj/item/weapon/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user) if(istype(I, /obj/item/weapon/card/id) && !accessset) var/obj/item/weapon/card/id/O = I - var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", JOB_CHIEF_ENGINEER, "Chief Medical Officer", JOB_RESEARCH_DIRECTOR, "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG + var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, "Head of Security", JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_RESEARCH_DIRECTOR, "Clown", "Mime", "Talon Captain") //If you're in as one of these you probably aren't representing ITG if(O.rank in itgdont) to_chat(user, "ITG Cards do not seem to be able to accept the access codes for your ID.") return diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index 0b7a4d6ad2..101c4f5f5c 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -179,7 +179,7 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x" spawn_nothing_percentage = 10 - var/faction = "wild animal" + var/faction = FACTION_WILD_ANIMAL /obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction. return pick( diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 3c2008d5db..0fe23f6117 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -84,7 +84,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_ENGINEER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) return 1 if(rank == RANK_SECURITY) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) @@ -102,14 +102,14 @@ var/savefile/Banlistjob if(rank == RANK_RESEARCH) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Scientist") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) return 1 if(rank == RANK_MEDICAL) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Medical Doctor") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chemist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_MEDICAL_DOCTOR) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHEMIST) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == RANK_CE_STATION_ENGINEER) @@ -125,18 +125,18 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_ENGINEER) return 1 if(rank == RANK_CHEMIST_RD_CMO) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chemist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHEMIST) return 1 if(rank == RANK_GENETIST_RD_CMO) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Geneticist") return 1 if(rank == RANK_MD_CMO) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Medical Doctor") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_MEDICAL_DOCTOR) return 1 if(rank == RANK_SCIENTIST_RD) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) @@ -151,7 +151,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_HEAD_OF_SECURITY) return 1 if(rank == RANK_VIROLOGIST_RD_CMO) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Medical Officer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Virologist") return 1 diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index bf0c015172..26d8f9549d 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -158,8 +158,8 @@ corpsepocket1 = /obj/item/device/flashlight/pen corpseshoes = /obj/item/clothing/shoes/black corpseid = 1 - corpseidjob = "Medical Doctor" - corpseidaccess = "Medical Doctor" + corpseidjob = JOB_MEDICAL_DOCTOR + corpseidaccess = JOB_MEDICAL_DOCTOR /obj/effect/landmark/corpse/engineer name = JOB_ENGINEER diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm index 14f7eb54c0..12d1c7e255 100644 --- a/code/modules/blob2/blobs/base_blob.dm +++ b/code/modules/blob2/blobs/base_blob.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(all_blobs) var/heal_timestamp = 0 //we got healed when? var/mob/observer/blob/overmind = null var/base_name = "blob" // The name that gets appended along with the blob_type's name. - var/faction = "blob" + var/faction = FACTION_BLOB /obj/structure/blob/Initialize(newloc, new_overmind) if(new_overmind) @@ -426,4 +426,4 @@ GLOBAL_LIST_EMPTY(all_blobs) qdel(src) /turf/simulated/wall/blob_act() - take_damage(100) \ No newline at end of file + take_damage(100) diff --git a/code/modules/blob2/mobs/blob_mob.dm b/code/modules/blob2/mobs/blob_mob.dm index fb84f9d2c1..5bd2fefbeb 100644 --- a/code/modules/blob2/mobs/blob_mob.dm +++ b/code/modules/blob2/mobs/blob_mob.dm @@ -6,7 +6,7 @@ /mob/living/simple_mob/hostile/blob icon = 'icons/mob/blob.dmi' pass_flags = PASSBLOB | PASSTABLE - faction = "blob" + faction = FACTION_BLOB // bubble_icon = "blob" // speak_emote = null //so we use verb_yell/verb_say/etc // atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index 625dca158f..ea989759e7 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -10,7 +10,7 @@ var/list/overminds = list() see_in_dark = 8 invisibility = INVISIBILITY_OBSERVER - faction = "blob" + faction = FACTION_BLOB var/obj/structure/blob/core/blob_core = null // The blob overmind's core var/blob_points = 0 var/max_blob_points = 200 diff --git a/code/modules/blob2/overmind/types.dm b/code/modules/blob2/overmind/types.dm index 8fffbcdbca..4a7bab93b1 100644 --- a/code/modules/blob2/overmind/types.dm +++ b/code/modules/blob2/overmind/types.dm @@ -9,7 +9,7 @@ var/color = "#FFFFFF" // The actual blob's color. var/complementary_color = "#000000" //a color that's complementary to the normal blob color. Blob mobs are colored in this. - var/faction = "blob" // The blob's faction. + var/faction = FACTION_BLOB // The blob's faction. var/attack_message = "The blob attacks you" // Base message the mob gets when blob_act() gets called on them by the blob. An exclaimation point is added to the end. var/attack_message_living = null // Appended to attack_message, if the target fails isSynthetic() check. diff --git a/code/modules/blob2/overmind/types/grey_goo.dm b/code/modules/blob2/overmind/types/grey_goo.dm index 558f624e96..2e0fea20f9 100644 --- a/code/modules/blob2/overmind/types/grey_goo.dm +++ b/code/modules/blob2/overmind/types/grey_goo.dm @@ -14,7 +14,7 @@ attack_message = "The tide tries to swallow you" attack_message_living = ", and you feel your skin dissolve" attack_message_synth = ", and your external plating dissolves" - faction = "nanomachines" + faction = FACTION_NANOMACHINES /datum/blob_type/grey_goo/on_emp(obj/structure/blob/B, severity) B.adjust_integrity(-(20 / severity)) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index ca0de08dc4..8674cc7a95 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -250,7 +250,7 @@ /datum/gear/accessory/stethoscope display_name = "stethoscope" path = /obj/item/clothing/accessory/stethoscope - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic","Talon Doctor") /datum/gear/accessory/locket display_name = "locket" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 2fb4e30d5a..3695a1c5c7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -91,7 +91,7 @@ display_name = "Medical HUD selector" description = "Select from a range of Medical HUD eyepieces that can display the health status of people in line of sight." path = /obj/item/clothing/glasses/hud/health - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/eyes/medical/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 283fdf503b..6cff06216d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -1,5 +1,5 @@ /datum/gear/eyes/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -34,7 +34,7 @@ /datum/gear/eyes/arglasses/med display_name = "AR-Medical glasses" path = /obj/item/clothing/glasses/omnihud/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/eyes/arglasses/all display_name = "AR-Command glasses" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index f8b37804f9..5ea00ebb42 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -777,7 +777,7 @@ display_name = "Kenzie's Hypospray" ckeywhitelist = list("lm40") character_name = list("Kenzie Houser") - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic") /datum/gear/fluff/brianna_backpack path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana @@ -1505,7 +1505,7 @@ slot = slot_glasses ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Off-duty Medic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic", "Off-duty Medic") /datum/gear/fluff/tempest_hypospray path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest @@ -1513,7 +1513,7 @@ slot = slot_belt ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Off-duty Medic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic", "Off-duty Medic") /datum/gear/fluff/tempest_backpack path = /obj/item/weapon/storage/backpack/saddlebag/tempest diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 2a2f24b8ac..b5587490fd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -394,7 +394,7 @@ /datum/gear/head/med_hat_selector display_name = "Medical - Basic Headwear" description = "Select from a range of hats available to all Medical personnel." - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic") path = /obj/item/clothing/head/soft/med /datum/gear/head/med_hat_selector/New() diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index 6fcfe1fe13..41fdf40698 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -228,7 +228,7 @@ /datum/gear/shoes/boots/winter/medical display_name = "medical winter boots" path = /obj/item/clothing/shoes/boots/winter/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/shoes/boots/winter/mining display_name = "mining winter boots" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 5fe9dba4f3..b717692ea5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -144,7 +144,7 @@ /datum/gear/suit/labcoat_cmo display_name = "labcoat selection, cmo" path = /obj/item/clothing/suit/storage/toggle/labcoat/cmo - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) show_roles = FALSE /datum/gear/suit/labcoat_cmo/New() @@ -159,7 +159,7 @@ /datum/gear/suit/labcoat_emt display_name = "labcoat, EMT" path = /obj/item/clothing/suit/storage/toggle/labcoat/emt - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/labcoat_rd display_name = "labcoat, research director" @@ -174,7 +174,7 @@ /datum/gear/suit/roles/surgical_apron display_name = "surgical apron" path = /obj/item/clothing/suit/surgicalapron - allowed_roles = list("Medical Doctor","Chief Medical Officer") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER) /datum/gear/suit/overalls display_name = "overalls" @@ -263,7 +263,7 @@ /datum/gear/suit/roles/cloak_cmo display_name = "cloak, chief medical officer" path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) show_roles = FALSE cost = 1 @@ -421,43 +421,43 @@ /datum/gear/suit/wintercoat/medical display_name = "winter coat, medical" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") show_roles = FALSE /datum/gear/suit/wintercoat/medical/alt display_name = "winter coat, medical alt" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") show_roles = FALSE /datum/gear/suit/wintercoat/medical/viro display_name = "winter coat, virologist" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro - allowed_roles = list("Medical Doctor","Chief Medical Officer") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER) show_roles = FALSE /datum/gear/suit/wintercoat/medical/para display_name = "winter coat, paramedic" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para - allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") show_roles = FALSE /datum/gear/suit/wintercoat/medical/chemist display_name = "winter coat, chemist" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist - allowed_roles = list("Chief Medical Officer","Chemist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST) show_roles = FALSE /datum/gear/suit/wintercoat/medical/cmo display_name = "winter coat, chief medical officer" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) show_roles = FALSE /datum/gear/suit/wintercoat/medical/sar display_name = "winter coat, search and rescue" path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar - allowed_roles = list("Chief Medical Officer","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") show_roles = FALSE /datum/gear/suit/wintercoat/science @@ -668,7 +668,7 @@ /datum/gear/suit/snowsuit/medical display_name = "snowsuit, medical" path = /obj/item/clothing/suit/storage/snowsuit/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist", "Search and Rescue") show_roles = FALSE /datum/gear/suit/snowsuit/science diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 241c84412d..3e169a37bb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -1,5 +1,5 @@ /datum/gear/suit/snowsuit/medical - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/labcoat_colorable display_name = "labcoat, colorable" @@ -16,7 +16,7 @@ /datum/gear/suit/labcoat_cmo_old display_name = "labcoat, CMO, oldschool" path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) /datum/gear/suit/roles/labcoat_old display_name = "labcoat selection, department, oldschool" @@ -73,7 +73,7 @@ /datum/gear/suit/paramedic_coat display_name = "paramedic outerwear selection" path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic",JOB_MEDICAL_DOCTOR) /datum/gear/suit/paramedic_coat/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm index 88323be107..e4562e5e74 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uni_selector.dm @@ -468,7 +468,7 @@ /datum/gear/uniform/medical_selector display_name = "Medical - Basic Uniforms" description = "Select from a range of outfits available to all Medical personnel." - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Psychiatrist","Paramedic","Talon Doctor") show_roles = FALSE path = /obj/item/clothing/under/rank/neo_med sort_category = "Uniforms" @@ -499,9 +499,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/chemist_selector - display_name = "Medical - Chemist's Uniforms" + display_name = "Medical - " + JOB_CHEMIST + "'s Uniforms" description = "Select from a range of outfits available to all Chemists." - allowed_roles = list("Chief Medical Officer","Chemist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_chem sort_category = "Uniforms" @@ -521,7 +521,7 @@ /datum/gear/uniform/paramedic_selector display_name = "Medical - Paramedic's Uniforms" description = "Select from a range of outfits available to all Paramedics." - allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic","Talon Doctor") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,"Paramedic","Talon Doctor") show_roles = FALSE path = /obj/item/clothing/under/rank/paramedunidark sort_category = "Uniforms" @@ -542,9 +542,9 @@ gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms)) /datum/gear/uniform/chief_medical_selector - display_name = "Medical - Chief Medical Officer's Uniforms" - description = "Select from a range of outfits available to all Chief Medical Officers." - allowed_roles = list("Chief Medical Officer") + display_name = "Medical - " + JOB_CHIEF_MEDICAL_OFFICER + "'s Uniforms" + description = "Select from a range of outfits available to all " + JOB_CHIEF_MEDICAL_OFFICER + "." + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) show_roles = FALSE path = /obj/item/clothing/under/rank/neo_cmo sort_category = "Uniforms" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 4bbd71c56d..4b6ba95411 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -20,7 +20,7 @@ /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist","Xenobotanist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist",JOB_RESEARCH_DIRECTOR,"Scientist", "Roboticist", "Xenobiologist","Xenobotanist") /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" @@ -32,7 +32,7 @@ display_name = "DS9 Overcoat (use uniform)" path = /obj/item/clothing/suit/storage/trek/ds9 allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR, - "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", + JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Xenobotanist",JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index a120e8035a..90910a1b74 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -35,7 +35,7 @@ /datum/gear/utility/dufflebag/med display_name = "medical dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/med - allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,"Paramedic","Geneticist","Psychiatrist") /datum/gear/utility/dufflebag/med/emt display_name = "EMT dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 6e9ecdf8d1..33b8f97882 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -194,7 +194,7 @@ /datum/gear/uniform/dept/undercoat/cmo display_name = "chief medical officer undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/cmo - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) /datum/gear/uniform/dept/undercoat/qm display_name = "quartermaster undercoat (Teshari)" @@ -244,27 +244,27 @@ /datum/gear/uniform/dept/undercoat/medical display_name = "medical undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/medical - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist","Psychiatrist") /datum/gear/uniform/dept/undercoat/chemistry display_name = "chemist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/chemistry - allowed_roles = list("Chief Medical Officer","Chemist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST) /datum/gear/uniform/dept/undercoat/virology display_name = "virologist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/viro - allowed_roles = list("Chief Medical Officer","Medical Doctor") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR) /datum/gear/uniform/dept/undercoat/psych display_name = "psychiatrist undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/psych - allowed_roles = list("Chief Medical Officer","Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Psychiatrist") /datum/gear/uniform/dept/undercoat/paramedic display_name = "paramedic undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/para - allowed_roles = list("Chief Medical Officer","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") /datum/gear/uniform/dept/undercoat/iaa display_name = "internal affairs undercoat (Teshari)" @@ -319,7 +319,7 @@ /datum/gear/suit/dept/cloak/cmo display_name = "chief medical officer cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) /datum/gear/suit/dept/cloak/cmo/New() ..() @@ -332,7 +332,7 @@ /datum/gear/suit/dept/cloak/qm display_name = "quartermaster cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/qm - allowed_roles = list("Chief Medical Officer") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER) /datum/gear/suit/dept/cloak/qm/New() ..() @@ -449,7 +449,7 @@ /datum/gear/suit/dept/cloak/medical display_name = "medical cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/medical - allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,"Paramedic","Geneticist", "Psychiatrist") /datum/gear/suit/dept/cloak/medical/New() ..() @@ -462,7 +462,7 @@ /datum/gear/suit/dept/cloak/chemistry display_name = "chemist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry - allowed_roles = list("Chemist") + allowed_roles = list(JOB_CHEMIST) /datum/gear/suit/dept/cloak/chemistry/New() ..() @@ -475,7 +475,7 @@ /datum/gear/suit/dept/cloak/virology display_name = "virologist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/viro - allowed_roles = list("Medical Doctor") + allowed_roles = list(JOB_MEDICAL_DOCTOR) /datum/gear/suit/dept/cloak/virology/New() ..() @@ -488,12 +488,12 @@ /datum/gear/suit/dept/cloak/psych display_name = "psychiatrist cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/psych - allowed_roles = list("Chief Medical Officer","Psychiatrist") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Psychiatrist") /datum/gear/suit/dept/cloak/paramedic display_name = "paramedic cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/para - allowed_roles = list("Chief Medical Officer","Paramedic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,"Paramedic") /datum/gear/suit/dept/cloak/paramedic/New() ..() @@ -565,7 +565,7 @@ /datum/gear/suit/dept/beltcloak/cmd display_name = "command belted cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command - allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,JOB_CHIEF_ENGINEER,"Chief Medical Officer",JOB_RESEARCH_DIRECTOR) + allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,JOB_CHIEF_ENGINEER,JOB_CHIEF_MEDICAL_OFFICER,JOB_RESEARCH_DIRECTOR) sort_category = "Xenowear" /datum/gear/suit/cloak_hood diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c7284fd15c..1f76513b64 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -129,7 +129,7 @@ var/list/preferences_datums = list() // will probably not be able to do this for head and torso ;) var/list/organ_data = list() var/list/rlimb_data = list() - var/list/player_alt_titles = new() // the default name of a job like "Medical Doctor" + var/list/player_alt_titles = new() // the default name of a job like JOB_MEDICAL_DOCTOR var/list/body_markings = list() // "name" = "#rgbcolor" //VOREStation Edit: "name" = list(BP_HEAD = list("on" = , "color" = "#rgbcolor"), BP_TORSO = ...) diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index e9089950f7..f2908427dd 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -158,7 +158,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry name = "chemist cloak" - desc = "A soft Teshari cloak made for the Chemist" + desc = "A soft Teshari cloak made for the " + JOB_CHEMIST icon_state = "tesh_cloak_chem" /obj/item/clothing/suit/storage/teshari/cloak/jobs/viro @@ -639,7 +639,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo name = "chief medical officer belted cloak" - desc = "A soft Teshari cloak made the Chief Medical Officer" + desc = "A soft Teshari cloak made the " + JOB_CHIEF_MEDICAL_OFFICER icon_state = "tesh_beltcloak_cmo" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/medical @@ -649,7 +649,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/chemistry name = "chemist belted cloak" - desc = "A soft Teshari cloak made for the Chemist" + desc = "A soft Teshari cloak made for the " + JOB_CHEMIST icon_state = "tesh_beltcloak_chem" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index d54d9f360f..5d92e3ebfc 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -76,7 +76,7 @@ item_state_slots = list(slot_r_hand_str = "genetics_labcoat", slot_l_hand_str = "genetics_labcoat") /obj/item/clothing/suit/storage/toggle/labcoat/chemist - name = "Chemist labcoat" + name = JOB_CHEMIST + " labcoat" desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." icon_state = "labcoat_chem" item_state_slots = list(slot_r_hand_str = "chemist_labcoat", slot_l_hand_str = "chemist_labcoat") diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 6193f3b9c1..cf2a59b7fd 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -51,7 +51,7 @@ * Medical */ /obj/item/clothing/under/rank/chief_medical_officer - desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." + desc = "It's a jumpsuit worn by those with the experience to be \"" + JOB_CHIEF_MEDICAL_OFFICER + "\". It provides minor biological protection." name = "chief medical officer's jumpsuit" icon_state = "cmo" item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white") diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 72b0e9dc3e..75160cfd05 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -217,7 +217,7 @@ icon_state = "chemistryf" /obj/item/clothing/under/rank/chief_medical_officer/skirt - desc = "It's a jumpskirt worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." + desc = "It's a jumpskirt worn by those with the experience to be \"" + JOB_CHIEF_MEDICAL_OFFICER + "\". It provides minor biological protection." name = "chief medical officer's jumpskirt" icon_state = "cmof" diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm index 01f3de9563..4cabe3d2c9 100644 --- a/code/modules/clothing/under/xenos/teshari.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -282,7 +282,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/chemistry name = "chemist undercoat" - desc = "A traditional Teshari garb made for the Chemist" + desc = "A traditional Teshari garb made for the " + JOB_CHEMIST icon_state = "tesh_uniform_chem" /obj/item/clothing/under/teshari/undercoat/jobs/viro diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 24686b3ce4..802235b18b 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -6,9 +6,9 @@ var/list/dreams = list( "a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights", "a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", - "the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the Chief Medical Officer", + "the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the " + JOB_CHIEF_MEDICAL_OFFICER, "the " + JOB_DETECTIVE,"the " + JOB_WARDEN,"an Internal Affairs Agent","an " + JOB_ENGINEER,"the Janitor","the " + JOB_ATMOSPHERIC_TECHNICIAN, - "the Quartermaster","a Cargo Technician","the Botanist","a " + JOB_SHAFT_MINER,"the Psychologist","the Chemist","a Geneticist", + "the Quartermaster","a Cargo Technician","the Botanist","a " + JOB_SHAFT_MINER,"the Psychologist","the " + JOB_CHEMIST,"a Geneticist", "the Virologist","the Roboticist","the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member", "a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell", "an Unathi","a Tajaran","the Station Intelligence core","the mining station","the research station","a beaker of strange liquid", diff --git a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm index 222cd4f52a..ee7c4becf3 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm @@ -8,11 +8,11 @@ /obj/machinery/smartfridge/secure/extract expert_job = "Xenobiologist" /obj/machinery/smartfridge/secure/medbay - expert_job = "Chemist" + expert_job = JOB_CHEMIST /obj/machinery/smartfridge/secure/chemistry - expert_job = "Chemist" + expert_job = JOB_CHEMIST /obj/machinery/smartfridge/secure/virology - expert_job = "Medical Doctor" //Virologist is an alt-title unfortunately + expert_job = JOB_MEDICAL_DOCTOR //Virologist is an alt-title unfortunately /obj/machinery/smartfridge/drinks expert_job = "Bartender" @@ -42,7 +42,7 @@ /obj/machinery/smartfridge/chemistry/chemvator name = "\improper Smart Chemavator - Upper" desc = "A refrigerated storage unit for medicine and chemical storage. Now sporting a fancy system of pulleys to lift bottles up and down." - expert_job = "Chemist" + expert_job = JOB_CHEMIST var/obj/machinery/smartfridge/chemistry/chemvator/attached /obj/machinery/smartfridge/chemistry/chemvator/accept_check(var/obj/item/O as obj) diff --git a/code/modules/games/cah_black_cards.dm b/code/modules/games/cah_black_cards.dm index 877557d0dc..cc455e7342 100644 --- a/code/modules/games/cah_black_cards.dm +++ b/code/modules/games/cah_black_cards.dm @@ -24,7 +24,7 @@ "Why am I shivering?", "What is this world coming to? First, ________, now _______", "NanoTrasen's labor union decided to use _______ to raise employee morale.", - "The Chemist's drug of choice is ______", + "The " + JOB_CHEMIST + "'s drug of choice is ______", "It is common practice for _______ to ______ on Moghes.", "Mercurial Colonies are _____.", "The Skrell are celebrating _____ today.", diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 430029a0df..18c45b26d4 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -506,11 +506,11 @@ /mob/living/simple_mob/animal/space/carp/holodeck/proc/set_safety(var/safe) if (safe) - faction = "neutral" + faction = FACTION_NEUTRAL melee_damage_lower = 0 melee_damage_upper = 0 else - faction = "carp" + faction = FACTION_CARP melee_damage_lower = initial(melee_damage_lower) melee_damage_upper = initial(melee_damage_upper) diff --git a/code/modules/lore_codex/legal_code_data/sop/medical.dm b/code/modules/lore_codex/legal_code_data/sop/medical.dm index fe6f5b4d28..1525fdcbf3 100644 --- a/code/modules/lore_codex/legal_code_data/sop/medical.dm +++ b/code/modules/lore_codex/legal_code_data/sop/medical.dm @@ -28,10 +28,10 @@ /datum/lore/codex/page/sop_cloning name = "Cloning Procedures" - data = "Persons whom have committed suicide are not to be cloned, without authorization from the Chief Medical Officer. \ - The Chief Medical Officer is fully responsible if they choose to clone a person whom has committed suicide. \ + data = "Persons whom have committed suicide are not to be cloned, without authorization from the " + JOB_CHIEF_MEDICAL_OFFICER + ". \ + The " + JOB_CHIEF_MEDICAL_OFFICER + " is fully responsible if they choose to clone a person whom has committed suicide. \ Individuals are also to not be cloned if there is a Do Not Clone (generally referred to as DNC) order in their medical records, \ - or if the individual has had a DNC order declared against them by the " + JOB_SITE_MANAGER + ", Chief Medical Officer, or " + JOB_HEAD_OF_SECURITY + ". \ + or if the individual has had a DNC order declared against them by the " + JOB_SITE_MANAGER + ", " + JOB_CHIEF_MEDICAL_OFFICER + ", or " + JOB_HEAD_OF_SECURITY + ". \ If any of this occurs, procede to Portmortem Storage.\

\ Some individuals may have special instructions in their Postmortem Instructions, generally found in their medical records. \ diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 06bbc81005..1d1af5df68 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -7,7 +7,7 @@ language = "Hivemind" maxHealth = 50 health = 50 - faction = "xeno" + faction = FACTION_XENO max_grown = 325 //Increase larva growth time due to not needing hosts. /mob/living/carbon/alien/larva/Initialize() diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index a028c12e72..511ebdcb27 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -121,7 +121,7 @@ generate_gender = TRUE identifying_gender = NEUTER - faction = "xeno" + faction = FACTION_XENO to_wear_helmet = /obj/item/clothing/head/helmet/dermal to_wear_glasses = /obj/item/clothing/glasses/goggles diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 6a397f985f..2cd40d6054 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -9,7 +9,7 @@ icon_rest = "rest" icon_dead = "puddle" - faction = "neutral" + faction = FACTION_NEUTRAL maxHealth = 200 health = 200 say_list_type = /datum/say_list/protean_blob diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm index 6c73c18430..8dcf913c65 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm @@ -9,22 +9,22 @@ /mob/living/carbon/human/xdrone/New(var/new_loc) h_style = "Bald" - faction = "xeno" + faction = FACTION_XENO ..(new_loc, SPECIES_XENO_DRONE) /mob/living/carbon/human/xsentinel/New(var/new_loc) h_style = "Bald" - faction = "xeno" + faction = FACTION_XENO ..(new_loc, SPECIES_XENO_SENTINEL) /mob/living/carbon/human/xhunter/New(var/new_loc) h_style = "Bald" - faction = "xeno" + faction = FACTION_XENO ..(new_loc, SPECIES_XENO_HUNTER) /mob/living/carbon/human/xqueen/New(var/new_loc) h_style = "Bald" - faction = "xeno" + faction = FACTION_XENO ..(new_loc, SPECIES_XENO_QUEEN) //Removed AddInfectionImages, no longer required. diff --git a/code/modules/mob/living/silicon/robot/drone/swarm.dm b/code/modules/mob/living/silicon/robot/drone/swarm.dm index 17056e29dd..a0151ca9f2 100644 --- a/code/modules/mob/living/silicon/robot/drone/swarm.dm +++ b/code/modules/mob/living/silicon/robot/drone/swarm.dm @@ -4,7 +4,7 @@ icon = 'icons/mob/swarmbot.dmi' icon_state = "swarmer" item_state = "repairbot" - faction = "swarmer" + faction = FACTION_SWARMER maxHealth = 35 health = 35 cell_emp_mult = 0.5 @@ -75,7 +75,7 @@ real_name = "drone" icon = 'icons/mob/swarmbot.dmi' icon_state = "swarmer_ranged" - faction = "swarmer" + faction = FACTION_SWARMER maxHealth = 50 health = 50 @@ -96,7 +96,7 @@ real_name = "drone" icon = 'icons/mob/swarmbot.dmi' icon_state = "swarmer_melee" - faction = "swarmer" + faction = FACTION_SWARMER maxHealth = 70 health = 70 @@ -111,4 +111,3 @@ /spell/aoe_turf/conjure/forcewall/swarm, /spell/aoe_turf/blink/swarm ) - diff --git a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm index dd4fc73631..20bd5e5bd8 100644 --- a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm @@ -90,7 +90,7 @@ see_in_dark = 10 - faction = "overmap" + faction = FACTION_OVERMAP low_priority = FALSE devourable = FALSE digestable = FALSE diff --git a/code/modules/mob/living/simple_mob/sd_pets.dm b/code/modules/mob/living/simple_mob/sd_pets.dm index 119bb2c23d..251bfa323b 100644 --- a/code/modules/mob/living/simple_mob/sd_pets.dm +++ b/code/modules/mob/living/simple_mob/sd_pets.dm @@ -109,7 +109,7 @@ desc = "A good boi, eats the scraps when you're not looking." devourable = 0 digestable = 0 - faction = "bar" + faction = FACTION_BAR mob_bump_flag = 32 ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/otie/cocoa catalogue_data = list(/datum/category_item/catalogue/fauna/otie/cocoa) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 4bcfc145a1..4a7272fe03 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -23,7 +23,7 @@ icon_rest = "catslug_rest" icon = 'icons/mob/alienanimals_x32.dmi' - faction = "catslug" + faction = FACTION_CATSLUG maxHealth = 50 health = 50 movement_cooldown = -1 @@ -750,7 +750,7 @@ icon_living = "capslug" icon_rest = "capslug_rest" icon_dead = "capslug_dead" - faction = "neutral" + faction = FACTION_NEUTRAL catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/capslug) holder_type = /obj/item/weapon/holder/catslug/custom/capslug say_list_type = /datum/say_list/catslug/custom/capslug @@ -824,7 +824,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug) say_list_type = /datum/say_list/catslug myid_access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) - faction = "syndicate" + faction = FACTION_SYNDICATE maxHealth = 100 //Tough noodles health = 100 taser_kill = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm index 1b70b1713d..1ed1bd20fe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -27,7 +27,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) hovering = TRUE - faction = "jellyfish" + faction = FACTION_JELLYFISH maxHealth = 100 health = 100 nutrition = 150 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm index 4f1e1efd9d..d5f2f32a24 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm @@ -23,7 +23,7 @@ icon_living = "skeleton" icon_dead = "skeleton_dead" - faction = "space skeleton" + faction = FACTION_SPACE_SKELETON maxHealth = 100 health = 100 movement_cooldown = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm index 82bbd33d49..195a7b7130 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm @@ -17,7 +17,7 @@ icon_living = "space_mouse" icon_dead = "space_mouse_dead" - faction = "space mouse" + faction = FACTION_SPACE_MOUSE maxHealth = 20 health = 20 movement_cooldown = -1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm index a59560f2e1..33103e2543 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm @@ -22,7 +22,7 @@ hovering = TRUE pass_flags = PASSTABLE - faction = "space ghost" + faction = FACTION_SPACE_GHOST maxHealth = 50 health = 50 movement_cooldown = 0 @@ -134,7 +134,7 @@ hovering = TRUE pass_flags = PASSTABLE - faction = "space ghost" + faction = FACTION_SPACE_GHOST maxHealth = 5 health = 5 movement_cooldown = -1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm index 2abb3b52df..7c4e53f579 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm @@ -1630,7 +1630,7 @@ 'sound/vore/sunesound/prey/squish_04.ogg', 'sound/vore/sunesound/prey/stomachmove.ogg' ) - var/faction = "macrobacteria" + var/faction = FACTION_MACROBACTERIA /obj/structure/auto_flesh_door/Initialize() . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm index f980220879..192c260b77 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm @@ -17,7 +17,7 @@ icon_living = "startreader" icon_dead = "startreader_dead" - faction = "space turtle" + faction = FACTION_SPACE_TURTLE maxHealth = 1000 health = 1000 movement_cooldown = 10 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 0735d440ba..3596481b33 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -60,7 +60,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? pixel_x = -16 default_pixel_x = -16 - faction = "teppi" + faction = FACTION_TEPPI maxHealth = 600 health = 600 movement_cooldown = -1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm index c172d0b654..618b0960e1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm @@ -6,7 +6,7 @@ icon_living = "goat" icon_dead = "goat_dead" - faction = "goat" + faction = FACTION_GOAT health = 40 maxHealth = 40 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index 49a22fb990..d6427b0d25 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -69,7 +69,7 @@ icon_dead = "guard_dead" has_eye_glow = TRUE - faction = "spiders" + faction = FACTION_SPIDERS maxHealth = 200 health = 200 pass_flags = PASSTABLE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm index 8fba024af5..6af704e2bb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm @@ -3,7 +3,7 @@ name = "crab" desc = "A hard-shelled crustacean. Seems quite content to lounge around all the time." tt_desc = "E Cancer bellianus" - faction = "crabs" + faction = FACTION_CRABS icon_state = "crab" icon_living = "crab" @@ -53,4 +53,4 @@ adjust_scale(rand(5,12) / 10) /decl/mob_organ_names/crab - hit_zones = list("cephalothorax", "abdomen", "left walking legs", "right walking legs", "left swimming legs", "right swimming legs", "left pincer", "right pincer") \ No newline at end of file + hit_zones = list("cephalothorax", "abdomen", "left walking legs", "right walking legs", "left swimming legs", "right swimming legs", "left pincer", "right pincer") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index d05af3dc43..30a9c8a875 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -13,7 +13,7 @@ see_in_dark = 6 mob_size = MOB_SMALL //Foxes are not smaller than cats so bumping them up to small - faction = "fox" + faction = FACTION_FOX response_help = "scritches" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm index 11397bafe5..eb7a5ccec7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm @@ -19,7 +19,7 @@ tt_desc = "S Choeros hirtus" //diyaab and shantak are technically reletives! catalogue_data = list(/datum/category_item/catalogue/fauna/diyaab) - faction = "diyaab" + faction = FACTION_DIYAAB icon_state = "diyaab" icon_living = "diyaab" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm index 4c8db3ce62..7e6072a7cb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm @@ -19,7 +19,7 @@ tt_desc = "S Anatidae vitriae" //catalogue_data = list(/datum/category_item/catalogue/fauna/crystalduck) TODO: Write non-sif lore - faction = "duck" + faction = FACTION_DUCK icon_state = "duck" icon_living = "duck" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm index ec548fb746..0a5b21b0da 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/frostfly.dm @@ -21,7 +21,7 @@ tt_desc = "S Carabidae glacios" catalogue_data = list(/datum/category_item/catalogue/fauna/frostfly) - faction = "diyaab" + faction = FACTION_DIYAAB icon_state = "firefly" icon_living = "firefly" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm index d59db7ac28..4a90129e70 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm @@ -28,7 +28,7 @@ tt_desc = "S Lepidoptera adamas" catalogue_data = list(/datum/category_item/catalogue/fauna/glitterfly) - faction = "neutral" + faction = FACTION_NEUTRAL icon_state = "butterfly" icon_living = "butterfly" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index 167992f9cd..e1b628346a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -140,7 +140,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo see_in_dark = 8 // on par with Taj tt_desc = "S tesca pabulator" - faction = "grafadreka" + faction = FACTION_GRAFADREKA mob_size = MOB_LARGE mob_bump_flag = SIMPLE_ANIMAL diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index 7018a83aef..48706ddeb5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -35,7 +35,7 @@ icon_scale_x = 1.5 icon_scale_y = 1.5 - faction = "crabs" + faction = FACTION_CRABS maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm index 4440e65d15..858057a23d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm @@ -23,7 +23,7 @@ tt_desc = "S Felidae fluctursora" catalogue_data = list(/datum/category_item/catalogue/fauna/kururak) - faction = "kururak" + faction = FACTION_KURUAK icon_state = "bigcat" icon_living = "bigcat" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm index 0b1c99d64b..98b981f501 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -21,7 +21,7 @@ tt_desc = "S Hirudinea phorus" catalogue_data = list(/datum/category_item/catalogue/fauna/iceleech) - faction = "leech" + faction = FACTION_LEECH icon_state = "leech" item_state = "brainslug" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm index 67177bb19b..12d8d9e0fe 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/moth.dm @@ -28,7 +28,7 @@ tt_desc = "B Lepidoptera cinereus" catalogue_data = list(/datum/category_item/catalogue/fauna/tymisian) - faction = "spiders" //Hostile to most mobs, not all. + faction = FACTION_SPIDERS //Hostile to most mobs, not all. icon_state = "moth" icon_living = "moth" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index 13a8328b7e..b11c2e2883 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -17,7 +17,7 @@ tt_desc = "S Procyon cogitae" catalogue_data = list(/datum/category_item/catalogue/fauna/sakimm) - faction = "sakimm" + faction = FACTION_SAKIMM icon_state = "raccoon" icon_living = "raccoon" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm index 9c11c97159..d9fa4fc04d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm @@ -21,7 +21,7 @@ name = "savik" tt_desc = "S Pistris tellus" //landshark catalogue_data = list(/datum/category_item/catalogue/fauna/savik) - faction = "savik" + faction = FACTION_SAVIK icon_state = "savik" icon_living = "savik" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm index e82bb30195..37644c4116 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm @@ -25,7 +25,7 @@ tt_desc = "S Choeros shantak" catalogue_data = list(/datum/category_item/catalogue/fauna/shantak) - faction = "shantak" + faction = FACTION_SHANTAK icon_state = "shantak" icon_living = "shantak" @@ -107,7 +107,7 @@ name = "Scruffy" ai_holder_type = /datum/ai_holder/simple_mob/passive makes_dirt = 0 - faction = "neutral" + faction = FACTION_NEUTRAL /decl/mob_organ_names/shantak hit_zones = list("head", "torso", "left foreleg", "right foreleg", "left hind leg", "right hind leg", "tail", "mane", "snout") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm index dcbed0f0f8..da75d3c9b2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/siffet.dm @@ -18,7 +18,7 @@ tt_desc = "S Pruinaeictis velocis" //Sivian frost weasel, fast catalogue_data = list(/datum/category_item/catalogue/fauna/siffet) - faction = "siffet" + faction =FACTION_SIFFET mob_size = MOB_SMALL diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm index 7d1fe9f567..69d048a712 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm @@ -8,7 +8,7 @@ icon_gib = "syndicate_gib" icon_rest = "alienh_sleep" - faction = "xeno" + faction = FACTION_XENO mob_class = MOB_CLASS_ABERRATION diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm index f4c4719059..24be3514d8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm @@ -8,7 +8,7 @@ icon_dead = "bat_dead" icon_gib = "bat_dead" - faction = "scarybat" + faction = FACTION_SCARYBAT maxHealth = 20 health = 20 @@ -48,7 +48,7 @@ // Spookiest of bats /mob/living/simple_mob/animal/space/bats/cult - faction = "cult" + faction = FACTION_CULT supernatural = TRUE /mob/living/simple_mob/animal/space/bats/cult/cultify() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm index 4356f778f2..334728006a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm @@ -7,7 +7,7 @@ icon_dead = "bear_dead" icon_gib = "bear_gib" - faction = "russian" + faction = FACTION_RUSSIAN maxHealth = 125 health = 125 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index 357eb366e3..e7c5983452 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -34,7 +34,7 @@ icon_dead = "carp_dead" icon_gib = "carp_gib" - faction = "carp" + faction = FACTION_CARP maxHealth = 25 health = 25 movement_cooldown = -2 @@ -249,4 +249,4 @@ ..() /mob/living/simple_mob/animal/space/carp/puffer/ex_act() //explode? YOU BETTER BELIEVE THAT'S AN EXPLODE - kaboom() \ No newline at end of file + kaboom() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/gaslamp_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/gaslamp_vr.dm index 2958cc58d8..436d6c8315 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/gaslamp_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/gaslamp_vr.dm @@ -27,7 +27,7 @@ TODO: Make them light up and heat the air when exposed to oxygen. icon = 'icons/mob/vore32x64.dmi' vis_height = 64 - faction = "virgo3b" + faction = FACTION_VIRGO3B maxHealth = 100 health = 100 movement_cooldown = 4 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm index 35c77548b1..78c416bd17 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/gnat.dm @@ -26,7 +26,7 @@ icon_living = "gnat" icon_dead = "gnat_dead" - faction = "gnat" + faction = FACTION_GNAT maxHealth = 5 health = 5 movement_cooldown = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm index 875434ebea..5025572a9c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm @@ -6,7 +6,7 @@ icon_living = "goose" icon_dead = "goose_dead" - faction = "geese" + faction = FACTION_GEESE maxHealth = 30 health = 30 @@ -55,4 +55,4 @@ icon_living = "whitegoose" icon_dead = "whitegoose_dead" name = "white goose" - desc = "And just when you thought it was a lovely day..." \ No newline at end of file + desc = "And just when you thought it was a lovely day..." diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm index 830964f05f..8db3f451d3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm @@ -4,4 +4,4 @@ value = CATALOGUER_REWARD_EASY /mob/living/simple_mob/animal/space/goose/virgo3b - faction = "virgo3b" \ No newline at end of file + faction = FACTION_VIRGO3B diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm index 18eace68b5..496b541459 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm @@ -36,7 +36,7 @@ icon_rest = "ray_rest" icon_gib = "ray_gib" - faction = "ray" + faction = FACTION_RAY maxHealth = 125 health = 125 movement_cooldown = 0 // Carp go fast diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm index 466df2905d..6998e46e7f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm @@ -19,7 +19,7 @@ icon_dead = "shark_dead" icon_rest = "shark_rest" - faction = "spaceshark" + faction = FACTION_SPACESHARK maxHealth = 125 health = 125 movement_cooldown = 0 @@ -53,4 +53,4 @@ L.visible_message(span("danger", "\The [src] knocks down \the [L]!")) /mob/living/simple_mob/animal/space/shark/event - ai_holder_type = /datum/ai_holder/simple_mob/event \ No newline at end of file + ai_holder_type = /datum/ai_holder/simple_mob/event diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index 06ca3cd533..b67f102df6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -14,7 +14,7 @@ health = 200 movement_cooldown = -1 - faction = "worm" + faction = FACTION_WORM status_flags = 0 universal_speak = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm index 4611e3fe60..ce8dc2059c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/squirrel.dm @@ -19,7 +19,7 @@ icon = 'icons/mob/alienanimals_x32.dmi' color = "#76462c" - faction = "animal" + faction = FACTION_ANIMAL maxHealth = 40 health = 40 movement_cooldown = -1 diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm index c735a93b2a..b4da2af792 100644 --- a/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm +++ b/code/modules/mob/living/simple_mob/subtypes/blob/blob.dm @@ -5,7 +5,7 @@ /mob/living/simple_mob/blob icon = 'icons/mob/blob.dmi' pass_flags = PASSBLOB | PASSTABLE - faction = "blob" + faction = FACTION_BLOB organ_names = /decl/mob_organ_names/blob @@ -86,4 +86,4 @@ return ally /decl/mob_organ_names/blob - hit_zones = list("mass") \ No newline at end of file + hit_zones = list("mass") diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm index 1fd1ebf2b4..5c3969d252 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/clown.dm @@ -8,7 +8,7 @@ icon_dead = "clown_dead" icon_gib = "clown_gib" - faction = "clown" + faction = FACTION_CLOWN loot_list = list(/obj/item/weapon/bikehorn = 100) @@ -31,4 +31,4 @@ emote_see = list("honks") /decl/mob_organ_names/clown - hit_zones = list("head", "torso", "pie-hole", "honker", "left funny bone", "right funny bone", "left foot", "right foot", "unmentionables") \ No newline at end of file + hit_zones = list("head", "torso", "pie-hole", "honker", "left funny bone", "right funny bone", "left foot", "right foot", "unmentionables") diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index f939e1d3c7..be5111540e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -12,7 +12,7 @@ icon_dead = "syndicate_dead" icon_gib = "syndicate_gib" - faction = "syndicate" + faction = FACTION_SYNDICATE movement_cooldown = 1 status_flags = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm index 41b7941b68..d9b864c855 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_altevian.dm @@ -8,7 +8,7 @@ icon_dead = "merc-dead" icon_gib = "merc_gib" - faction = "altevian" + faction = FACTION_ALTEVIAN movement_cooldown = 1 status_flags = 0 @@ -116,16 +116,16 @@ projectilesound = 'sound/weapons/Gunshot_heavy.ogg' /mob/living/simple_mob/humanoid/merc/altevian/neutral - faction = "neutral" + faction = FACTION_NEUTRAL /mob/living/simple_mob/humanoid/merc/altevian/sapper/neutral - faction = "neutral" + faction = FACTION_NEUTRAL /mob/living/simple_mob/humanoid/merc/altevian/ranged/neutral - faction = "neutral" + faction = FACTION_NEUTRAL /mob/living/simple_mob/humanoid/merc/altevian/ranged/strong/neutral - faction = "neutral" + faction = FACTION_NEUTRAL /mob/living/simple_mob/humanoid/merc/altevian/ranged/ballistic/neutral - faction = "neutral" + faction = FACTION_NEUTRAL diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm index 253bfb73b8..d8e3f0fbda 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm @@ -6,7 +6,7 @@ icon_living = "piratemelee" icon_dead = "piratemelee_dead" - faction = "pirate" + faction = FACTION_PIRATE response_help = "pushes" response_disarm = "shoves" @@ -37,4 +37,4 @@ loot_list = list(/obj/item/weapon/gun/energy/laser = 100) - corpse = /obj/effect/landmark/mobcorpse/pirate/ranged \ No newline at end of file + corpse = /obj/effect/landmark/mobcorpse/pirate/ranged diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm index 121e112a7a..cc712b1625 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm @@ -7,7 +7,7 @@ icon_dead = "russianmelee_dead" icon_gib = "syndicate_gib" - faction = "russian" + faction = FACTION_RUSSIAN response_help = "pokes" response_disarm = "shoves" @@ -33,4 +33,4 @@ loot_list = list(/obj/item/weapon/gun/projectile/revolver/mateba = 100) - corpse = /obj/effect/landmark/mobcorpse/russian/ranged \ No newline at end of file + corpse = /obj/effect/landmark/mobcorpse/russian/ranged diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm index 09c4581125..0b140b623a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm @@ -26,7 +26,7 @@ icon_living = "corrupt-repairbot" hovering = FALSE // Can trigger landmines. - faction = "underdark" + faction = FACTION_UNDERDARK maxHealth = 25 health = 25 movement_cooldown = -1 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm index fbfedf1cd7..3d30826085 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm @@ -34,7 +34,7 @@ response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "hits the" - faction = "vagrant" + faction = FACTION_VAGRANT harm_intent_damage = 3 melee_damage_lower = 6 melee_damage_upper = 9 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm index 1d37471dbf..8325667df1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm @@ -39,7 +39,7 @@ icon_dead = "drone_dead" has_eye_glow = TRUE - faction = "malf_drone" + faction = FACTION_MALF_DRONE maxHealth = 50 // Shield has 150 for total of 200. health = 50 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm index 77503cfb0d..9e167b3223 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm @@ -25,7 +25,7 @@ icon_dead = "miningdrone_dead" has_eye_glow = TRUE - faction = "malf_drone" + faction = FACTION_MALF_DRONE maxHealth = 50 health = 50 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm index a0ceb1b1af..e888d643f5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm @@ -8,7 +8,7 @@ health = 300 maxHealth = 300 - faction = "golem" + faction = FACTION_GOLEM response_help = "pets" response_disarm = "pushes away" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm index 7c5f3a6cf7..cdc57dc37c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm @@ -5,7 +5,7 @@ icon_state = "basic" icon_living = "basic" - faction = "hivebot" + faction = FACTION_HIVEBOT maxHealth = 3 LASERS_TO_KILL health = 3 LASERS_TO_KILL diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm index d5951723dd..17a78da625 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support.dm @@ -99,7 +99,7 @@ say_list_type = /datum/say_list/hivebot/harry melee_damage_lower = 0 melee_damage_upper = 0 - faction = "Station" + faction = FACTION_STATION water_resist = 1 //Harry lives under the sea! /mob/living/simple_mob/mechanical/hivebot/support/harry/death() diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm index d572508433..96b3797891 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/mecha.dm @@ -7,7 +7,7 @@ desc = "A big stompy mech!" icon = 'icons/mecha/mecha.dmi' - faction = "syndicate" + faction = FACTION_SYNDICATE movement_cooldown = 1.5 movement_sound = "mechstep" // This gets fed into playsound(), which can also take strings as a 'group' of sound files. turn_sound = 'sound/mecha/mechturn.ogg' diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm index 629b1c1f60..d1163abd42 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm @@ -27,7 +27,7 @@ icon_living = "viscerator_attack" hovering = TRUE // Won't trigger landmines. - faction = "syndicate" + faction = FACTION_SYNDICATE maxHealth = 15 health = 15 movement_cooldown = -2 @@ -73,7 +73,7 @@ icon_state = "viscerator_b_attack" icon_living = "viscerator_b_attack" - faction = "station" + faction = FACTION_STATION maxHealth = 20 health = 20 diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/wahlem_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/wahlem_vr.dm index b731653cc6..b9b22a1618 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/wahlem_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/wahlem_vr.dm @@ -8,7 +8,7 @@ health = 300 maxHealth = 300 - faction = "golem" + faction = FACTION_GOLEM response_help = "brushes over" response_disarm = "repulses away" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm index 21f5e78722..238ea9822a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm @@ -40,7 +40,7 @@ // For PoIs. /mob/living/simple_mob/mechanical/ward/monitor/syndicate - faction = "syndicate" + faction = FACTION_SYNDICATE /mob/living/simple_mob/mechanical/ward/monitor/crew icon_state = "ward-nt" diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm index 79aba5ce9d..84ecc23938 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/ward.dm @@ -13,7 +13,7 @@ response_help = "pets" response_disarm = "swats away" response_harm = "punches" - faction = "wards" // Needed as most human mobs are in neutral faction. The owner is generally except from any ward hostility regardless. + faction = FACTION_WARDS // Needed as most human mobs are in neutral faction. The owner is generally except from any ward hostility regardless. organ_names = /decl/mob_organ_names/ward diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm index f8e2ce6220..4d7205abbc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm @@ -54,7 +54,7 @@ "rad" = 100) can_be_antagged = TRUE - faction = "cult" + faction = FACTION_CULT supernatural = TRUE @@ -155,4 +155,4 @@ /mob/living/simple_mob/construct/proc/remove_glow() cut_overlays() -*/ \ No newline at end of file +*/ diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm index 9151ea6e2e..1336cc719f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/creature.dm @@ -8,7 +8,7 @@ mob_class = MOB_CLASS_ABERRATION - faction = "creature" + faction = FACTION_CREATURE maxHealth = 40 health = 40 @@ -43,7 +43,7 @@ /mob/living/simple_mob/creature/cult mob_class = MOB_CLASS_DEMONIC - faction = "cult" + faction = FACTION_CULT min_oxy = 0 max_oxy = 0 @@ -70,4 +70,4 @@ melee_damage_upper = 25 /decl/mob_organ_names/abberation - hit_zones = list("fleshy mass", "maw", "eye(?)", "orifice(?)") \ No newline at end of file + hit_zones = list("fleshy mass", "maw", "eye(?)", "orifice(?)") diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm index 0ee4daf433..fa06001356 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm @@ -5,7 +5,7 @@ icon_living = "faithless" icon_dead = "faithless_dead" - faction = "faithless" + faction = FACTION_FAITHLESS mob_class = MOB_CLASS_DEMONIC @@ -63,7 +63,7 @@ // Cult Variant /mob/living/simple_mob/faithless/cult - faction = "cult" + faction = FACTION_CULT supernatural = TRUE /mob/living/simple_mob/faithless/cult/cultify() @@ -79,4 +79,4 @@ melee_damage_upper = 28 /decl/mob_organ_names/faithless - hit_zones = list("body", "left appendage", "right appendage", "shadowy tendrils", "head", "right stump", "left stump", "infernal eye") \ No newline at end of file + hit_zones = list("body", "left appendage", "right appendage", "shadowy tendrils", "head", "right stump", "left stump", "infernal eye") diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm index f6c65b9ed3..68caa43b11 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm @@ -15,7 +15,7 @@ icon_living = "glitch_boss" icon_dead = "glitch_boss_dead" - faction = "MATH" + faction = FACTION_MATH maxHealth = 2000 health = 2000 @@ -296,7 +296,7 @@ icon_state = "glitch_boss" icon_living = "glitch_boss" icon_dead = "glitch_boss_dead" - faction = "MATH" + faction = FACTION_MATH maxHealth = 20 health = 20 diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm index 50ee63637c..a43088ec9f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm @@ -8,7 +8,7 @@ mob_class = MOB_CLASS_PLANT - faction = "plants" + faction = FACTION_PLANTS maxHealth = 15 health = 15 poison_resist = 1.0 @@ -30,4 +30,4 @@ meat_amount = 4 /decl/mob_organ_names/tomato - hit_zones = list("flesh", "leaf", "mouth") \ No newline at end of file + hit_zones = list("flesh", "leaf", "mouth") diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm index be6af537c8..921e0c6ebc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm @@ -10,7 +10,7 @@ mob_class = MOB_CLASS_PLANT - faction = "plants" + faction = FACTION_PLANTS maxHealth = 250 health = 250 poison_resist = 1.0 @@ -46,4 +46,4 @@ qdel(src) /decl/mob_organ_names/tree - hit_zones = list("trunk", "branches", "twigs") \ No newline at end of file + hit_zones = list("trunk", "branches", "twigs") diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 74ab2324ca..d821844ede 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -31,7 +31,7 @@ var/list/_slime_default_emotes = list( glow_intensity = 2 gender = NEUTER - faction = "slime" // Note that slimes are hostile to other slimes of different color regardless of faction (unless Unified). + faction = FACTION_SLIME // Note that slimes are hostile to other slimes of different color regardless of faction (unless Unified). maxHealth = 150 movement_cooldown = -1 pass_flags = PASSTABLE diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm index d4e96c23d5..ce86efdc61 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm @@ -172,7 +172,7 @@ var/datum/ai_holder/simple_mob/xenobio_slime/AI = ai_holder AI.pacify() - faction = "neutral" + faction = FACTION_NEUTRAL // If for whatever reason the mob AI (or player) decides to try to attack something anyways. melee_damage_upper = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm index 9d67740a5c..0d682ffd2e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bat.dm @@ -22,7 +22,7 @@ say_list_type = /datum/say_list/bat ai_holder_type = /datum/ai_holder/simple_mob/retaliate/edible - faction = "vampire" + faction = FACTION_VAMPIRE allow_mind_transfer = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm index 9424d0b794..b0404451d2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm @@ -38,7 +38,7 @@ max_n2 = 0 minbodytemp = 0 - faction = "bee" + faction = FACTION_BEE var/poison_type = "spidertoxin" // The reagent that gets injected when it attacks, can be changed to different toxin. var/poison_chance = 10 // Chance for injection to occur. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index fde53a7120..5267ceb348 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -94,7 +94,7 @@ I think I covered everything. vore_pounce_maxhealth = 125 vore_bump_emote = "tries to snap up" icon_dead = "dragon-dead" - faction = "dragon" + faction = FACTION_DRAGON glow_range = 7 glow_intensity = 3 glow_color = "#ED9200" @@ -189,7 +189,7 @@ I think I covered everything. /mob/living/simple_mob/vore/bigdragon/friendly ai_holder_type = /datum/ai_holder/simple_mob/healbelly/retaliate/dragon desc = "A large, intimidating creature reminiscent of the traditional idea of medieval fire breathing lizards. This one seems particularly relaxed and jovial." - faction = "neutral" + faction = FACTION_NEUTRAL player_msg = "You're a variant of the large dragon stripped of its firebreath attack (harm intent). You can still charge (disarm) and tail sweep (grab). Rest to heal slowly. Check your abilities tab for functions." norange = 1 noenrage = 1 @@ -249,7 +249,7 @@ I think I covered everything. verbs |= /mob/living/simple_mob/vore/bigdragon/proc/special_toggle //verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_name //Implemented upstream //verbs |= /mob/living/simple_mob/vore/bigdragon/proc/set_desc //Implemented upstream - faction = "neutral" + faction = FACTION_NEUTRAL /mob/living/simple_mob/vore/bigdragon/Initialize() ..() @@ -902,7 +902,7 @@ I think I covered everything. handle_tame_item(O, user) qdel(ai_holder) //Dragon goes to therapy - faction = "neutral" + faction = FACTION_NEUTRAL norange = 1 //Don't start fires while friendly vore_selected = gut2 //Just incase it eats someone right after being tamed ai_holder = new /datum/ai_holder/simple_mob/healbelly/retaliate/dragon(src) @@ -1047,7 +1047,7 @@ I think I covered everything. /mob/living/simple_mob/vore/bigdragon/proc/enrage(var/atom/movable/attacker) enraged = 1 norange = 0 - faction = "dragon" + faction = FACTION_DRAGON say("HAVE IT YOUR WAY THEN") qdel(ai_holder) var/datum/ai_holder/simple_mob/intentional/dragon/D = new /datum/ai_holder/simple_mob/intentional/dragon(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm index 96c3143123..233112cfe7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/catgirl.dm @@ -35,7 +35,7 @@ "catgirlbrown" ) - faction = "catgirl" + faction = FACTION_CATGIRL /mob/living/simple_mob/vore/catgirl/New() ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm index 6e4440a148..d1dd8f0c53 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm @@ -21,7 +21,7 @@ say_list_type = /datum/say_list/cookiegirl ai_holder_type = /datum/ai_holder/simple_mob/passive/cookiegirl - faction = "cookiegirl" + faction = FACTION_COOKIEGIRL // Activate Noms! /mob/living/simple_mob/vore/cookiegirl @@ -55,4 +55,4 @@ /datum/ai_holder/simple_mob/passive/cookiegirl base_wander_delay = 8 - intelligence_level = AI_NORMAL //not sure why we have this, but I'm just porting. \ No newline at end of file + intelligence_level = AI_NORMAL //not sure why we have this, but I'm just porting. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm index eb9a6199fd..b9f58b315b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm @@ -22,7 +22,7 @@ icon = 'icons/mob/vore64x32.dmi' has_eye_glow = TRUE - faction = "corrupt" + faction = FACTION_CORRUPT maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm index f6c1ab75ff..8299939f9a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cryptdrake.dm @@ -7,7 +7,7 @@ icon_living = "cryptdrake" icon_state = "cryptdrake" icon_rest = "cryptdrake" - faction = "dragon" + faction = FACTION_DRAGON old_x = -48 old_y = 0 vis_height = 92 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index e2f32e3790..ca9c9349e6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -32,7 +32,7 @@ attacktext = list("mauled") - faction = "deathclaw" + faction = FACTION_DEATHCLAW maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm index 22d75d0ab4..5471175593 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm @@ -9,7 +9,7 @@ icon = 'icons/mob/demon_vr.dmi' vis_height = 47 - faction = "demon" + faction = FACTION_DEMON maxHealth = 30 health = 30 movement_cooldown = -2 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm index 2d945ea4c6..26ebf4dc84 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm @@ -8,7 +8,7 @@ icon_living = "devil" icon_state = "devil" icon_rest = "devil" - faction = "devil" + faction = FACTION_DEVIL old_x = -16 old_y = 0 default_pixel_x = -16 @@ -264,4 +264,3 @@ else if(!stand_ground) ai_log("engage_target() : Target ([target]) too far away. Exiting.", AI_LOG_DEBUG) set_stance(STANCE_APPROACH) - diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm index c9c4289981..a3664c69ea 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm @@ -48,4 +48,4 @@ vore_icons = SA_ICON_LIVING /mob/living/simple_mob/vore/aggressive/dino/virgo3b - faction = "virgo3b" + faction = FACTION_VIRGO3B diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index 7c2ee03da4..af876de009 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -8,7 +8,7 @@ icon = 'icons/mob/vore64x64.dmi' vis_height = 64 - faction = "dragon" + faction = FACTION_DRAGON maxHealth = 500 // Boss health = 500 see_in_dark = 8 @@ -92,7 +92,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/phoron_dragon) maxHealth = 300 health = 300 - faction = "virgo3b" + faction = FACTION_VIRGO3B icon_dead = "phoron_dragon_dead" icon_living = "phoron_dragon" icon_state = "phoron_dragon" @@ -120,7 +120,7 @@ tt_desc = "Astra Draconinae" maxHealth = 300 health = 300 - faction = "dragon" + faction = FACTION_DRAGON icon_dead = "space_dragon_dead" icon_living = "space_dragon" icon_state = "space_dragon" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm index 7766b7fdc8..3b5476e464 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm @@ -33,7 +33,7 @@ icon_rest = "fennec_rest" icon = 'icons/mob/vore.dmi' - faction = "fennec" + faction = FACTION_FENNEC maxHealth = 30 health = 30 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm index d6924a090d..c06ef9d3cf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm @@ -8,7 +8,7 @@ icon_dead = "fennix_dead" icon = 'icons/mob/vore.dmi' - faction = "fennec" // Will protec other fenfens + faction = FACTION_FENNEC // Will protec other fenfens maxHealth = 60 health = 60 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm index bfef11e504..b759d0147c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm @@ -8,7 +8,7 @@ icon_living = "whitewolf" icon_state = "whitewolf" icon_rest = "whitewolf-rest" - faction = "sif" + faction = FACTION_SIF has_eye_glow = TRUE meat_amount = 40 //Big dog, lots of meat meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm index 2bcf95cf81..501e96e9e9 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm @@ -8,7 +8,7 @@ icon_dead = "horse-dead" icon = 'icons/mob/vore.dmi' - faction = "horse" + faction = FACTION_HORSE maxHealth = 60 health = 60 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm b/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm index 4a4ab6c118..3e84d02a04 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/jelly.dm @@ -7,7 +7,7 @@ icon_state = "jelly" icon = 'icons/mob/vore.dmi' - faction = "virgo2" + faction = FACTION_VIRGO2 maxHealth = 50 health = 50 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm index 912ae09a09..ed91a897a8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/lamia.dm @@ -24,7 +24,7 @@ default_pixel_x = -16 pixel_x = -16 pixel_y = 0 - faction = "lamia" + faction = FACTION_LAMIA // Vore tags vore_active = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm index 1095bff7d6..8b77865e23 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander.dm @@ -8,7 +8,7 @@ icon_living = "leopardmander" icon_state = "leopardmander" icon_rest = "leopardmander-rest" - faction = "neutral" + faction = FACTION_NEUTRAL meat_amount = 40 //I mean... meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat old_x = -48 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm index 421a1dc64b..62ab96e07c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm @@ -8,7 +8,7 @@ icon_living = "meowl" icon_state = "meowl" icon_rest = "meowl_rest" - faction = "meowl" + faction = FACTION_MEOWL friendly = list("nudges", "sniffs on", "rumbles softly at", "nuzzles") response_help = "pets" response_disarm = "shoves" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm index e6fee921b7..0b86aa2754 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm @@ -79,7 +79,7 @@ icon_living = "crate" icon = 'icons/obj/storage.dmi' - faction = "mimic" + faction = FACTION_MIMIC maxHealth = 125 health = 125 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm index 62c53af4d6..ebaf3bf724 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm @@ -1,6 +1,6 @@ /mob/living/simple_mob/clowns/big tt_desc = "E Homo sapiens corydon horrificus" //this clown is stronk - faction = "clown" + faction = FACTION_CLOWN maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm index 78dd49c4ab..3a9fce9fb0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm @@ -1,10 +1,10 @@ /mob/living/simple_mob/clowns/ tt_desc = "E Homo sapiens corydon" //this is a clown - faction = "clown" + faction = FACTION_CLOWN movement_sound = 'sound/effects/clownstep2.ogg' attack_sound = 'sound/effects/Whipcrack.ogg' - faction = "clown" + faction = FACTION_CLOWN maxHealth = 100 health = 100 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm index 6ecc2b5bb7..75782e987a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/bus.dm @@ -1,6 +1,6 @@ /mob/living/simple_mob/clowns/big/c_shift tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown - faction = "clown" + faction = FACTION_CLOWN /mob/living/simple_mob/clowns/big/c_shift/New() ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm index 66807e24a2..a326c65593 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/honkelemental.dm @@ -9,7 +9,7 @@ icon_gib = "generic_gib" vis_height = 96 - faction = "clown" + faction = FACTION_CLOWN loot_list = list(/obj/item/weapon/bikehorn = 100) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm index ba57b9eab6..ef47e68f78 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/regularclowns.dm @@ -353,7 +353,7 @@ icon_gib = "generic_gib" vis_height = 32 - faction = "clown" + faction = FACTION_CLOWN loot_list = list(/obj/item/weapon/bikehorn = 100) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index b4a7dc2225..9d1c215a2c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -33,7 +33,7 @@ icon_living = "oregrub" icon_dead = "oregrub-dead" - faction = "grubs" + faction = FACTION_GRUBS maxHealth = 50 //oregrubs are quite hardy health = 50 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm index aca3e82b3a..4efaf44b63 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm @@ -15,7 +15,7 @@ icon_living = "otie" icon_dead = "otie-dead" icon_rest = "otie_rest" - faction = "otie" + faction = FACTION_OTIE maxHealth = 150 health = 150 minbodytemp = 200 @@ -70,7 +70,7 @@ icon_living = "photie" icon_dead = "photie-dead" icon_rest = "photie_rest" - faction = "virgo3b" + faction = FACTION_VIRGO3B tame_chance = 5 // Only a 1 in 20 chance of success. It's feral. What do you expect? // Lazy way of making sure this otie survives outside. min_oxy = 0 @@ -98,7 +98,7 @@ icon_living = "hotie" icon_dead = "hotie-dead" icon_rest = "hotie_rest" - faction = "cult" + faction = FACTION_CULT tame_chance = 20 // Lazy way of making sure this otie survives outside. min_oxy = 0 @@ -115,7 +115,7 @@ /mob/living/simple_mob/vore/otie/red/friendly //gets the pet2tame feature and doesn't kill you right away name = "red otie" desc = "Seems this ominous looking longdog has been infused with wicked infernal forces. This one seems rather peaceful though." - faction = "neutral" + faction = FACTION_NEUTRAL tamed = 1 /mob/living/simple_mob/vore/otie/red/chubby //gets the pet2tame feature and doesn't kill you right away @@ -124,13 +124,13 @@ icon_state = "hotiec" icon_living = "hotiec" icon_rest = "hotiec_rest" - faction = "neutral" + faction = FACTION_NEUTRAL tamed = 1 /mob/living/simple_mob/vore/otie/friendly //gets the pet2tame feature and doesn't kill you right away name = "otie" desc = "The classic bioengineered longdog. This one might even tolerate you!" - faction = "neutral" + faction = FACTION_NEUTRAL tamed = 1 /mob/living/simple_mob/vore/otie/friendly/chubby @@ -146,7 +146,7 @@ icon_state = "cotie" icon_living = "cotie" icon_rest = "cotie_rest" - faction = "neutral" + faction = FACTION_NEUTRAL tamed = 1 /mob/living/simple_mob/vore/otie/cotie/chubby @@ -181,7 +181,7 @@ icon_living = "sotie" icon_rest = "sotie_rest" icon_dead = "sotie-dead" - faction = "neutral" + faction = FACTION_NEUTRAL maxHealth = 200 //armored or something health = 200 tamed = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm index 78e01d6643..84651cab0a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm @@ -24,7 +24,7 @@ icon_rest = "pakkun-rest" icon = 'icons/mob/vore.dmi' - faction = "pakkun" + faction = FACTION_PAKKUN movement_cooldown = 2 can_be_drop_pred = 1 //They can tongue vore. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm index 5cdcac4169..13914a7015 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm @@ -10,7 +10,7 @@ icon = 'icons/mob/vore64x64.dmi' vis_height = 64 - faction = "panther" + faction = FACTION_PANTHER maxHealth = 200 health = 200 movement_cooldown = 0.5 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm b/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm index 1bd10e9ee1..3448e7a755 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/peasant.dm @@ -28,7 +28,7 @@ "peasantmb" ) - faction = "peasant" + faction = FACTION_PEASANT /mob/living/simple_mob/vore/peasant/New() ..() @@ -69,4 +69,3 @@ B.escapechance = 15 B.selective_preference = DM_HOLD B.escape_stun = 5 - diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm index 1b027bd02c..f2f3053c1c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants.dm @@ -10,7 +10,7 @@ icon_living = "flytrap" icon_state = "flytrap" icon_rest = "flytrap" - faction = "plants" + faction = FACTION_PLANTS harm_intent_damage = 0 melee_damage_lower = 0 melee_damage_upper = 0 @@ -91,7 +91,7 @@ icon_living = "pitcher" icon_state = "pitcher" icon_rest = "pitcher" - faction = "plants" + faction = FACTION_PLANTS movement_cooldown = 0 harm_intent_damage = 0 melee_damage_lower = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm index baf40f32dd..ecc4800a3f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm @@ -14,7 +14,7 @@ icon_rest = "rabbit_brown_rest" icon = 'icons/mob/vore.dmi' - faction = "rabbit" + faction = FACTION_RABBIT maxHealth = 30 health = 30 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm index 5ad3ffd2b8..4652518682 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/raptor.dm @@ -7,7 +7,7 @@ icon_living = "raptorpurple" icon_state = "raptorpurple" icon_rest = "raptorpurple" - faction = "raptor" + faction = FACTION_RAPTOR meat_amount = 40 //Big dog, lots of meat meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat old_x = -48 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index ea72824e42..11d686f3d2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -28,7 +28,7 @@ icon_living = "rous" icon_dead = "rous-dead" icon_rest = "rous_rest" - faction = "mouse" + faction = FACTION_MOUSE icon = 'icons/mob/vore64x32.dmi' maxHealth = 150 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm index dc98989405..08841dd2d1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm @@ -9,7 +9,7 @@ icon_rest = "wah_rest" icon = 'icons/mob/vore.dmi' - faction = "redpanda" //stop naming stuff vaguely + faction = FACTION_REDPANDA //stop naming stuff vaguely maxHealth = 30 health = 30 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm index 316ae35d28..1893dcfcc7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/scel.dm @@ -11,7 +11,7 @@ icon_living = "scel_orange" icon_state = "scel_orange" icon_rest = "scel_orange-rest" - faction = "scel" + faction = FACTION_SCEL old_x = -48 old_y = 0 vis_height = 92 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm index ed51603bf8..326ee5973c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm @@ -8,7 +8,7 @@ icon_living = "scrubble" icon_state = "scrubble" icon_rest = "scrubble-rest" - faction = "scrubble" + faction = FACTION_SCRUBBLE friendly = list("nudges", "sniffs on", "rumbles softly at", "nuzzles") response_help = "bumps" response_disarm = "shoves" @@ -140,4 +140,4 @@ if(!new_target) return null give_target(new_target) - return new_target \ No newline at end of file + return new_target diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm b/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm index 84b6f87efd..b80d28b9fb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/seagull.dm @@ -18,7 +18,7 @@ icon_rest = "seagull" icon = 'icons/mob/vore.dmi' - faction = "seagull" + faction = FACTION_SEAGULL maxHealth = 25 health = 25 @@ -57,4 +57,4 @@ if(vore_fullness >= 2) movement_cooldown = 10 else if(movement_cooldown == 10) - movement_cooldown = initial(movement_cooldown) \ No newline at end of file + movement_cooldown = initial(movement_cooldown) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm index 4c8c0b6e47..89628472b7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm @@ -33,7 +33,7 @@ vore_eyes = TRUE custom_eye_color = "#00FFFF" - faction = "insects" + faction = FACTION_INSECTS maxHealth = 90 health = 90 see_in_dark = 8 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm index 6aed85c956..7ebcd19d7a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm @@ -36,7 +36,7 @@ vore_eyes = TRUE custom_eye_color = "#FF0000" - faction = "insects" + faction = FACTION_INSECTS maxHealth = 200 health = 200 see_in_dark = 8 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 03bd5b35db..3c54c12639 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -5,7 +5,7 @@ icon = 'icons/mob/vore_shadekin.dmi' icon_state = "map_example" icon_living = "map_example" - faction = "shadekin" + faction = FACTION_SHADEKIN ui_icons = 'icons/mob/shadekin_hud.dmi' mob_class = MOB_CLASS_HUMANOID mob_bump_flag = HUMAN diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm index 75c8f94b3d..38f397656f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm @@ -8,7 +8,7 @@ icon_dead = "sheep-dead" icon = 'icons/mob/vore.dmi' - faction = "sheep" + faction = FACTION_SHEEP maxHealth = 40 health = 40 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm index aeba46b1ec..26a262ce48 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm @@ -31,7 +31,7 @@ icon = 'icons/mob/vore64x64.dmi' vis_height = 64 - faction = "snake" + faction = FACTION_SNAKE maxHealth = 200 health = 200 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm index 078da10636..b111ff283d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm @@ -15,7 +15,7 @@ icon_rest = "woof_rest" icon = 'icons/mob/vore.dmi' - faction = "dog" + faction = FACTION_DOG maxHealth = 600 health = 600 movement_cooldown = -1 @@ -172,7 +172,7 @@ icon_rest = "cass_rest" ic_revivable = 0 - faction = "theatre" + faction = FACTION_THEATRE gender = PLURAL ai_holder_type = /datum/ai_holder/simple_mob/woof/cass diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 8cf651e69a..24b8df89b5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -24,7 +24,7 @@ List of things solar grubs should be able to do: icon_living = "solargrub" icon_dead = "solargrub-dead" - faction = "grubs" + faction = FACTION_GRUBS maxHealth = 50 //grubs can take a lot of harm health = 50 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index 07e24050ba..08f3da7315 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -20,7 +20,7 @@ var/global/list/grub_machine_overlays = list() meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat butchery_loot = list() // No hides - faction = "grubs" + faction = FACTION_GRUBS response_help = "pats" response_disarm = "nudges" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm index 30a37484de..49cf20946f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sonadile.dm @@ -8,7 +8,7 @@ icon_living = "sonadile" icon_state = "sonadile" icon_rest = "sonadile" - faction = "sonadile" + faction = FACTION_SONADILE old_x = -16 old_y = 0 default_pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm index 6e10ccdf60..876e857c0c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm @@ -8,7 +8,7 @@ icon_living = "stalker" icon_state = "stalker" icon_rest = "stalker-rest" - faction = "stalker" + faction = FACTION_STALKER old_x = -16 old_y = 0 default_pixel_x = -16 @@ -274,4 +274,3 @@ else if(!stand_ground) ai_log("engage_target() : Target ([target]) too far away. Exiting.", AI_LOG_DEBUG) set_stance(STANCE_APPROACH) - diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm b/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm index 057abb051f..1032d3fc1f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/succubi.dm @@ -29,7 +29,7 @@ "succubusgingerclothed" ) - faction = "succubus" + faction = FACTION_SUCCUBUS /mob/living/simple_mob/vore/succubus/New() ..() @@ -115,4 +115,4 @@ "%pred gently rubs a finger over her %belly, the gentle pressure breaking your concentration and sending you sinking back into her form.", "Try as you might, you barely make an impression before %pred simply clenches with the most minimal effort, binding you back into her %belly.", "Unfortunately, %pred seems to have absolutely no intention of letting you go, and your futile effort goes nowhere.", - "Strain as you might, you can't keep up the effort long enough before you sink back into %pred's %belly.") \ No newline at end of file + "Strain as you might, you can't keep up the effort long enough before you sink back into %pred's %belly.") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm index 96a760bd28..ab7198912c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vampire.dm @@ -28,7 +28,7 @@ "countessnude" ) - faction = "vampire" + faction = FACTION_VAMPIRE /mob/living/simple_mob/vore/vampire/New() ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm index d0c3d1c633..4f8eda6217 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore_hostile.dm @@ -22,7 +22,7 @@ icon_rest = "abyss_lurker" vis_height = 64 - faction = "macrobacteria" + faction = FACTION_MACROBACTERIA maxHealth = 600 health = 600 movement_cooldown = 3 @@ -129,7 +129,7 @@ icon_rest = "filter" vis_height = 64 - faction = "macrobacteria" + faction = FACTION_MACROBACTERIA maxHealth = 600 health = 600 @@ -257,7 +257,7 @@ icon_rest = "cube" vis_height = 64 - faction = "macrobacteria" + faction = FACTION_MACROBACTERIA maxHealth = 500 health = 500 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm index 53e68d59a4..db76f04435 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/weretiger.dm @@ -9,7 +9,7 @@ icon_rest = null icon = 'icons/mob/bigcat.dmi' - faction = "panther" + faction = FACTION_PANTHER maxHealth = 150 health = 150 movement_cooldown = -1 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index a9d20b8cf9..1003fa5ceb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -143,7 +143,7 @@ icon_living = "rykka" icon_state = "rykka" icon_rest = "rykka_rest" - faction = "underdark" + faction = FACTION_UNDERDARK has_eye_glow = TRUE min_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm index cc5779da73..bb76da5e04 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolfgirl.dm @@ -8,7 +8,7 @@ icon_dead = "wolfgirl-dead" icon = 'icons/mob/vore.dmi' - faction = "wolfgirl" + faction = FACTION_WOLFGIRL maxHealth = 30 health = 30 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm index e4e35e837c..29ab5a478a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolftaur.dm @@ -36,7 +36,7 @@ default_pixel_x = -16 pixel_x = -16 pixel_y = 0 - faction = "wolftaur" + faction = FACTION_WOLFTAUR /mob/living/simple_mob/vore/wolftaur/New() ..() @@ -155,4 +155,3 @@ icon_living = "wolftaurdark" icon_rest = "wolftaurdark_rest" icon_dead = "wolftaurdark-dead" - diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/xeno_vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/xeno_vore.dm index 9d673bd73b..dc3b246cf7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/xeno_vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/xeno_vore.dm @@ -24,7 +24,7 @@ icon = 'icons/mob/vore64x64.dmi' vis_height = 64 - faction = "xeno" + faction = FACTION_XENO maxHealth = 150 health = 150 see_in_dark = 10 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm index 50c1824a5b..c39c62e4a6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm @@ -248,4 +248,4 @@ B.digest_mode = safe ? DM_HOLD : vore_default_mode /mob/living/simple_mob/animal/passive/mouse - faction = "mouse" //Giving mice a faction so certain mobs can get along with them. + faction = FACTION_MOUSE //Giving mice a faction so certain mobs can get along with them. diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index ae88b489f7..83cea738c4 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -153,7 +153,7 @@ var/voice_name = "unidentifiable voice" - var/faction = "neutral" //Used for checking whether hostile simple animals will attack you, possibly more stuff later + var/faction = FACTION_NEUTRAL //Used for checking whether hostile simple animals will attack you, possibly more stuff later var/can_be_antagged = FALSE // To prevent pAIs/mice/etc from getting antag in autotraitor and future auto- modes. Uses inheritance instead of a bunch of typechecks. var/away_from_keyboard = FALSE //are we at, or away, from our keyboard? diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index 2ac31508e2..18453e9252 100644 --- a/code/modules/mob/new_player/skill.dm +++ b/code/modules/mob/new_player/skill.dm @@ -17,7 +17,7 @@ var/list/SKILL_ENGINEER = list("field" = "Engineering", "EVA" = SKILL_BASIC, "co var/list/SKILL_ORGAN_ROBOTICIST = list("field" = "Science", "devices" = SKILL_ADEPT, "electrical" = SKILL_BASIC, "computer" = SKILL_ADEPT, "anatomy" = SKILL_BASIC) var/list/SKILL_SECURITY_OFFICER = list("field" = "Security", "combat" = SKILL_BASIC, "weapons" = SKILL_ADEPT, "law" = SKILL_ADEPT, "forensics" = SKILL_BASIC) var/list/SKILL_CHEMIST = list("field" = "Science", "chemistry" = SKILL_ADEPT, "science" = SKILL_ADEPT, "medical" = SKILL_BASIC, "devices" = SKILL_BASIC) -var/global/list/SKILL_PRE = list(JOB_ENGINEER = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, JOB_SECURITY_OFFICER = SKILL_SECURITY_OFFICER, "Chemist" = SKILL_CHEMIST) +var/global/list/SKILL_PRE = list(JOB_ENGINEER = SKILL_ENGINEER, "Roboticist" = SKILL_ORGAN_ROBOTICIST, JOB_SECURITY_OFFICER = SKILL_SECURITY_OFFICER, JOB_CHEMIST = SKILL_CHEMIST) /datum/skill/management ID = "management" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 353173dad9..3146a6ceb4 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -679,7 +679,7 @@ /obj/item/weapon/paper/jobs name = "Job Information" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\n" + JOB_DETECTIVE + " 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\n" + JOB_ATMOSPHERIC_TECHNICIAN + " 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\n" + JOB_ENGINEER + " 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\nMedical Doctor (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\n" + JOB_SECURITY_OFFICER + " 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\n" + JOB_HEAD_OF_SECURITY + " 4>5-2-2
\n\tPeople assigned as " + JOB_HEAD_OF_SECURITY + " should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\n"+ JOB_SITE_MANAGER + " 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" + info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\n" + JOB_DETECTIVE + " 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\n" + JOB_ATMOSPHERIC_TECHNICIAN + " 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\n" + JOB_ENGINEER + " 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\n" + JOB_MEDICAL_DOCTOR + " (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\n" + JOB_SECURITY_OFFICER + " 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\n" + JOB_HEAD_OF_SECURITY + " 4>5-2-2
\n\tPeople assigned as " + JOB_HEAD_OF_SECURITY + " should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\n"+ JOB_SITE_MANAGER + " 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" /obj/item/weapon/paper/photograph name = "photo" diff --git a/code/modules/rogueminer_vr/roguemines_mobs.dm b/code/modules/rogueminer_vr/roguemines_mobs.dm index 85c581d61e..08cf8e11d2 100644 --- a/code/modules/rogueminer_vr/roguemines_mobs.dm +++ b/code/modules/rogueminer_vr/roguemines_mobs.dm @@ -1,23 +1,23 @@ /mob/living/simple_mob/animal/space/bats/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/animal/space/carp/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/animal/space/goose/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/vore/wolf/space/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/animal/space/carp/large/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/animal/space/bear/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/vore/aggressive/corrupthound/space/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES /mob/living/simple_mob/animal/space/carp/large/huge/roguemines - faction = "roguemines" + faction = FACTION_ROGUEMINES diff --git a/code/modules/rogueminer_vr/zonemaster.dm b/code/modules/rogueminer_vr/zonemaster.dm index 4826661d2d..8126d47e15 100644 --- a/code/modules/rogueminer_vr/zonemaster.dm +++ b/code/modules/rogueminer_vr/zonemaster.dm @@ -302,7 +302,7 @@ var/mobchoice = pickweight(rm_controller.mobs["tier[rm_controller.diffstep]"]) rm_controller.dbg("ZM(p): Picked [mobchoice] to spawn.") var/mob/living/newmob = new mobchoice(get_turf(SP)) - newmob.faction = "asteroid_belt" + newmob.faction = FACTION_ASTEROID_BELT spawned_mobs += newmob if(delay) sleep(delay) diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index a3fca442d5..58460b7a41 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -4,7 +4,7 @@ Slime definitions, Life and New live here. /mob/living/simple_mob/xeno/slime //Adult values are found here nameVar = "grey" //When mutated, nameVar might change. desc = "A shifting, mass of goo." - faction = "slime" + faction = FACTION_SLIME speak_emote = list("garbles", "chirps", "blurbles") colored = 1 color = "#CACACA" diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm index f53659b17b..840f17d848 100644 --- a/code/modules/xenobio2/mob/xeno.dm +++ b/code/modules/xenobio2/mob/xeno.dm @@ -8,7 +8,7 @@ Also includes Life and New /mob/living/simple_mob/xeno name = "Xeno" real_name = "Xeno" - faction = "xeno" //Needs to be set. + faction = FACTION_XENO //Needs to be set. desc = "Something's broken, yell at someone." melee_damage_lower = 0 melee_damage_upper = 0 diff --git a/maps/cynosure/cynosure_jobs.dm b/maps/cynosure/cynosure_jobs.dm index 1086aa37b4..076a682451 100644 --- a/maps/cynosure/cynosure_jobs.dm +++ b/maps/cynosure/cynosure_jobs.dm @@ -21,7 +21,7 @@ var/const/access_explorer = 43 flag = EXPLORER departments = list(DEPARTMENT_RESEARCH, DEPARTMENT_PLANET) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 4 spawn_positions = 4 supervisors = "the Research Director" @@ -47,7 +47,7 @@ var/const/access_explorer = 43 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_network, access_maint_tunnels, access_explorer, access_eva, access_external_airlocks) - + /* alt_titles = list( "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index d1e50cc78f..2648d130af 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -119,7 +119,7 @@ /obj/tether_away_spawner/aerostat_inside name = "Aerostat Indoors Spawner" - faction = "aerostat_inside" + faction = FACTION_AEROSTAT_INSIDE atmos_comp = TRUE prob_spawn = 100 prob_fall = 50 @@ -133,7 +133,7 @@ /obj/tether_away_spawner/aerostat_surface name = "Aerostat Surface Spawner" - faction = "aerostat_surface" + faction = FACTION_AEROSTAT_SURFACE atmos_comp = TRUE prob_spawn = 100 prob_fall = 30 diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm index c181fba6a6..5fd5ef60bb 100644 --- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm +++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm @@ -52,7 +52,7 @@ /obj/tether_away_spawner/aerostat_inside name = "Aerostat Indoors Spawner" - faction = "aerostat_inside" + faction = FACTION_AEROSTAT_INSIDE atmos_comp = TRUE prob_spawn = 100 prob_fall = 50 @@ -66,7 +66,7 @@ /obj/tether_away_spawner/aerostat_surface name = "Aerostat Surface Spawner" - faction = "aerostat_surface" + faction = FACTION_AEROSTAT_SURFACE atmos_comp = TRUE prob_spawn = 100 prob_fall = 50 diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index 5b1d049fe1..f7e9b9b498 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -78,7 +78,7 @@ // Note that if your map has step teleports, mobs may wander through them accidentally and not know how to get back /obj/tether_away_spawner/beach_outside name = "Beach Outside Spawner" //Just a name - faction = "beach_out" //Sets all the mobs to this faction so they don't infight + faction = FACTION_BEACH_OUT //Sets all the mobs to this faction so they don't infight atmos_comp = TRUE //Sets up their atmos tolerances to work in this setting, even if they don't normally (20% up/down tolerance for each gas, and heat) prob_spawn = 100 //Chance of this spawner spawning a mob (once this is missed, the spawner is 'depleted' and won't spawn anymore) prob_fall = 25 //Chance goes down by this much each time it spawns one (not defining and prob_spawn 100 means they spawn as soon as one dies) @@ -91,7 +91,7 @@ /obj/tether_away_spawner/beach_outside_friendly name = "Fennec Spawner" - faction = "fennec" + faction = FACTION_FENNEC atmos_comp = TRUE prob_spawn = 100 prob_fall = 25 @@ -102,7 +102,7 @@ /obj/tether_away_spawner/beach_cave name = "Beach Cave Spawner" - faction = "beach_cave" + faction = FACTION_BEACH_CAVE atmos_comp = TRUE prob_spawn = 100 prob_fall = 40 diff --git a/maps/gateway_archive_vr/labyrinth.dm b/maps/gateway_archive_vr/labyrinth.dm index f1f1960490..f99a924029 100644 --- a/maps/gateway_archive_vr/labyrinth.dm +++ b/maps/gateway_archive_vr/labyrinth.dm @@ -205,7 +205,7 @@ /mob/living/simple_mob/hostile/tunnelclown name = "tunnel clown" desc = "A clown driven to madness in the depths of the Honk Mother's Catacombs." - faction = "tunnelclown" + faction = FACTION_TUNNELCLOWN icon = 'icons/mob/clowns_vr.dmi' icon_state = "tunnelclown" icon_living = "tunnelclown" @@ -247,7 +247,7 @@ /mob/living/simple_mob/hostile/tunnelclown/sentinel name = "tunnel clown sentinel" desc = "A clown warrior tasked with guarding the Honk Mother's Catacombs." - faction = "tunnelclown" + faction = FACTION_TUNNELCLOWN icon = 'icons/mob/clowns_vr.dmi' icon_state = "sentinelclown" icon_living = "sentinelclown" @@ -271,7 +271,7 @@ /mob/living/simple_mob/hostile/cluwne name = "cluwne" desc = "A mutated clown alleged to have been cursed by the Honk Mother and permanently banished to these catacombs for once being an unfunny shitter who brought grief instead of laughter." - faction = "tunnelclown" + faction = FACTION_TUNNELCLOWN icon = 'icons/mob/clowns_vr.dmi' icon_state = "cluwne" icon_living = "cluwne" diff --git a/maps/gateway_archive_vr/snowfield.dm b/maps/gateway_archive_vr/snowfield.dm index 2956393645..c0d2f05bb0 100644 --- a/maps/gateway_archive_vr/snowfield.dm +++ b/maps/gateway_archive_vr/snowfield.dm @@ -56,7 +56,7 @@ vore_active = 1 say_list_type = /datum/say_list/polar_bear - faction = "polar" + faction = FACTION_POLAR maxHealth = 80 health = 80 // Polar bear will fuck you up. @@ -87,13 +87,13 @@ ..() /mob/living/simple_mob/animal/sif/sakimm/polar - faction = "polar" + faction = FACTION_POLAR /mob/living/simple_mob/animal/sif/diyaab/polar - faction = "polar" + faction = FACTION_POLAR /mob/living/simple_mob/animal/sif/shantak/polar - faction = "polar" + faction = FACTION_POLAR // -- Items -- // diff --git a/maps/gateway_vr/snowfield.dm b/maps/gateway_vr/snowfield.dm index 8127505ae9..7315fdb365 100644 --- a/maps/gateway_vr/snowfield.dm +++ b/maps/gateway_vr/snowfield.dm @@ -68,7 +68,7 @@ vore_active = 1 say_list_type = /datum/say_list/polar_bear - faction = "polar" + faction = FACTION_POLAR maxHealth = 80 health = 80 // Polar bear will fuck you up. @@ -99,13 +99,13 @@ ..() /mob/living/simple_mob/animal/sif/sakimm/polar - faction = "polar" + faction = FACTION_POLAR /mob/living/simple_mob/animal/sif/diyaab/polar - faction = "polar" + faction = FACTION_POLAR /mob/living/simple_mob/animal/sif/shantak/polar - faction = "polar" + faction = FACTION_POLAR // -- Items -- // diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm index 7b4a7bc799..07b3edee72 100644 --- a/maps/offmap_vr/common_offmaps.dm +++ b/maps/offmap_vr/common_offmaps.dm @@ -530,7 +530,7 @@ icon = 'icons/mob/vore_shadekin.dmi' icon_state = "spawner" - faction = "shadekin" + faction = FACTION_SHADEKIN prob_spawn = 1 prob_fall = 1 //guard = 10 //Don't wander too far, to stay alive. diff --git a/maps/om_adventure/grasscave.dm b/maps/om_adventure/grasscave.dm index be3a3ec2dc..3dc714066d 100644 --- a/maps/om_adventure/grasscave.dm +++ b/maps/om_adventure/grasscave.dm @@ -344,7 +344,7 @@ icon = 'icons/mob/randomlandmarks.dmi' icon_state = "monster" - faction = "spookyland" + faction = FACTION_SPOOKYLAND prob_spawn = 50 prob_fall = 10 //guard = 10 //Don't wander too far, to stay alive. @@ -360,4 +360,4 @@ /mob/living/simple_mob/mechanical/infectionbot = 30, /mob/living/simple_mob/animal/passive/cat/bluespace = 1, /mob/living/simple_mob/animal/passive/dog/void_puppy = 1 - ) \ No newline at end of file + ) diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index fc7012cfea..9e0dadcbd6 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -1,34 +1,34 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer",JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer",JOB_SHAFT_MINER) + allowed_roles = list(JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_CHIEF_ENGINEER,JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,"Paramedic",JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,"Search and Rescue","Explorer",JOB_SHAFT_MINER) /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" path = /obj/item/clothing/accessory/holster - allowed_roles = list("Site Manager","Head of Personnel",JOB_SECURITY_OFFICER,JOB_WARDEN,JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,"Explorer") + allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_SECURITY_OFFICER,JOB_WARDEN,JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,"Explorer") diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 2f379dcb2e..14eaa584d3 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -29,7 +29,7 @@ var/const/access_explorer = 43 department = "Command" head_position = 1 department_flag = ENGSEC - faction = "Station" + faction = FACTION_STATION total_positions = 1 spawn_positions = 1 supervisors = "company officials and Corporate Regulations" @@ -60,7 +60,7 @@ var/const/access_explorer = 43 flag = PILOT departments = list(DEPARTMENT_PLANET) department_flag = CIVILIAN - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the Head of Personnel" @@ -77,7 +77,7 @@ var/const/access_explorer = 43 flag = EXPLORER departments = list(DEPARTMENT_RESEARCH, DEPARTMENT_PLANET) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 4 spawn_positions = 4 supervisors = "the Research Director" @@ -101,7 +101,7 @@ var/const/access_explorer = 43 flag = SAR departments = list(DEPARTMENT_PLANET, DEPARTMENT_MEDICAL) department_flag = MEDSCI - faction = "Station" + faction = FACTION_STATION total_positions = 2 spawn_positions = 2 supervisors = "the Chief Medical Officer" @@ -112,4 +112,4 @@ var/const/access_explorer = 43 min_age_by_species = list(SPECIES_PROMETHEAN = 2) outfit_type = /decl/hierarchy/outfit/job/medical/sar - job_description = "A Search and Rescue operative recovers individuals who are injured or dead on the surface of Sif." \ No newline at end of file + job_description = "A Search and Rescue operative recovers individuals who are injured or dead on the surface of Sif." diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm index f9b6bfee1a..934b8ad831 100644 --- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm +++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm @@ -18,7 +18,7 @@ /obj/tether_away_spawner/debrisfield/derelict name = "debris field derelict random mob spawner" - faction = "derelict" + faction = FACTION_DERELICT mobs_to_pick_from = list( /mob/living/simple_mob/mechanical/corrupt_maint_drone = 2, /mob/living/simple_mob/mechanical/infectionbot = 3, @@ -27,14 +27,14 @@ /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm name = "debris field derelict maint swarm" - faction = "derelict" + faction = FACTION_DERELICT mobs_to_pick_from = list( /mob/living/simple_mob/mechanical/corrupt_maint_drone = 4 ) /obj/tether_away_spawner/debrisfield/derelict/mech_wizard name = "debris field derelict wizard lol" - faction = "derelict" + faction = FACTION_DERELICT mobs_to_pick_from = list( /mob/living/simple_mob/mechanical/technomancer_golem = 2 ) diff --git a/maps/submaps/space_rocks/space_rocks_stuff.dm b/maps/submaps/space_rocks/space_rocks_stuff.dm index cacb70e387..ff0d03b854 100644 --- a/maps/submaps/space_rocks/space_rocks_stuff.dm +++ b/maps/submaps/space_rocks/space_rocks_stuff.dm @@ -13,14 +13,14 @@ /obj/tether_away_spawner/asteroidbaddies name = "Asteroid Mob Spawner" - faction = "space_rock" + faction = FACTION_SPACE_ROCK atmos_comp = TRUE prob_spawn = 100 prob_fall = 40 //guard = 20 mobs_to_pick_from = list( - /mob/living/simple_mob/animal/space/bats = 10, - /mob/living/simple_mob/vore/alienanimals/space_jellyfish = 15, + /mob/living/simple_mob/animal/space/bats = 10, + /mob/living/simple_mob/vore/alienanimals/space_jellyfish = 15, /mob/living/simple_mob/vore/alienanimals/startreader = 15, /mob/living/simple_mob/vore/alienanimals/space_ghost = 6, /mob/living/simple_mob/vore/oregrub = 1, diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index ba117d701c..2697cfd943 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -17,7 +17,7 @@ // Adds Phoron Wolf /mob/living/simple_mob/vore/wolf/phoron - faction = "underdark" + faction = FACTION_UNDERDARK movement_cooldown = -1.5 harm_intent_damage = 5 @@ -39,7 +39,7 @@ // Underdark mob spawners /obj/tether_away_spawner/underdark_drone_swarm name = "Underdark Drone Swarm Spawner" - faction = "underdark" + faction = FACTION_UNDERDARK atmos_comp = TRUE prob_spawn = 100 prob_fall = 10 @@ -50,7 +50,7 @@ /obj/tether_away_spawner/underdark_normal name = "Underdark Normal Spawner" - faction = "underdark" + faction = FACTION_UNDERDARK atmos_comp = TRUE prob_spawn = 100 prob_fall = 50 @@ -64,7 +64,7 @@ /obj/tether_away_spawner/underdark_hard name = "Underdark Hard Spawner" - faction = "underdark" + faction = FACTION_UNDERDARK atmos_comp = TRUE prob_spawn = 100 prob_fall = 50 @@ -77,7 +77,7 @@ /obj/tether_away_spawner/underdark_boss name = "Underdark Boss Spawner" - faction = "underdark" + faction = FACTION_UNDERDARK atmos_comp = TRUE prob_spawn = 100 prob_fall = 100 diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index feffb107d3..ce4ce6e6ef 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -18,7 +18,7 @@ outfit_type = /decl/hierarchy/outfit/job/talon_captain offmap_spawn = TRUE - faction = "Station" //Required for SSjob to allow people to join as it + faction = FACTION_STATION //Required for SSjob to allow people to join as it departments = list(DEPARTMENT_TALON) total_positions = 1 spawn_positions = 1 @@ -45,7 +45,7 @@ outfit_type = /decl/hierarchy/outfit/job/talon_doctor offmap_spawn = TRUE - faction = "Station" //Required for SSjob to allow people to join as it + faction = FACTION_STATION //Required for SSjob to allow people to join as it departments = list(DEPARTMENT_TALON) total_positions = 1 spawn_positions = 1 @@ -72,7 +72,7 @@ outfit_type = /decl/hierarchy/outfit/job/talon_engineer offmap_spawn = TRUE - faction = "Station" //Required for SSjob to allow people to join as it + faction = FACTION_STATION //Required for SSjob to allow people to join as it departments = list(DEPARTMENT_TALON) total_positions = 1 spawn_positions = 1 @@ -99,7 +99,7 @@ outfit_type = /decl/hierarchy/outfit/job/talon_pilot offmap_spawn = TRUE - faction = "Station" //Required for SSjob to allow people to join as it + faction = FACTION_STATION //Required for SSjob to allow people to join as it departments = list(DEPARTMENT_TALON) total_positions = 1 spawn_positions = 1 @@ -126,7 +126,7 @@ outfit_type = /decl/hierarchy/outfit/job/talon_security offmap_spawn = TRUE - faction = "Station" //Required for SSjob to allow people to join as it + faction = FACTION_STATION //Required for SSjob to allow people to join as it departments = list(DEPARTMENT_TALON) total_positions = 1 spawn_positions = 1 @@ -152,7 +152,7 @@ outfit_type = /decl/hierarchy/outfit/job/talon_miner offmap_spawn = TRUE - faction = "Station" //Required for SSjob to allow people to join as it + faction = FACTION_STATION //Required for SSjob to allow people to join as it departments = list(DEPARTMENT_TALON) total_positions = 1 spawn_positions = 1 diff --git a/vorestation.dme b/vorestation.dme index eb8e7aedae..56a51e25b4 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -59,6 +59,7 @@ #include "code\__defines\equipment_vendor.dm" #include "code\__defines\events.dm" #include "code\__defines\exosuit_fab.dm" +#include "code\__defines\faction.dm" #include "code\__defines\flags.dm" #include "code\__defines\gamemode.dm" #include "code\__defines\holder.dm"