diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm index 3b7b7a7302d..c487783dab4 100644 --- a/code/datums/trading/goods.dm +++ b/code/datums/trading/goods.dm @@ -158,7 +158,6 @@ /obj/item/clothing/suit/storage/toggle/labcoat/fluff = TRADER_BLACKLIST_ALL, /obj/item/clothing/suit/varsity = TRADER_ALL, /obj/item/clothing/suit/storage/toggle/track = TRADER_ALL, - /obj/item/clothing/suit/storage/miljacket = TRADER_ALL, /obj/item/clothing/suit/jacket/puffer = TRADER_ALL, /obj/item/clothing/suit/storage/toggle/flannel = TRADER_ALL ) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index d3d4ac5b8cc..394e676b48b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -19,6 +19,15 @@ jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen jackets["black jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket jackets["brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket + jackets["biker jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/biker + jackets["designer leather jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/designer + jackets["designer leather jacket, black"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black + jackets["designer leather jacket, red"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red + jackets["flight jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight + jackets["flight jacket, green"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green + jackets["flight jacket, white"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/white + jackets["military jacket"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/military + jackets["military jacket, tan"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan jackets["flannel jacket, green"] = /obj/item/clothing/suit/storage/toggle/flannel jackets["flannel jacket, red"] = /obj/item/clothing/suit/storage/toggle/flannel/red jackets["flannel jacket, blue"] = /obj/item/clothing/suit/storage/toggle/flannel/blue @@ -225,19 +234,6 @@ coat["dominia great coat, alternative black"] = /obj/item/clothing/suit/storage/toggle/dominia/black/alt gear_tweaks += new/datum/gear_tweak/path(coat) -/datum/gear/suit/military - display_name = "military jacket selection" - description = "A selection of military jackets, for the trained marksman in you." - path = /obj/item/clothing/suit/storage/miljacket - -/datum/gear/suit/military/New() - ..() - var/coat = list() - coat["military jacket"] = /obj/item/clothing/suit/storage/miljacket - coat["military jacket, alternative"] = /obj/item/clothing/suit/storage/miljacket/alt - coat["military jacket, green"] = /obj/item/clothing/suit/storage/miljacket/green - gear_tweaks += new/datum/gear_tweak/path(coat) - /datum/gear/suit/legion_jacket display_name = "Tau Ceti Foreign Legion jacket" path = /obj/item/clothing/suit/storage/legion diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 63f1ce3da49..437610c7265 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -177,6 +177,7 @@ pants["white track pants"] = /obj/item/clothing/under/pants/track/white pants["red track pants"] = /obj/item/clothing/under/pants/track/red pants["camo pants"] = /obj/item/clothing/under/pants/camo + pants["designer jeans"] = /obj/item/clothing/under/pants/designer pants["athletic shorts, black"] = /obj/item/clothing/under/shorts pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red pants["athletic shorts, green"] = /obj/item/clothing/under/shorts/green diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a1e88a0b603..fbaf3c8c795 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -258,6 +258,69 @@ icon_closed = "leather_jacket_sleeveless" body_parts_covered = UPPER_TORSO +/obj/item/clothing/suit/storage/toggle/leather_jacket/biker + name = "biker jacket" + desc = "A thick, black leather jacket with silver zippers and buttons, crafted to evoke the image of rebellious space-biker gangs." + icon_state = "biker" + item_state = "biker" + icon_open = "biker_open" + icon_closed = "biker" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/designer + name = "designer leather jacket" + desc = "A sophisticated, stylish leather jacket. It doesn't look cheap." + icon_state = "designer_jacket" + item_state = "designer_jacket" + icon_open = "designer_jacket_open" + icon_closed = "designer_jacket" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black + icon_state = "blackdesigner_jacket" + item_state = "blackdesigner_jacket" + icon_open = "blackdesigner_jacket_open" + icon_closed = "blackdesigner_jacket" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red + icon_state = "reddesigner_jacket" + item_state = "reddesigner_jacket" + icon_open = "reddesigner_jacket_open" + icon_closed = "reddesigner_jacket" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight + name = "flight jacket" + desc = "A modern pilot's jacket made from a silky, shiny nanonylon material. Not to be confused with the vintage stylings of a bomber jacket." + icon_state = "flight" + item_state = "flight" + icon_open = "flight_open" + icon_closed = "flight" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green + icon_state = "gflight" + item_state = "gflight" + icon_open = "gflight_open" + icon_closed = "gflight" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/white + icon_state = "wflight" + item_state = "wflight" + icon_open = "wflight_open" + icon_closed = "wflight" + +/obj/item/clothing/suit/storage/toggle/leather_jacket/military + name = "military jacket" + desc = "A military-styled jacket made from thick, distressed canvas. Popular among Martian punks. Patches not included." + icon_state = "mgreen" + item_state = "mgreen" + icon_open = "mgreen_open" + icon_closed = "mgreen" + allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) + +/obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan + icon_state = "mtan" + item_state = "mtan" + icon_open = "mtan_open" + icon_closed = "mtan" + //This one has buttons for some reason /obj/item/clothing/suit/storage/toggle/brown_jacket name = "leather jacket" @@ -481,25 +544,6 @@ icon_state = "varsity_brown" item_state = "varsity_brown" -/obj/item/clothing/suit/storage/miljacket - name = "military jacket" - desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." - icon_state = "militaryjacket_nobadge" - item_state = "militaryjacket_nobadge" - allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask) - -/obj/item/clothing/suit/storage/miljacket/alt - name = "military jacket" - desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable." - icon_state = "militaryjacket_badge" - item_state = "militaryjacket_badge" - -/obj/item/clothing/suit/storage/miljacket/green - name = "military jacket" - desc = "A dark green canvas jacket. Feels sturdy, yet comfortable." - icon_state = "militaryjacket_green" - item_state = "militaryjacket_green" - /obj/item/clothing/suit/storage/legion name = "tcfl jacket" desc = "A pale blue canvas jacket embossed with the insignia of the Tau Ceti Foreign Legion." @@ -581,4 +625,4 @@ icon_state = "cultrobes" item_state = "cultrobes" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - flags_inv = HIDEJUMPSUIT \ No newline at end of file + flags_inv = HIDEJUMPSUIT diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 451d209d3ed..7d7a58ff99e 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -200,3 +200,9 @@ desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." icon_state = "camopants" item_state = "camopants" + +/obj/item/clothing/under/pants/designer + name = "designer jeans" + desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look." + icon_state = "designer_jeans" + item_state = "designer_jeans" diff --git a/html/changelogs/alberyk-clothing.yml b/html/changelogs/alberyk-clothing.yml new file mode 100644 index 00000000000..900e8a9bd67 --- /dev/null +++ b/html/changelogs/alberyk-clothing.yml @@ -0,0 +1,7 @@ +author: Alberyk, BRAINOS + +delete-after: True + +changes: + - rscadd: "Added new jackets and pants options to the loadout." + - tweak: "Changed the bomber jacket sprite." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 72b0768e3eb..d6b46124d21 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b6a38bf9940..57c6e883773 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/pants.dmi b/icons/obj/pants.dmi index 758f0d5d8fc..b87c358cc80 100644 Binary files a/icons/obj/pants.dmi and b/icons/obj/pants.dmi differ diff --git a/maps/space_ruins/scrapheap.dmm b/maps/space_ruins/scrapheap.dmm index 40008c070dd..2f7a75951b3 100644 --- a/maps/space_ruins/scrapheap.dmm +++ b/maps/space_ruins/scrapheap.dmm @@ -6467,7 +6467,7 @@ /area/derelict) "tt" = ( /obj/structure/table/wood/gamblingtable, -/obj/item/weapon/deck/holder, +/obj/item/weapon/storage/card, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/derelict) @@ -9473,7 +9473,7 @@ icon_state = "spline_fancy"; dir = 8 }, -/obj/item/clothing/suit/storage/miljacket, +/obj/item/clothing/suit/storage/legion, /obj/item/clothing/suit/storage/vest/legion, /obj/item/device/camera, /obj/item/clothing/head/legion_beret, @@ -12547,7 +12547,7 @@ icon_state = "spline_fancy"; dir = 6 }, -/obj/item/weapon/deck/holder, +/obj/item/weapon/storage/card, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood,