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 c37d39304d..86d4a17b48 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -298,7 +298,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list( list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), list("PATCHES", 0, null, null, null), - list("Falling Falcons Shoulder Patch", 0, /obj/item/clothing/accessory/patch/falcon, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), + list("Solar Devils Shoulder Patch", 0, /obj/item/clothing/accessory/patch/devils, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), list("USCM Shoulder Patch", 0, /obj/item/clothing/accessory/patch, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index a4adbefe89..b48b4ee3f7 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -143,7 +143,7 @@ list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR), list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR), list("USCM Flair", round(scale * 15), /obj/item/prop/helmetgarb/flair_uscm, VENDOR_ITEM_REGULAR), - list("Falling Falcons Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/falcon, VENDOR_ITEM_REGULAR), + list("Solar Devils Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch/devils, VENDOR_ITEM_REGULAR), list("USCM Shoulder Patch", round(scale * 15), /obj/item/clothing/accessory/patch, VENDOR_ITEM_REGULAR), ) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index c6c06a123b..b007acb29d 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -834,6 +834,6 @@ var/global/list/gear_datums_by_name = list() slot = WEAR_IN_ACCESSORY allowed_origins = USCM_ORIGINS -/datum/gear/misc/patch_uscm/falcon - display_name = "Falling Falcons shoulder patch" - path = /obj/item/clothing/accessory/patch/falcon +/datum/gear/misc/patch_uscm/devils + display_name = "Solar Devils shoulder patch" + path = /obj/item/clothing/accessory/patch/devils diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index da0f580888..c461fd016c 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -323,6 +323,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/head/headset = "headset", /obj/item/clothing/accessory/patch = "uscmpatch", /obj/item/clothing/accessory/patch/falcon = "falconspatch", + /obj/item/clothing/accessory/patch/devils = "devilspatch", /obj/item/ammo_magazine/handful = "bullet", /obj/item/prop/helmetgarb/riot_shield = "helmet_riot_shield", /obj/item/attachable/flashlight = HELMET_GARB_RELAY_ICON_STATE, diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 24eec4f1e3..c25ecff0d1 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -354,6 +354,11 @@ desc = "A fire-resistant shoulder patch, worn by the men and women of the Falling Falcons, the 2nd battalion of the 4th brigade of the USCM." icon_state = "fallingfalconspatch" +/obj/item/clothing/accessory/patch/devils + name = "USCM Solar Devils patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the Solar Devils, the 3rd battalion of the 2nd division of the USCM." + icon_state = "solardevilspatch" + /obj/item/clothing/accessory/patch/forecon name = "USCM Force Reconnaissance patch" desc = "A fire-resistant shoulder patch, worn by the men and women of the USS Hanyut, USCM FORECON." diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index cc91c47fe2..50bcea0ad5 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/mob/humans/onmob/ties.dmi b/icons/mob/humans/onmob/ties.dmi index c8fb98c0c5..8f9940f639 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/obj/items/clothing/ties.dmi b/icons/obj/items/clothing/ties.dmi index f236480c7b..b02ff9c253 100644 Binary files a/icons/obj/items/clothing/ties.dmi and b/icons/obj/items/clothing/ties.dmi differ