Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaces Falling Falcons unit patches with Solar Devils unit patches. #48

Merged
merged 14 commits into from
Nov 5, 2023
Merged

Replaces Falling Falcons unit patches with Solar Devils unit patches. #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8cb44a2
Add files via upload
blackdragonTOW Nov 4, 2023
51b3c8b
Add files via upload
blackdragonTOW Nov 4, 2023
98f6c7a
Update ties.dm
blackdragonTOW Nov 4, 2023
bbb58db
Update senior_officers.dm
blackdragonTOW Nov 4, 2023
c227e1b
Update senior_officers.dm
blackdragonTOW Nov 4, 2023
75c0947
Update squad_prep.dm
blackdragonTOW Nov 4, 2023
ab6147c
Update preferences_gear.dm
blackdragonTOW Nov 4, 2023
c374848
Update helmet.dm
blackdragonTOW Nov 4, 2023
1952c28
Update helmet.dm
blackdragonTOW Nov 4, 2023
6cfed30
Update preferences_gear.dm
blackdragonTOW Nov 4, 2023
2865419
Update preferences_gear.dm
blackdragonTOW Nov 4, 2023
cc705e5
Add files via upload
blackdragonTOW Nov 4, 2023
55aa40d
Add files via upload
blackdragonTOW Nov 5, 2023
bbfc121
Add files via upload
blackdragonTOW Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/crew/senior_officers.dm
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/ties.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/ties.dmi
View file
Open in desktop
Binary file not shown.
Loading