cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Medical and Science Resprite (#7064)

Browse Source
This commit is contained in:
Matt Atlas
2019-10-05 14:29:05 +02:00
committed by Werner
parent 62d89da599
commit b7ec3ad093
28 changed files with 100 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/traumas.dm
+1 -1
View File
@@ -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))
code/game/jobs/job/medical.dm
+1 -1
View File
@@ -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
code/game/jobs/job/science.dm
+1 -1
View File
@@ -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
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+1
View File
@@ -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)
code/game/objects/structures/signs.dm
+2 -2
View File
@@ -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"
code/modules/client/preference_setup/loadout/loadout_head.dm
+5
View File
@@ -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
code/modules/clothing/head/jobs.dm
+5
View File
@@ -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."
code/modules/clothing/under/jobs/medsci.dm
+21 -4
View File
@@ -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."