Skip to content

Commit

Permalink
Replaces Falling Falcons unit patches with Solar Devils unit patches. (
Browse files Browse the repository at this point in the history
  • Loading branch information
blackdragonTOW authored Nov 5, 2023
1 parent f715314 commit 8f69711
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)

Expand Down
6 changes: 3 additions & 3 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
Binary file not shown.

0 comments on commit 8f69711

Please sign in to comment.