Skip to content

Commit ccb5fbf

Browse files
DexterDudeDexterDude
authored
Basic apparel stuff (#6)
* initial commit * update * Update belt.dm * Update ties.dm
1 parent 4424dde commit ccb5fbf

File tree

20 files changed

+184
-176
lines changed

20 files changed

+184
-176
lines changed

‎code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

+9-9
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
175175
list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
176176

177177
list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
178-
list("M3 Pattern Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
179-
list("M3 Pattern Magazine Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/mag, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
180-
list("M3 Pattern Shotgun Shell Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
181-
list("M3 Pattern M40 Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/m40, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
182-
list("M3 Pattern Small Pouch Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/small, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
178+
list("M3 Pattern Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
179+
list("M3 Pattern Magazine Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/mag, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
180+
list("M3 Pattern Shotgun Shell Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/shotgun, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
181+
list("M3 Pattern M40 Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/grenade, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
182+
list("M3 Pattern Small Pouch Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/small, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
183183
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
184184
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
185185
))
@@ -330,10 +330,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, list(
330330
list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
331331

332332
list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
333-
list("M3-R Pattern Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/recon, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
334-
list("M3-R Pattern Shotgun Shell Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/recon/shotgun, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
335-
list("M3-R Pattern M40 Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/recon/m40, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
336-
list("M3-R Pattern Corpsman Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m3/recon/medic, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
333+
list("M3-R Pattern Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/recon, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
334+
list("M3-R Pattern Shotgun Shell Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/recon/shotgun, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
335+
list("M3-R Pattern M40 Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/recon/grenade, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
336+
list("M3-R Pattern Corpsman Webbing", 0, /obj/item/clothing/accessory/storage/webbing/m52b/recon/medic, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED),
337337
list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
338338
list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
339339
))

‎code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm

+8-10
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@
110110
list("Boonie Hat, Jungle BDU", floor(scale * 15), /obj/item/clothing/head/cmcap/boonie, VENDOR_ITEM_REGULAR),
111111

112112
list("WEBBINGS", -1, null, null),
113-
list("M3 Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
114-
list("M3 Pattern Magazine Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/mag, VENDOR_ITEM_REGULAR),
115-
list("M3 Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
116-
list("M3 Pattern M40 Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m3/m40, VENDOR_ITEM_REGULAR),
117-
list("M3 Pattern Small Pouch Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/small, VENDOR_ITEM_REGULAR),
113+
list("M3 Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b, VENDOR_ITEM_REGULAR),
114+
list("M3 Pattern Magazine Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b/mag, VENDOR_ITEM_REGULAR),
115+
list("M3 Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b/shotgun, VENDOR_ITEM_REGULAR),
116+
list("M3 Pattern M40 Webbing", 0.75, /obj/item/clothing/accessory/storage/webbing/m52b/grenade, VENDOR_ITEM_REGULAR),
117+
list("M3 Pattern Small Pouch Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b/small, VENDOR_ITEM_REGULAR),
118118
list("Drop Pouch", 4, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
119119
list("Leg Pouch", 4, /obj/item/clothing/accessory/storage/smallpouch, VENDOR_ITEM_REGULAR),
120120
list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
@@ -127,7 +127,6 @@
127127
list("M3 Pattern Shoulder Pauldrons", round(scale * 10), /obj/item/clothing/accessory/pads, VENDOR_ITEM_REGULAR),
128128
list("M3 Pattern Groin Plate", round(scale * 10), /obj/item/clothing/accessory/pads/groin, VENDOR_ITEM_REGULAR),
129129
list("M3 Pattern Greaves", round(scale * 15), /obj/item/clothing/accessory/pads/greaves, VENDOR_ITEM_REGULAR),
130-
list("M3 Pattern Knee Pads", round(scale * 15), /obj/item/clothing/accessory/pads/kneepads, VENDOR_ITEM_REGULAR),
131130
list("M3 Pattern Arm Bracers", round(scale * 10), /obj/item/clothing/accessory/pads/bracers, VENDOR_ITEM_REGULAR),
132131
list("M3 Pattern Neck Brace", round(scale * 15), /obj/item/clothing/accessory/pads/neckguard, VENDOR_ITEM_REGULAR),
133132

@@ -198,7 +197,6 @@
198197
new /obj/item/clothing/accessory/pads(src)
199198
new /obj/item/clothing/accessory/pads/groin(src)
200199
new /obj/item/clothing/accessory/pads/greaves(src)
201-
new /obj/item/clothing/accessory/pads/kneepads(src)
202200
/obj/effect/essentials_set/m3
203201
spawned_gear_list = list(
204202
/obj/item/clothing/suit/marine,
@@ -297,9 +295,9 @@
297295
list("M5 Pattern Camera Headset", floor(scale * 15), /obj/item/device/overwatch_camera, VENDOR_ITEM_REGULAR),
298296

299297
list("WEBBINGS", -1, null, null),
300-
list("M3-R Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/recon, VENDOR_ITEM_REGULAR),
301-
list("M3-R Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/recon/shotgun, VENDOR_ITEM_REGULAR),
302-
list("M3-R Pattern M40 Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m3/recon/m40, VENDOR_ITEM_REGULAR),
298+
list("M3-R Pattern Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b/recon, VENDOR_ITEM_REGULAR),
299+
list("M3-R Pattern Shotgun Shell Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b/recon/shotgun, VENDOR_ITEM_REGULAR),
300+
list("M3-R Pattern M40 Webbing", 2, /obj/item/clothing/accessory/storage/webbing/m52b/recon/grenade, VENDOR_ITEM_REGULAR),
303301
list("Drop Pouch", 3, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
304302
list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
305303

‎code/game/machinery/vending/vendor_types/wo_vendors.dm

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
list("Second Platoon Headset", floor(scale * 5), /obj/item/device/radio/headset/almayer/marine/solardevils/foxtrot, VENDOR_ITEM_REGULAR),
2424

2525
list("WEBBINGS", -1, null, null),
26-
list("M3 Pattern Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3, VENDOR_ITEM_REGULAR),
27-
list("M3 Pattern Magazine Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3/mag, VENDOR_ITEM_REGULAR),
28-
list("M3 Pattern Shotgun Shell Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/m3/shotgun, VENDOR_ITEM_REGULAR),
29-
list("M3 Pattern M40 Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/webbing/m3/m40, VENDOR_ITEM_REGULAR),
30-
list("M3 Pattern Small Pouch Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/webbing/m3/small, VENDOR_ITEM_REGULAR),
26+
list("M3 Pattern Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/m52b, VENDOR_ITEM_REGULAR),
27+
list("M3 Pattern Magazine Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/m52b/mag, VENDOR_ITEM_REGULAR),
28+
list("M3 Pattern Shotgun Shell Webbing", floor(scale * 2), /obj/item/clothing/accessory/storage/webbing/m52b/shotgun, VENDOR_ITEM_REGULAR),
29+
list("M3 Pattern M40 Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/webbing/m52b/grenade, VENDOR_ITEM_REGULAR),
30+
list("M3 Pattern Small Pouch Webbing", floor(scale * 1), /obj/item/clothing/accessory/storage/webbing/m52b/small, VENDOR_ITEM_REGULAR),
3131
list("Drop Pouch", 3, /obj/item/clothing/accessory/storage/droppouch, VENDOR_ITEM_REGULAR),
3232
list("Shoulder Holster", round(max(1,(scale * 0.5))), /obj/item/clothing/accessory/storage/holster, VENDOR_ITEM_REGULAR),
3333

0 commit comments

Comments
 (0)