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.

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

Loadout Customization - Items expanded & more... #7614

Draft
wants to merge 34 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
162ffce
first commit
Zenith00000 Nov 15, 2024
7e2a328
Merge branch 'cmss13-devs:master' into More-Marine-customization
Zenith00000 Nov 15, 2024
503ee1d
huge amount of new marine customization stuff + revamp of goggle spri…
Zenith00000 Nov 18, 2024
437998b
small fix
Zenith00000 Nov 18, 2024
65d2289
small fix
Zenith00000 Nov 18, 2024
e2841c6
small fix
Zenith00000 Nov 18, 2024
8390055
knives and bayonets
Zenith00000 Nov 18, 2024
e843e85
missing sprite + fix
Zenith00000 Nov 19, 2024
88bb2c6
swiss army knife by Crow
Zenith00000 Nov 19, 2024
831b717
more patches by VaNdU-jr & fixes.
Zenith00000 Nov 20, 2024
650ce17
sprite fixes, various fixes, WIP swiss knife, WIP Civilian only gear.
Zenith00000 Nov 23, 2024
a75a8a9
sprite fix
Zenith00000 Nov 23, 2024
ef346f9
more shades bimex
Zenith00000 Nov 26, 2024
3dc044a
bimex glasses + new sprites and minor fix to origins civilian gear.
Zenith00000 Nov 26, 2024
5201755
swiss knife
uuuuhuuuu Nov 26, 2024
10d867a
Merge pull request #55 from cuberound/swiss-knife
Zenith00000 Nov 27, 2024
86e5de5
small fix
Zenith00000 Nov 27, 2024
44899cd
Merge branch 'master' into More-Marine-customization
Zenith00000 Nov 27, 2024
651f2a2
fix
Zenith00000 Nov 27, 2024
4d1f2b9
green eyepatch and minor fixes.
Zenith00000 Nov 27, 2024
3f91265
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into p…
Blundir Dec 14, 2024
97619f8
fixes
Blundir Dec 14, 2024
d904049
more patches, keffiyeh headwrap, fixes ect.
Zenith00000 Dec 14, 2024
9afd98f
indentation fix
Zenith00000 Dec 14, 2024
e3565c4
small fix
Zenith00000 Dec 14, 2024
93dc9f7
fixes
Zenith00000 Dec 14, 2024
1367c6d
Update breath.dm
Zenith00000 Dec 14, 2024
f465a78
fix again
Zenith00000 Dec 14, 2024
03caa57
small fix
Zenith00000 Dec 14, 2024
6ce2e8f
new bimex, headgear, various fixes and new stuff.
Zenith00000 Dec 15, 2024
1dcb1bb
Merge branch 'master' into More-Marine-customization
Zenith00000 Dec 15, 2024
d9a26e2
missing lineart
Zenith00000 Dec 16, 2024
d3f54bf
small fix
Zenith00000 Dec 16, 2024
9095225
small bixex tactical shades additon and fix.
Zenith00000 Dec 16, 2024
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
Prev Previous commit
Next Next commit
huge amount of new marine customization stuff + revamp of goggle spri…
…tes and more...
Zenith00000 committed Nov 18, 2024
commit 503ee1d1c041ea3fa0d5a5e268b1dc61987f73db
13 changes: 13 additions & 0 deletions code/datums/supply_packs/clothing.dm
Original file line number Diff line number Diff line change
@@ -57,6 +57,19 @@
containername = "Webbing Crate"
group = "Clothing"

/datum/supply_packs/webbing_large_black
name = "Black Webbing Crate (x4)"
contains = list(
/obj/item/clothing/accessory/storage/webbing/black,
/obj/item/clothing/accessory/storage/webbing/black,
/obj/item/clothing/accessory/storage/webbing/black,
/obj/item/clothing/accessory/storage/webbing/black,
)
cost = 20
containertype = /obj/structure/closet/crate/green
containername = "Black Webbing Crate"
group = "Clothing"

