From 346aadd2814392d2031a79a5e9f3db17c51d4696 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:47:26 +0100 Subject: [PATCH] Adds Colourable Shorts (#17691) * Adds Recolourable Shorts and Short Shorts * Fixes * Fix --- .../preference_setup/loadout/items/uniform.dm | 39 +++--- code/modules/clothing/under/pants.dm | 8 +- code/modules/clothing/under/shorts.dm | 22 ++-- .../SleepyGemmy-recolourable_shorts.yml | 7 ++ icons/obj/item/clothing/under/pants.dmi | Bin 13241 -> 12362 bytes icons/obj/item/clothing/under/shorts.dmi | Bin 3014 -> 3221 bytes .../away/ships/freebooter/freebooter_ship.dmm | 1 - .../ships/tramp_freighter/tramp_freighter.dmm | 115 ++++++++---------- 8 files changed, 94 insertions(+), 98 deletions(-) create mode 100644 html/changelogs/SleepyGemmy-recolourable_shorts.yml diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index ef8dbc39253..161713c1ef5 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -166,11 +166,12 @@ /datum/gear/uniform/pants/New() ..() var/list/pants = list() + + // Pants pants["jeans"] = /obj/item/clothing/under/pants/jeans pants["classic jeans"] = /obj/item/clothing/under/pants/classic - pants["must hang jeans"] = /obj/item/clothing/under/pants/mustang + pants["mustang jeans"] = /obj/item/clothing/under/pants/mustang pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack - pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans pants["white pants"] = /obj/item/clothing/under/pants/white pants["black pants"] = /obj/item/clothing/under/pants/black pants["red pants"] = /obj/item/clothing/under/pants/red @@ -187,13 +188,6 @@ pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped - // Athletic Shorts - pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black - pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red - pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green - pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey - pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc - // Shorts pants["black shorts"] = /obj/item/clothing/under/shorts/black pants["black short shorts"] = /obj/item/clothing/under/shorts/black/short @@ -207,30 +201,43 @@ pants["classic jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/classic/short pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang pants["mustang jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/short - pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks - pants["young folks jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/short pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black pants["black jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/black/short pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey pants["grey jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/grey/short + + // Athletic Shorts + pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black + pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red + pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green + pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey + pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc + gear_tweaks += new /datum/gear_tweak/path(pants) /datum/gear/uniform/colorpants - display_name = "pants and shorts selection (recolourable)" - description = "A selection of recolourable pants and shorts." + display_name = "pants and shorts selection (colourable)" + description = "A selection of colourable pants and shorts." path = /obj/item/clothing/under/pants/dress flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION /datum/gear/uniform/colorpants/New() ..() var/list/colorpants = list() + + // Pants colorpants["dress pants"] = /obj/item/clothing/under/pants/dress colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt colorpants["striped pants"] = /obj/item/clothing/under/pants/striped - colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans - colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable - colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable colorpants["flared pants"] = /obj/item/clothing/under/pants/flared + colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable + colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans + + // Shorts + colorpants["shorts"] = /obj/item/clothing/under/shorts/colourable + colorpants["short shorts"] = /obj/item/clothing/under/shorts/colourable/short + colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable + gear_tweaks += new /datum/gear_tweak/path(colorpants) /datum/gear/uniform/turtleneck diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index b2e502a4b26..3d90cf98ce9 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -114,12 +114,6 @@ icon_state = "jeansblack" item_state = "jeansblack" -/obj/item/clothing/under/pants/youngfolksjeans - name = "young folks jeans" - desc = "For those tired of boring old jeans." - icon_state = "jeansyoungfolks" - item_state = "jeansyoungfolks" - /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." @@ -177,4 +171,4 @@ name = "red track pants" icon_state = "trackpantsred" item_state = "trackpantsred" -/********** Track Pants End **********/ \ No newline at end of file +/********** Track Pants End **********/ diff --git a/code/modules/clothing/under/shorts.dm b/code/modules/clothing/under/shorts.dm index 9001f59b5e3..73d93addf5c 100644 --- a/code/modules/clothing/under/shorts.dm +++ b/code/modules/clothing/under/shorts.dm @@ -12,6 +12,16 @@ /********** Shorts Start **********/ // Shorts +/obj/item/clothing/under/shorts/colourable + name = "shorts" + desc = "A pair of cotton shorts." + icon_state = "shorts_recolourable" + item_state = "shorts_recolourable" + +/obj/item/clothing/under/shorts/colourable/short + name = "short shorts" + desc = "A pair of cotton short shorts." + /obj/item/clothing/under/shorts/black name = "black shorts" desc = "For that island getaway. It's five o'clock somewhere, right?" @@ -68,16 +78,6 @@ icon_state = "shorts_s_jeans_mustang" item_state = "shorts_s_jeans_mustang" -/obj/item/clothing/under/shorts/jeans/youngfolks - name = "young folks jeans shorts" - icon_state = "shorts_jeans_youngfolk" - item_state = "shorts_jeans_youngfolk" - -/obj/item/clothing/under/shorts/jeans/youngfolks/short - name = "young folks jeans short shorts" - icon_state = "shorts_s_jeans_youngfolk" - item_state = "shorts_s_jeans_youngfolk" - /obj/item/clothing/under/shorts/jeans/black name = "black jeans shorts" icon_state = "shorts_jeans_black" @@ -147,4 +147,4 @@ desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur." icon_state = "shorts_athletic_scc" item_state = "shorts_athletic_scc" -/********** Athletic Shorts End **********/ \ No newline at end of file +/********** Athletic Shorts End **********/ diff --git a/html/changelogs/SleepyGemmy-recolourable_shorts.yml b/html/changelogs/SleepyGemmy-recolourable_shorts.yml new file mode 100644 index 00000000000..dced7af41b1 --- /dev/null +++ b/html/changelogs/SleepyGemmy-recolourable_shorts.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Added a pair of colourable shorts and short shorts." + - rscdel: "Removed the young folks jeans and jeans shorts, as they had the same sprite as the classic jeans and jeans shorts." diff --git a/icons/obj/item/clothing/under/pants.dmi b/icons/obj/item/clothing/under/pants.dmi index c29661183907ce421e2316f646dc36b67abe48c6..6aa8dc1c5e1e149a67a6d96fb77a8b9302d05953 100644 GIT binary patch literal 12362 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 P08o@um93ICd-J~lE-030 literal 13241 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

>3fte(@L$av zm5@jb4}xuHhcb$D{3p7_|1>E5X9CCnec($z=&t5Sxly*QK-PXkwLW2r+njcJ)7Uk) zq;3r24WXHkFJ17v?r192Svy{VXZSoelR(P?e&J|X?Yt+pvG-_!d;?69h|mo345@e( z+Ni9fgZ-e|d6WVYEr-Ur5i7df-P~)PIOnYH760y)U*n}Z!&6g_V!Ba)$p%*@eeWYl zKm$1~bhDk^?*ox^E3G%L?X)R@bqj4`Sm^pEq|8rieJL-zajR$cq+DIOby-P4-n{;P zjQkLkR({MhTKH)a@gT;a^fb&EnV$ZB_4E?d(X0)j%p|U_e>AJ{tjb(iIWn}d!2#Jy z#TrITcR*PgE7+v!?jm`WMnyfkk+#>6ZQ9RdVmC#_H@cw+)r+}Gh>GYI-?RO`{mH`4 zP90=s@RO_qGQbd&s)U0AnPH2-i5)bcs;bIj8fgf8IFPVYGHme}>=%E@mU*6QiThwM z=-zY?*fnmtT#l%q4+T4-ASqZ{{1t#*gDnQd2u+2E*yt-`0CVeZ^}6W5p=WbAAB1`w zQSH0GlG6BKm*>UiU-n_xao_0{A57&OS*-w`u0jL_~CQLvcMb_;Gx!|hsywoyo=+juf?AEIoW%&MGcAeasVpG!(` zmK?}D1MSN)d@F}njylA&V(3JUQi4;NvdJds{FV`?6VCHn-0xw`Wbi3-eV^7}h6Fqr zdvaT^q*zk=f*kmmt*BwZt~vb zQ??%2OT@lZ-TsZ1i(=X^FffqmjS|l1&$6QsEcE|No*Lm|ufx zMlUa~1Yh)Ro0YAq2R#{Zj@UC`40$$LPz8!$A6|D6Gc8KXFa-%NQmr$O*5>BscP1uu z+B!PJlarzQ`*vy{K6KXT=;$abEB~?&rq3;j{UF^61~tZ4uaNz|rhxCj^G>T`t-tW7 zuogUqK&x%-T<}VF%*tv{LdD)jwih0tq^wL+Dnv`mUAc`(CWEsO9*))C0}4HEFCAy0 zGq#m-;0@?^kW)h~zWk$J8SjeZ4gU6FMM5I&oh#4+LepBA&Q4OJU8&;q$=ezChD-qu zPU!Jo`@@0u83G8Rq)bj`9olisiMB19>=H>tbeva>Fw*dhG=m6u(m&)J2e^*jdd%S>_X9=mp zoS(64#1$78-`w9<_$Iy6?MISaqVwsuS=tbW&+)2ki9w5y(frxY#Lh8k=%(k^-rk4* zDd%|dGm>l@_Vhbz3wR>B+wks0r0 zbZ6cESy7rrX-`r4MYqVD@W^LqSw;sHZ^2(CksO`9h+*8@e1;*n{$JGW1DxQBLV|#b|6e1Enh%Kt7kTrx+dM^-lrIMj;V|X5d-iNFZPS8{Pffik zHx3PT3fl&te3TVC{vy;y8KI%;tohuFU^))|fu~{8m6lfJ#ae|6{JX-?7^^PAorkXZ{8?YJs54=>9alYQG&m?cHPbJa<(MY~JkgfMpxBR2-Aq z87k~GP@dD5!49&_zHCIYj-7He4UahyaTLN*DopnWa|)&mCI#E6PMd*XuSLJEmX-^tWu({q}cJ*bPTt0?7GHCRC? zF2;s7>Va}8F+QXB<%dz_M%TkU?I|+NC4!G$6yr}VIdrtCqejo!ZSW(9$yAr%8q((4 zbpM+~SauxsNB4>{SVJ)vTq40lRRW`NOtTWJ8+N^DbYL5(uRpu14`ZcCH@v;K(!IEmD6vbMNqXJ?kh5sWjY z^1$eGLSN6CyMD>F0IBnS`2YX_ diff --git a/icons/obj/item/clothing/under/shorts.dmi b/icons/obj/item/clothing/under/shorts.dmi index cf1f4fb8a849495ff94e65099b99a498228b0a10..b739110b9ec84e3a9831e08d435825681e6c7305 100644 GIT binary patch literal 3221 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 diff --git a/maps/away/ships/freebooter/freebooter_ship.dmm b/maps/away/ships/freebooter/freebooter_ship.dmm index c30c3d489ed..cd7dc132722 100644 --- a/maps/away/ships/freebooter/freebooter_ship.dmm +++ b/maps/away/ships/freebooter/freebooter_ship.dmm @@ -8912,7 +8912,6 @@ /obj/item/clothing/head/dominia/fleet, /obj/item/clothing/head/dominia/fleet/armsman, /obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/youngfolksjeans, /obj/item/clothing/under/pants/jeansblack, /obj/item/clothing/head/beanie/random, /obj/item/clothing/head/beanie/random, diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm index f5a4d1b6456..fc47096cb0d 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm @@ -709,10 +709,6 @@ }, /turf/simulated/floor/tiled/white, /area/ship/tramp_freighter) -"eoK" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/shuttle/space_ship, -/area/ship/tramp_freighter) "etL" = ( /turf/space/transit/north, /area/space) @@ -1694,9 +1690,6 @@ }, /turf/simulated/floor, /area/ship/tramp_freighter) -"phz" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/shuttle/freighter_shuttle) "pmv" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -2012,7 +2005,6 @@ /obj/item/clothing/suit/storage/toggle/bomber, /obj/item/clothing/suit/storage/toggle/flannel/red, /obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/under/pants/youngfolksjeans, /obj/item/clothing/head/cowboy, /obj/item/clothing/shoes/cowboy/classic, /obj/item/clothing/shoes/jackboots, @@ -2132,9 +2124,6 @@ }, /turf/simulated/floor, /area/ship/tramp_freighter) -"wYA" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/ship/tramp_freighter) "wZf" = ( /turf/simulated/floor, /area/ship/tramp_freighter) @@ -31367,7 +31356,7 @@ ehI lfq ylV ylV -wYA +ylV xRX xRX xRX @@ -31624,8 +31613,8 @@ lfq tvU ylV qXU -wYA -wYA +ylV +ylV xRX xRX xRX @@ -31879,10 +31868,10 @@ aSJ aHt ylV ylV -wYA +ylV gdk fUQ -wYA +ylV xRX xRX xRX @@ -32395,8 +32384,8 @@ gdk rWz ckN bXv -wYA -wYA +ylV +ylV xRX xRX xRX @@ -32652,7 +32641,7 @@ gdk jgW udB pDO -wYA +ylV xRX xRX xRX @@ -32905,10 +32894,10 @@ cVA cBb aSJ ylV -wYA -wYA -wYA -wYA +ylV +ylV +ylV +ylV xRX xRX xRX @@ -33160,8 +33149,8 @@ eiL aSJ bfg aSJ -wYA -wYA +ylV +ylV aap xRX xRX @@ -33417,9 +33406,9 @@ nyj ylV ylV ylV -wYA -wYA -wYA +ylV +ylV +ylV xRX xRX xRX @@ -33676,7 +33665,7 @@ eEk onP ozs qFX -wYA +ylV jMF xRX xRX @@ -33930,11 +33919,11 @@ elQ euz eEk rgA -eoK +aHt fMy hDn -wYA -wYA +ylV +ylV xRX xRX xRX @@ -34166,17 +34155,17 @@ xRX rtf wZf gQH -phz -phz -phz -phz +aBb +aBb +aBb +aBb hZq ePO -phz -phz -phz -phz -phz +aBb +aBb +aBb +aBb +aBb lRa jCz ylV @@ -34187,11 +34176,11 @@ ivo eEk eCb hqX -wYA -wYA -wYA +ylV +ylV +ylV aHt -wYA +ylV xRX xRX xRX @@ -34444,7 +34433,7 @@ emn eEk eCb kon -wYA +ylV uCl rNF fhJ @@ -34701,11 +34690,11 @@ enr euz eCb eIb -wYA +ylV hQi eyx -eoK -wYA +aHt +ylV xRX xRX xRX @@ -34958,11 +34947,11 @@ ylV euz eEk exg -eoK +aHt fQG eCV fhJ -wYA +ylV xRX xRX xRX @@ -35195,16 +35184,16 @@ rtf wZf axB aBb -phz -phz -phz -phz +aBb +aBb +aBb +aBb xeK bgD -phz -phz -phz -phz +aBb +aBb +aBb +aBb lRa mpg ylV @@ -35218,8 +35207,8 @@ gcq iHx eyx vFx -wYA -wYA +ylV +ylV xRX xRX xRX @@ -35476,7 +35465,7 @@ ylV fRD rMI mut -wYA +ylV xRX xRX xRX @@ -35733,7 +35722,7 @@ ylV ylV ylV ylV -wYA +ylV lXE lXE lXE