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.

Sign up for GitHub

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

Returns MDs and CMOs to Starting With Their Normal Uniforms #444

Merged
merged 5 commits into from
Dec 14, 2023
Merged

Returns MDs and CMOs to Starting With Their Normal Uniforms #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4153400
Begone
RimiNosha Dec 9, 2023
99a14fc
No blue surgical coat, thanks
RimiNosha Dec 12, 2023
3b2120d
Actually, nevermind.
RimiNosha Dec 12, 2023
defff06
Merge branch 'master' into no_scrubs_you_scrub
RimiNosha Dec 13, 2023
dc76a6c
Moth
RimiNosha Dec 14, 2023
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
3 changes: 1 addition & 2 deletions code/modules/jobs/job_types/chief_medical_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,14 @@

id = /obj/item/card/id/advanced/silver
id_trim = /datum/id_trim/job/chief_medical_officer
uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs
uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer
suit = /obj/item/clothing/suit/toggle/labcoat/cmo
suit_store = /obj/item/flashlight/pen/paramedic
backpack_contents = list(
/obj/item/melee/baton/telescopic = 1,
)
belt = /obj/item/modular_computer/pda/heads/cmo
ears = /obj/item/radio/headset/heads/cmo
head = /obj/item/clothing/head/surgerycap/cmo
shoes = /obj/item/clothing/shoes/sneakers/blue
l_pocket = /obj/item/pinpointer/crew
l_hand = /obj/item/storage/medkit/surgery
Expand Down
3 changes: 1 addition & 2 deletions code/modules/jobs/job_types/medical_doctor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@
jobtype = /datum/job/doctor

id_trim = /datum/id_trim/job/medical_doctor
uniform = /obj/item/clothing/under/rank/medical/scrubs/blue
uniform = /obj/item/clothing/under/rank/medical/doctor
suit = /obj/item/clothing/suit/toggle/labcoat
suit_store = /obj/item/flashlight/pen
belt = /obj/item/modular_computer/pda/medical
ears = /obj/item/radio/headset/headset_med
head = /obj/item/clothing/head/surgerycap
shoes = /obj/item/clothing/shoes/sneakers/white
l_hand = /obj/item/storage/medkit/surgery

Expand Down
Binary file modified code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_moth.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading