Skip to content

Commit

Permalink
Spare medical/engineering radios. (#5900)
Browse files Browse the repository at this point in the history
# About the pull request

May the medical survivors rejoice.

# Explain why it's good for the game

Ever since somebody decided that half the shipside roles should be
spawning without headsets at all, there is no way for a
doctor/researcher that survives and gets to Almayer to actually get a
functional radio. Time to fix that.
(Also removed a thing that should have been gone long ago. You know who
you are and what have you done.)

# Changelog

:cl:
add: Requisitions' vendor now has medical radio keys in stock.
add: CE and CMO can now get spare departmental headsets from their
vendors to recruit survivors without having to go to Requisitions.
/:cl:

---------

Co-authored-by: Zonespace <[email protected]>
  • Loading branch information
Segrain and Zonespace27 committed Mar 11, 2024
1 parent 268eb4b commit 87ea79f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list(
list("M41A Pulse Rifle MK2", 0, /obj/item/storage/box/guncase/m41a, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),
list("M240 Incinerator Unit", 0, /obj/item/storage/box/guncase/flamer, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR),

list("Spare Equipment", 0, null, null, null),
list("Technician's Headset", 15, /obj/item/device/radio/headset/almayer/mt, null, VENDOR_ITEM_REGULAR),

))


Expand Down Expand Up @@ -288,6 +291,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("Spare Equipment", 0, null, null, null),
list("Doctor's Headset", 15, /obj/item/device/radio/headset/almayer/doc, null, VENDOR_ITEM_REGULAR),
list("Researcher's Headset", 15, /obj/item/device/radio/headset/almayer/research, null, VENDOR_ITEM_REGULAR),
))


Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@
list("Engineering Radio Encryption Key", 5, /obj/item/device/encryptionkey/engi, VENDOR_ITEM_REGULAR),
list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, VENDOR_ITEM_REGULAR),
list("JTAC Radio Encryption Key", 5, /obj/item/device/encryptionkey/jtac, VENDOR_ITEM_REGULAR),
list("Medical Radio Encryption Key", 5, /obj/item/device/encryptionkey/med, VENDOR_ITEM_REGULAR),
list("Sentry Gun Network Encryption Key", 8, /obj/item/device/encryptionkey/sentry_laptop, VENDOR_ITEM_REGULAR),
list("Marine Radio Headset", 5, /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
list("Supply Radio Encryption Key", 5, /obj/item/device/encryptionkey/req, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@
new /obj/item/storage/pouch/medical(src)
new /obj/item/storage/pouch/syringe(src)
new /obj/item/storage/pouch/medkit(src)
if(is_mainship_level(z))
new /obj/item/device/radio/headset/almayer/cmo(src)
return
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
Expand Down

0 comments on commit 87ea79f

Please sign in to comment.