diff --git a/code/controllers/subsystems/traumas.dm b/code/controllers/subsystems/traumas.dm index c437960495f..bfbd65f886c 100644 --- a/code/controllers/subsystems/traumas.dm +++ b/code/controllers/subsystems/traumas.dm @@ -102,7 +102,7 @@ var/datum/controller/subsystem/traumas/SStraumas /obj/item/toy/figure/md, /obj/item/weapon/bedsheet/medical, /obj/item/weapon/rig/medical, /obj/item/weapon/storage/backpack/duffel/med, /obj/item/weapon/storage/backpack/medic, /obj/item/weapon/storage/backpack/messenger/med, /obj/item/weapon/storage/belt/medical, /obj/machinery/vending/medical, /obj/mecha/medical/odysseus, /obj/structure/closet/crate/medical, /obj/structure/closet/medical_wall, - /obj/structure/sign/greencross, /obj/item/clothing/accessory/armband/med, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/mask/breath/medical, + /obj/structure/sign/bluecross, /obj/item/clothing/accessory/armband/med, /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/mask/breath/medical, /obj/item/clothing/under/rank/medical, /obj/item/weapon/scalpel, /obj/machinery/clonepod, /obj/item/weapon/storage/firstaid, /obj/machinery/optable, /obj/item/clothing/accessory/armband/science, /obj/item/clothing/under/rank/scientist, /obj/machinery/door/airlock/science, /obj/machinery/door/airlock/medical)) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 35db58148c1..95765590f96 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -245,7 +245,7 @@ name = "Medical Resident" jobtype = /datum/job/intern_med - uniform = /obj/item/clothing/under/rank/medical + uniform = /obj/item/clothing/under/rank/medical/intern shoes = /obj/item/clothing/shoes/medical l_ear = /obj/item/device/radio/headset/headset_med diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index cc64a644c14..a026e241a61 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -148,7 +148,7 @@ name = "Lab Assistant" jobtype = /datum/job/intern_sci - uniform = /obj/item/clothing/under/rank/scientist + uniform = /obj/item/clothing/under/rank/scientist/intern shoes = /obj/item/clothing/shoes/science l_ear = /obj/item/device/radio/headset/headset_sci diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index f99ed7fa9ea..2c7ce52f89e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -44,6 +44,7 @@ new /obj/item/clothing/suit/apron(src) if(2) new /obj/item/clothing/suit/apron/overalls/blue(src) + new /obj/item/clothing/under/rank/scientist/botany(src) new /obj/item/weapon/storage/bag/plants(src) new /obj/item/clothing/under/rank/scientist(src) new /obj/item/device/analyzer/plant_analyzer(src) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 9df51d7d154..34ba4d82bfc 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -130,10 +130,10 @@ desc = "A warning sign which reads 'NO SMOKING'." icon_state = "nosmoking2" -/obj/structure/sign/greencross +/obj/structure/sign/bluecross name = "medbay" desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here." - icon_state = "greencross" + icon_state = "bluecross" /obj/structure/sign/goldenplaque name = "The Most Robust Men Award for Robustness" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index b3df8c57d0c..b08cfc76d17 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -69,6 +69,11 @@ path = /obj/item/clothing/head/beret/sec/hos allowed_roles = list("Head of Security") +/datum/gear/head/beret/medical + display_name = "beret, medical" + path = /obj/item/clothing/head/beret/medical + allowed_roles = list("Medical Doctor", "Medical Resident", "Pharmacist", "Paramedic", "Chief Medial Officer", "Psychiatrist") + /datum/gear/head/corp display_name = "cap, corporate (security)" path = /obj/item/clothing/head/soft/sec/corp diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index ceed25c88b6..de6cffc3506 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -102,6 +102,11 @@ desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety." icon_state = "e_beret_badge" +/obj/item/clothing/head/beret/medical + name = "medical beret" + desc = "A beret with the medical insignia emblazoned on it. For medical members that want to crush their brains after college left them in massive debt." + icon_state = "medberet" + /obj/item/clothing/head/beret/purple name = "purple beret" desc = "A stylish, if purple, beret." diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index ad993e01b42..4313c81e613 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -31,17 +31,28 @@ name = "scientist's jumpsuit" icon_state = "science" item_state = "w_suit" - worn_state = "sciencewhite" + worn_state = "science" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0) +/obj/item/clothing/under/rank/scientist/botany + desc = "It's made of a special fiber that provides minor protection against biohazards. Its colour denotes the wearer as a xenobotanist." + icon_state = "botany" + worn_state = "botany" + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 5, rad = 0) + +/obj/item/clothing/under/rank/scientist/intern + desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a laboratory assistant." + name = "laboratory assistant's jumpsuit" + icon_state = "intern_science" + worn_state = "intern_science" /obj/item/clothing/under/rank/pharmacist desc = "It's made of a special fiber that gives special protection against biohazards. It has a pharmacist rank stripe on it." name = "pharmacist's jumpsuit" icon_state = "chemistry" item_state = "w_suit" - worn_state = "chemistrywhite" + worn_state = "chemistry" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) @@ -71,7 +82,7 @@ name = "virologist's jumpsuit" icon_state = "virology" item_state = "w_suit" - worn_state = "virologywhite" + worn_state = "virology" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) @@ -116,7 +127,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) /obj/item/clothing/under/rank/medical - desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel." + desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is trained medical personnel." name = "medical doctor's jumpsuit" icon_state = "medical" item_state = "w_suit" @@ -124,6 +135,12 @@ permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) +/obj/item/clothing/under/rank/medical/intern + desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is still a medical intern." + name = "medical resident's jumpsuit" + icon_state = "intern_medical" + worn_state = "intern_medical" + /obj/item/clothing/under/rank/medical/paramedic name = "short sleeve medical jumpsuit" desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel." diff --git a/html/changelogs/mattatlas-7064.yml b/html/changelogs/mattatlas-7064.yml new file mode 100644 index 00000000000..873b97f49e5 --- /dev/null +++ b/html/changelogs/mattatlas-7064.yml @@ -0,0 +1,43 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas, AmoryBlaine + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a medical beret to the loadout for all medical jobs." + - rscadd: "Added a xenobotanist uniform in the xenobotany lockers." + - imageadd: "Resprited most science and medical uniforms. All the sprites are by AmouryBlaine." diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index bf8cfa646f4..6d57643859d 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index f399b75cfd7..a53d9464c04 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 88492503d72..195f138ca0b 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5ba3297f1ad..38a04053302 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index d1990d5e3a0..a6a27d746eb 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 0ad0c3fc21c..e042ab7ba96 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 9998ac091fc..1d3331c8cb0 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 5323262a6b4..53ac0d7bf08 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 6f8c54b7ac0..d5502efd75a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 8dd4db9793e..8324057b56d 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 068800e894b..e1d9024b7ef 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 10f4313d25f..0ec7d57247b 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -11400,7 +11400,7 @@ /turf/unsimulated/wall/riveted, /area/centcom/control) "aAg" = ( -/obj/structure/sign/greencross{ +/obj/structure/sign/bluecross{ pixel_y = -32 }, /turf/unsimulated/floor{ @@ -14267,7 +14267,7 @@ }, /area/centcom/holding) "aGr" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/unsimulated/wall/riveted, /area/centcom/holding) "aGs" = ( @@ -17298,7 +17298,7 @@ }, /area/centcom/holding) "aMS" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/unsimulated/wall/riveted, /area/centcom/spawning) "aMT" = ( diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 79a7559df3d..c35c7532f40 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -23574,7 +23574,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "aWG" = ( -/obj/structure/sign/greencross{ +/obj/structure/sign/bluecross{ pixel_y = 32 }, /turf/simulated/floor/tiled/white, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 9ec4d09bb94..5a558b44340 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -30222,7 +30222,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/floor/plating, /area/hallway/primary/starboard) "baT" = ( @@ -40432,7 +40432,7 @@ dir = 4 }, /obj/structure/window/reinforced, -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/floor/plating, /area/medical/reception) "brG" = ( @@ -42780,7 +42780,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/floor/plating, /area/medical/reception) "bvh" = ( diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 1541248f9cb..e35ea9b2eea 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -3585,7 +3585,7 @@ /turf/simulated/floor/plating, /area/maintenance/security_starboard) "agB" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/wall, /area/hallway/primary/starboard) "agC" = ( @@ -17361,7 +17361,7 @@ /area/chapel/main) "aGj" = ( /obj/effect/floor_decal/corner/paleblue/full, -/obj/structure/sign/greencross{ +/obj/structure/sign/bluecross{ pixel_x = -32 }, /turf/simulated/floor/tiled/white, @@ -21189,7 +21189,7 @@ icon_state = "corner_white_full"; dir = 4 }, -/obj/structure/sign/greencross{ +/obj/structure/sign/bluecross{ pixel_x = 32 }, /obj/structure/cable/green{ @@ -39137,7 +39137,7 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_two) "bum" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/wall/r_wall, /area/hallway/primary/central_two) "bun" = ( @@ -44854,7 +44854,7 @@ /turf/simulated/floor/tiled/white, /area/medical/genetics_cloning) "bDX" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/wall, /area/hallway/primary/central_two) "bDY" = ( @@ -57204,7 +57204,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "bZS" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/wall, /area/medical/medbay4) "bZT" = ( diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm index 9b77010328f..361dddee9e7 100644 --- a/maps/exodus/exodus-2_centcomm.dmm +++ b/maps/exodus/exodus-2_centcomm.dmm @@ -7816,7 +7816,7 @@ }, /area/centcom/living) "awN" = ( -/obj/structure/sign/greencross{ +/obj/structure/sign/bluecross{ pixel_y = -32 }, /turf/unsimulated/floor{ @@ -14042,7 +14042,7 @@ }, /area/centcom/control) "aOM" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/unsimulated/wall/riveted, /area/centcom/holding) "aON" = ( @@ -17855,7 +17855,7 @@ }, /area/centcom/holding) "aWZ" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/unsimulated/wall/riveted, /area/centcom/spawning) "aXa" = ( diff --git a/maps/exodus/exodus-5_asteroid.dmm b/maps/exodus/exodus-5_asteroid.dmm index f0cfeaad3e6..69d06024915 100644 --- a/maps/exodus/exodus-5_asteroid.dmm +++ b/maps/exodus/exodus-5_asteroid.dmm @@ -3809,7 +3809,7 @@ dir = 5; health = 1e+007 }, -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /obj/machinery/door/firedoor{ dir = 4; name = "Firelock" diff --git a/maps/space_ruins/derelict.dmm b/maps/space_ruins/derelict.dmm index 32f3d15fbde..ea0dfbf129f 100644 --- a/maps/space_ruins/derelict.dmm +++ b/maps/space_ruins/derelict.dmm @@ -2823,7 +2823,7 @@ /turf/simulated/floor/airless, /area/derelict/hallway/southwest) "iZ" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/wall, /area/derelict/hallway/southeast) "ja" = ( @@ -3518,7 +3518,7 @@ /turf/simulated/floor/tiled/white, /area/derelict/hallway/southeast) "li" = ( -/obj/structure/sign/greencross{ +/obj/structure/sign/bluecross{ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, diff --git a/maps/space_ruins/scrapheap.dmm b/maps/space_ruins/scrapheap.dmm index 4cfea69fc1d..253d58eb2e5 100644 --- a/maps/space_ruins/scrapheap.dmm +++ b/maps/space_ruins/scrapheap.dmm @@ -743,7 +743,7 @@ /turf/simulated/floor/wood, /area/derelict/ship) "cm" = ( -/obj/structure/sign/greencross, +/obj/structure/sign/bluecross, /turf/simulated/wall/r_wall, /area/derelict/ship) "cn" = (