Merge branch 'master' into placeholder

This commit is contained in:
Ferner
2021-03-02 18:13:37 +01:00
94 changed files with 1133 additions and 643 deletions
@@ -42,7 +42,7 @@
new /obj/item/clothing/mask/breath/medical(src)
/obj/structure/closet/secure_closet/medical3
name = "physician's locker"
name = "medical equipment locker"
req_access = list(access_medical_equip)
icon_state = "securemed1"
icon_closed = "securemed"
@@ -87,6 +87,40 @@
new /obj/item/clothing/glasses/eyepatch/hud/medical(src)
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src)
new /obj/item/clothing/head/hardhat/first_responder(src)
/obj/structure/closet/secure_closet/medical_fr
name = "first responder's locker"
desc = "An immobile, card-locked storage unit containing all the necessary equipment for a first responder."
req_access = list(access_first_responder)
icon_state = "securemed1"
icon_closed = "securemed"
icon_locked = "securemed1"
icon_opened = "securemedopen"
icon_broken = "securemedbroken"
icon_off = "securemedoff"
/obj/structure/closet/secure_closet/medical_fr/fill()
..()
new /obj/item/storage/backpack/satchel_med(src)
new /obj/item/storage/backpack/duffel/med(src)
new /obj/item/clothing/head/hardhat/first_responder(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/clothing/glasses/hud/health(src)
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
new /obj/item/clothing/suit/storage/medical_chest_rig/first_responder(src)
new /obj/item/clothing/under/rank/medical/first_responder(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/device/flashlight/pen(src)
new /obj/item/clothing/accessory/stethoscope(src)
new /obj/item/storage/belt/medical/first_responder(src)
new /obj/item/device/gps(src)
new /obj/item/reagent_containers/hypospray(src)
new /obj/item/taperoll/medical(src)
new /obj/item/device/radio(src)
new /obj/item/roller(src)
new /obj/item/crowbar/red(src)
/obj/structure/closet/secure_closet/CMO