diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 99947e0a3daa..157f79cd43c2 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -203,9 +203,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/latex, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/almayer/cmo, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("EYEWARE (CHOOSE 1)", 0, null, null, null), + list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("Reagent Scanner HUD Goggles", 0, /obj/item/clothing/glasses/science, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("UNIFORM (CHOOSE 1)", 0, null, null, null), list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED), list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index d43883dc3156..d724e1cec10f 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -88,7 +88,7 @@ /obj/item/device/encryptionkey/cmo name = "Chief Medical Officer's Encryption Key" icon_state = "cmo_key" - channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE) + channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/med name = "Medical Radio Encryption Key" diff --git a/code/modules/admin/player_panel/actions/transform.dm b/code/modules/admin/player_panel/actions/transform.dm index 185165357e05..91a62b1a1d02 100644 --- a/code/modules/admin/player_panel/actions/transform.dm +++ b/code/modules/admin/player_panel/actions/transform.dm @@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(pp_transformables, list( "Alien Tier 4" = list( list( - name = XENO_CASTE_QUEEN+" (Young)", + name = XENO_CASTE_QUEEN+" (Immature)", key = /mob/living/carbon/xenomorph/queen, color = "purple" ), diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 632c7a978261..8a7425e2071a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -430,7 +430,7 @@ if(client) hud_update() - name = "[name_prefix]Growing Queen" + name = "[name_prefix]Immature Queen" var/name_client_prefix = "" var/name_client_postfix = "" diff --git a/html/changelogs/AutoChangeLog-pr-3942.yml b/html/changelogs/AutoChangeLog-pr-3942.yml new file mode 100644 index 000000000000..6e72c89aac0a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-3942.yml @@ -0,0 +1,4 @@ +author: "Steelpoint" +delete-after: True +changes: + - balance: "Yautja's Plasma Rifle has been rebalanced to make it a more effective assault weapon against xenomorphs. It has lost its mini-high explosive fire mode but its default fire mode now mostly ignores xenomorph armor." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4135.yml b/html/changelogs/AutoChangeLog-pr-4135.yml new file mode 100644 index 000000000000..27c91e6adb0f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4135.yml @@ -0,0 +1,5 @@ +author: "Megastar1234" +delete-after: True +changes: + - rscadd: "Adds reagent scanner goggles to CMO vendor" + - rscadd: "Gives CMO headset intel radio" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4138.yml b/html/changelogs/AutoChangeLog-pr-4138.yml new file mode 100644 index 000000000000..b1bc8ce7bff2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4138.yml @@ -0,0 +1,5 @@ +author: "realforest2001" +delete-after: True +changes: + - rscadd: "Changed 'Growing Queen' to 'Immature Queen'" + - bugfix: "Updated playerpanel transform Queen button title." \ No newline at end of file