diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 17b3dd2066a..6e57edba482 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -21,6 +21,7 @@ /datum/species/unathi, /datum/species/bug = TRUE, /datum/species/bug/type_b = TRUE, + /datum/species/bug/type_e = TRUE, /datum/species/machine ) @@ -29,7 +30,8 @@ SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_VAURCA_WORKER, - SPECIES_VAURCA_WARRIOR + SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BULWARK ) ) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 9ad5e4426e0..26ac99747ec 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -77,7 +77,7 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) outfit = /obj/outfit/job/doctor - blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_VAURCA_BREEDER) /datum/job/surgeon title = "Surgeon" @@ -101,7 +101,7 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) outfit = /obj/outfit/job/doctor/surgeon - blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_VAURCA_BREEDER) /obj/outfit/job/doctor name = "Physician" @@ -165,7 +165,7 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PHARMACY, ACCESS_VIROLOGY) outfit = /obj/outfit/job/pharmacist - blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_VAURCA_BREEDER) /obj/outfit/job/pharmacist name = "Pharmacist" @@ -217,7 +217,7 @@ alt_titles = list("Psychologist") outfit = /obj/outfit/job/psychiatrist alt_outfits = list("Psychologist" = /obj/outfit/job/psychiatrist/psycho) - blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_VAURCA_BREEDER) /obj/outfit/job/psychiatrist name = "Psychiatrist" @@ -348,7 +348,7 @@ SPECIES_SKRELL_AXIORI = 50 ) outfit = /obj/outfit/job/intern_med - blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_VAURCA_BREEDER) /obj/outfit/job/intern_med name = "Medical Intern" diff --git a/html/changelogs/SimpleMaroon-bulwarkmed.yml b/html/changelogs/SimpleMaroon-bulwarkmed.yml new file mode 100644 index 00000000000..94e054c015d --- /dev/null +++ b/html/changelogs/SimpleMaroon-bulwarkmed.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - qol: "Vaurca Bulwarks are now able to be in the PMCG and Medical roles, barring First Responder." + - imageadd: "Added Bulwark variants of the necessary medical uniforms." + - bugfix: "Fixed the icon state names of a few Bulwark variant items." diff --git a/icons/mob/species/bulwark/suit.dmi b/icons/mob/species/bulwark/suit.dmi index b40c66394f9..cee4b756411 100644 Binary files a/icons/mob/species/bulwark/suit.dmi and b/icons/mob/species/bulwark/suit.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index dbdca46c854..ab57d1c8811 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