/datum/supply_packs/drop_pouches
name = "Drop Pouch Crate (x4)"
contains = list(
1 change: 1 addition & 0 deletions code/datums/tutorial/marine/reqs_line.dm
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@
/obj/item/clothing/accessory/storage/black_vest = list("Black webbing", "Black webbing vest"),
/obj/item/clothing/accessory/storage/black_vest/brown_vest = list("Brown webbing", "Brown webbing vest"),
/obj/item/clothing/accessory/storage/webbing = list("Webbing", "Normal webbing", "Web"),
/obj/item/clothing/accessory/storage/webbing/black = list("Black Webbing", "Normal black webbing", "Blk Web"),
/obj/item/clothing/accessory/storage/droppouch = list("Drop Pouch"),
/obj/item/clothing/suit/storage/webbing = list("External webbing"),
/obj/item/storage/backpack/marine/engineerpack/flamethrower/kit = list("Pyro pack", "Pyro backpack", "G4-1 pack", "Flamer backpack"),
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_commanding_officer, list(
list("Tactical Waistcoat", 0, /obj/item/clothing/accessory/storage/black_vest/waistcoat, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("HUDS (CHOOSE 1)", 0, null, null, null),
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_maintenance_technician, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
))

/obj/structure/machinery/cm_vending/clothing/maintenance_technician
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/medical.dm
Original file line number Diff line number Diff line change
@@ -92,6 +92,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, 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("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

))

1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/mp.dm
Original file line number Diff line number Diff line change
@@ -45,6 +45,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
))

/obj/structure/machinery/cm_vending/clothing/military_police
Original file line number Diff line number Diff line change
@@ -105,6 +105,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("GLASSES (CHOOSE 1)", 0, null, null, null),
list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/sea.dm
Original file line number Diff line number Diff line change
@@ -74,6 +74,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
))

