Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vaurca Bulwarks can now be in Medical + the PMCG #19127

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/game/jobs/faction/pmc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -29,7 +30,8 @@
SPECIES_DIONA,
SPECIES_DIONA_COEUS,
SPECIES_VAURCA_WORKER,
SPECIES_VAURCA_WARRIOR
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_BULWARK
)
)

Expand Down
10 changes: 5 additions & 5 deletions code/game/jobs/job/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
60 changes: 60 additions & 0 deletions html/changelogs/SimpleMaroon-bulwarkmed.yml
Original file line number Diff line number Diff line change
@@ -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."
Binary file modified icons/mob/species/bulwark/suit.dmi
Binary file not shown.
Binary file modified icons/mob/species/bulwark/uniform.dmi
Binary file not shown.
Loading