Original file line number Diff line number Diff line change
@@ -76,6 +76,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
))


Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("BACKPACK (CHOOSE 1)", 0, null, null, null),
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
@@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, 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_RECOMMENDED),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Surgical Webbing Vest", 0, /obj/item/clothing/accessory/storage/surg_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Surgical Webbing Vest (Blue)", 0, /obj/item/clothing/accessory/storage/surg_vest/blue, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Surgical Drop Pouch", 0, /obj/item/clothing/accessory/storage/surg_vest/drop_green, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
Original file line number Diff line number Diff line change
@@ -297,6 +297,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
Original file line number Diff line number Diff line change
@@ -120,6 +120,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
4 changes: 4 additions & 0 deletions code/game/machinery/vending/vendor_types/requisitions.dm
Original file line number Diff line number Diff line change
@@ -66,6 +66,7 @@
list("Brown Webbing Vest", floor(scale * 2), /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", floor(scale * 1.5), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
list("Webbing", floor(scale * 5), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
list("Black Webbing", floor(scale * 5), /obj/item/clothing/accessory/storage/webbing/black, VENDOR_ITEM_REGULAR),
list("Knife Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/knifeharness, VENDOR_ITEM_REGULAR),
list("Drop Pouch", floor(scale * 2), /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("External Webbing", floor(scale * 5), /obj/item/clothing/suit/storage/webbing, VENDOR_ITEM_REGULAR),
@@ -453,6 +454,8 @@
list("Marine Combat Boots", 20, /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Boots", 5, /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Jungle Combat Boots", 5, /obj/item/clothing/shoes/marine/jungle, VENDOR_ITEM_REGULAR),
list("Marine Grey Combat Boots", 5, /obj/item/clothing/shoes/marine/grey, VENDOR_ITEM_REGULAR),
list("Marine Urban Combat Boots", 5, /obj/item/clothing/shoes/marine/urban, VENDOR_ITEM_REGULAR),

list("BACKPACKS", -1, null, null),
list("Lightweight IMP Backpack", 20, /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR),
@@ -480,6 +483,7 @@
list("Marine Combat Gloves", 40, /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
list("Marine Black Combat Gloves", 40, /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Gloves", 20, /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Grey Combat Gloves", 20, /obj/item/clothing/gloves/marine/grey, VENDOR_ITEM_REGULAR),

list("RADIO", -1, null, null),
list("Alpha Squad Radio Encryption Key", 5, /obj/item/device/encryptionkey/alpha, VENDOR_ITEM_REGULAR),
Original file line number Diff line number Diff line change
@@ -164,6 +164,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Small Tool Webbing (Full)", 0, /obj/item/clothing/accessory/storage/tool_webbing/small/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

Original file line number Diff line number Diff line change
@@ -169,6 +169,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_leader, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
Original file line number Diff line number Diff line change
@@ -172,6 +172,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
Original file line number Diff line number Diff line change
@@ -101,17 +101,20 @@
list("STANDARD EQUIPMENT", -1, null, null, null),
list("Marine Combat Boots", floor(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Boots", floor(scale * 15), /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Grey Combat Boots", floor(scale * 15), /obj/item/clothing/shoes/marine/grey, VENDOR_ITEM_REGULAR),
list("USCM Uniform", floor(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
list("Marine Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
list("Marine Brown Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
list("Marine Black Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
list("Marine Grey Combat Gloves", floor(scale * 15), /obj/item/clothing/gloves/marine/grey, VENDOR_ITEM_REGULAR),
list("Marine Radio Headset", floor(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
list("M10 Pattern Marine Helmet", floor(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),

list("WEBBINGS", -1, null, null),
list("Brown Webbing Vest", 1, /obj/item/clothing/accessory/storage/black_vest/brown_vest, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", 1, /obj/item/clothing/accessory/storage/black_vest, VENDOR_ITEM_REGULAR),
list("Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing, VENDOR_ITEM_REGULAR),
list("Black Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/black, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0.75, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0.75, /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),

Original file line number Diff line number Diff line change
@@ -88,6 +88,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list(

list("CLOTHING ITEMS", 0, null, null, null),
list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR),
list("Black Webbing", 10, /obj/item/clothing/accessory/storage/webbing/black, null, VENDOR_ITEM_REGULAR),
list("Brown Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", 15, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR),
Original file line number Diff line number Diff line change
@@ -106,6 +106,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_smartgun, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
Original file line number Diff line number Diff line change
@@ -93,6 +93,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list(
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
Original file line number Diff line number Diff line change
@@ -129,6 +129,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_tl, list(
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing", 0, /obj/item/clothing/accessory/storage/webbing/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),

list("MASK (CHOOSE 1)", 0, null, null, null),
20 changes: 20 additions & 0 deletions code/game/objects/items/cosmetics.dm
Original file line number Diff line number Diff line change
@@ -35,6 +35,26 @@
paint_type = "full_camo"
icon_state = "full_camo"

/obj/item/facepaint/sniper/snow
name = "fullbody paint snow"
paint_type = "full_camo_snow"
icon_state = "full_camo_snow"

/obj/item/facepaint/sniper/desert
name = "fullbody paint desert"
paint_type = "full_camo_desert"
icon_state = "full_camo_desert"

/obj/item/facepaint/sniper/jungle
name = "fullbody paint jungle"
paint_type = "full_camo_jungle"
icon_state = "full_camo_jungle"

/obj/item/facepaint/sniper/urban
name = "fullbody paint urban"
paint_type = "full_camo_urban"
icon_state = "full_camo_urban"

/obj/item/facepaint/skull
name = "skull paint"
desc = "Paint, for your face. Make your enemies need a change of underwear from the sheer terror a goddamn skull on your face will bring to them. WARNING: DOES NOT MIX WELL WITH BEARDS."
4 changes: 4 additions & 0 deletions code/game/objects/items/props/helmetgarb.dm
Original file line number Diff line number Diff line change
@@ -513,6 +513,10 @@
desc = "The complimentary, but sold separate face shield associated with the RC6 riot helmet."
icon_state = "helmet_riot_shield"

/obj/item/prop/helmetgarb/bearpelt
name = "synthetic bear pelt hat"
desc = "Fuzzy."
icon_state = "bearpelt"

/obj/item/prop/helmetgarb/helmet_gasmask
name = "\improper M5 integrated gasmask"
Loading

Unchanged files with check annotations Beta

for(var/file_place in possible_icon_states[icon_state])
match_message += (match_message ? " & '[file_place]'" : " - Matching sprite found in: '[file_place]'")
TEST_FAIL("Missing icon_state for [obj_path] in '[icon]'.\n\ticon_state = \"[icon_state]\"[match_message]")

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (runtime) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (lv522_chances_claim) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (shivas_snowball) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (lv624) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (chinook) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (sorokyne_strata) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (almayer) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (desert_dam) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (whiskey_outpost_v2) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (prison_station_fop) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (new_varadero) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (kutjevo) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (ice_colony_v2) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (corsat) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (fiorina_sciannex) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'

Check failure on line 55 in code/modules/unit_tests/missing_icons.dm

GitHub Actions / Unit Tests (bigredv2) / run_unit_tests

/datum/map_config: /datum/unit_test/missing_icons

Missing icon_state for /obj/item/prop/helmetgarb/bearpelt in 'icons/obj/items/helmet_garb.dmi'. icon_state = "bearpelt" - Matching sprite found in: 'icons/obj/items/clothing/hats.dmi'