From eb506e091248c9a8be8ad0eb74b0c19966a7b6ae Mon Sep 17 00:00:00 2001 From: Captain277 Date: Sun, 1 Oct 2023 17:09:44 -0700 Subject: [PATCH 1/2] Adds Aquiline Helmet and Tourist Costume --- code/game/machinery/vending.dm | 1 + code/modules/clothing/head/helmet.dm | 8 ++++++++ code/modules/clothing/shoes/miscellaneous.dm | 7 +++++++ code/modules/clothing/under/miscellaneous.dm | 7 +++++++ code/modules/loadout/loadout_shoes.dm | 4 ++++ code/modules/loadout/loadout_uniform.dm | 4 ++++ icons/clothing/uniform/costume/aquiline.dmi | Bin 769 -> 1011 bytes icons/clothing/uniform/misc/tourist.dmi | Bin 0 -> 1408 bytes 8 files changed, 31 insertions(+) create mode 100644 icons/clothing/uniform/misc/tourist.dmi diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 35fa13a5451d..4e04aa1c855f 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -2479,6 +2479,7 @@ /obj/item/clothing/suit/banana = 3, /obj/item/clothing/suit/assassin = 3, /obj/item/clothing/head/bard = 3, + /obj/item/clothing/head/helmet/aquiline = 3, /obj/item/clothing/under/aquiline_enforcer = 3, /obj/item/clothing/under/yoko = 3, /obj/item/clothing/under/kamina = 3, diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index a6559ca8c673..051e5fce973f 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -386,6 +386,14 @@ /obj/item/clothing/head/helmet/kettle/eyes icon_state = "kettle_eyes" +//Dredd +/obj/item/clothing/head/helmet/aquiline + name = "aquiline enforcer helmet" + desc = "Prior to the Final War, issues with law enforcement on Old Earth became so bad that in many countries the police became little more than roving executioners. This striking helmet was designed to help law enforcement officers easily identify themselves in crowds." + icon = 'icons/clothing/uniform/costume/aquiline.dmi' + icon_state = "dredd" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + //More Warhammer Fun /obj/item/clothing/head/helmet/utilitarian name = "utilitarian military helmet" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index ed23d34b7149..8919fc88f18c 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -286,3 +286,10 @@ icon = 'icons/clothing/shoes/ballet.dmi' icon_state = "ballet" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + +/obj/item/clothing/shoes/socksandals + name = "socks and sandals" + desc = "These broken in leather sandals go great with a brand new pair of white socks. The ultimate in comfort for a wandering sightseer." + icon = 'icons/clothing/uniform/misc/tourist.dmi' + icon_state = "touristsandal" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 28f8ca0989fa..8b3bed2740c7 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -2356,3 +2356,10 @@ icon = 'icons/clothing/uniform/costume/darkcleric.dmi' icon_state = "darkcleric" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL + +/obj/item/clothing/under/tourist + name = "tourist liesurewear" + desc = "This loud shirt is made of mid-grade cashmere. This premier liesurewear pairs well with a nice pair of khaki shorts that stop uncomfortably above the knee." + icon = 'icons/clothing/uniform/misc/tourist.dmi' + icon_state = "tourist" + worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL diff --git a/code/modules/loadout/loadout_shoes.dm b/code/modules/loadout/loadout_shoes.dm index 134e1708e66f..a6225d362cfe 100644 --- a/code/modules/loadout/loadout_shoes.dm +++ b/code/modules/loadout/loadout_shoes.dm @@ -227,3 +227,7 @@ /datum/loadout_entry/shoes/ballet name = "Antheia Pointe Shoes" path = /obj/item/clothing/shoes/ballet + +/datum/loadout_entry/shoes/socksandals + name = "Sandals With Socks" + path = /obj/item/clothing/shoes/socksandals diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm index 790528e3528b..d10f97fa2cb2 100644 --- a/code/modules/loadout/loadout_uniform.dm +++ b/code/modules/loadout/loadout_uniform.dm @@ -917,6 +917,10 @@ Swimsuits name = "Antheia Tutu" path = /obj/item/clothing/under/ballet +/datum/loadout_entry/uniform/tourist + name = "Tourist Liesurewear" + path = /obj/item/clothing/under/tourist + //Tajaran wears /datum/loadout_entry/uniform/tajaran/summercloths_selection diff --git a/icons/clothing/uniform/costume/aquiline.dmi b/icons/clothing/uniform/costume/aquiline.dmi index 0872977608cf501245673fc3765363e8a4388080..49fdfbbc34a76837cfed1a8636431d487fe34d70 100644 GIT binary patch delta 873 zcmV-v1D5=O2J;6ciBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cPLU-v zGXn$(9V}WgLw#0p#fK9a%pD{U6DEL*pxf&6z`(%l^(*550004WQchCYDx3;^XGKy%m0?#KWD0?0{3K~!jg?U;dbqaYB5 z1q@5j(%6$U@BgH?3rU-+ESMP1n>qfOwu!&Gp9^eRyRNCJsc9)8QQ{%LbV*rKDs}f! z3H6YV-<6W`_U-%Q4=I&C-o=1N+h#!7<0O%nL5PUX3oP??QxlT?Wfz}ca5Pkj$ zLoIwdK2Aa$UYvvcB+dJq0dRU@jTr|n1E8@)n2H&2*8n>L00v|#s4Pnr z)~3ts8b6-#{32*-TA}`g+Td^1Y5Mr}0epnuPxT09KVeTY`I(I$RgK_0c`vNza7BCr~d@c16)-P;6h>nPS^O=hG6!gF=6Mx?4vmUU(w>#z+Vq9+19CgA?ZK~ zi2&Tjy;Nwn$EVhpeZ5dDG%o?5w?Et@C>5Gl04SjmfY~*b3e8IZaBEMydj=q1XkG!J za{#46^C|#qH*8$D1JK{yHm(wXd+S{RgmdGr06_2A=v~fk05(p-z2bLa8gh%U0sKDz zTN?Q7Y7KnT?keoN$?a>#FEsGA`}|-%T?FYkh%7ZDWWp^60<-^#B7h{QSwsk+ z^^xx9qCh(Xx+dU#66n-G1Yk8Okh+19z+pHmfEK*D3JrSm%K{qhD!pN8@Yyd zrUh6aI3-99#orD!~#4*m> P00000NkvXXu0mjfw%HvP diff --git a/icons/clothing/uniform/misc/tourist.dmi b/icons/clothing/uniform/misc/tourist.dmi new file mode 100644 index 0000000000000000000000000000000000000000..7ea32ba43832358bf6bc0d42ee698493cbdbcd07 GIT binary patch literal 1408 zcmV-`1%LX9P)0N|KAw@<_WrU|Nr6usdpp){{YVS4A9>I-TwpI$q<*J0GX8lreQ3Z!vKGJ0PwU6 z|Nj90{}9#x0C}t-u8#m+!#Ug5IpF0G-|ztP|2NK} zFQl~qWN;Ih);#~r9<{On;^P4S~ zIyx~iF(@b~ARr)SMIv-hCpI=VVm~E=S}IvN7*jeMvwA#?UoT!g8LN0gQ#TixVmDMc z7*shN%gM>==;;6d{}B-pn3R;RtgP(p>=(V_44A(bjAR{TZ#5zgz`($ejg2raE@EF_ z3kwUa**IhX0004WQchCV=-0C=2JR&a84_w-Y6 z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sU*L&D6_ak ziHkEOv#1y-V#vjrR+N~V3SpzGD^AQyNz5Tub$ntDl3EiYOva}}S;5uM1?))x8_z~* zqo|i&0008}NklangNSiw}9H>N@Q_^Y6aXPZh#7nfwm@4 zY}&M}hvkoUCP94h%h+({6g_j#>Ez*l%dhFvol26BkdTnjZ$;|1kaO#{?VS1}brE`k z{*IlycJJA{Z~uXVheGXV^;16*i6F?A>kl^^IeP5)iIb;Jp9!&_)$jQV!jRvHn$AX> z&z-*zyLjpHm8(_nXY~_bCF>P%eoO1M>o?+wwwt$Z-?@9Qy=nkfKlO23K?pv+vY+KM<&;W}f7D2u0D!!G zr&u!pm#8Qe>7yq5%jEl4T*p8^zu0ScS}h!_9?@t$>m!16aNR($6k?>7NJ@cjYr`vunhfm>Pw zDDer`tos9(`W2}{eJ%v7`vY;mAS5ItBqSsxBqSvCZ-|EXrJ#Z(FXM9rAlaD#!1v$# z+5;5XKLNiR79YTMmtlX|bvXl69Jf?nf$WuX$t5Km0sQd33fZe1!u?O&ok_;~=x;9o O0000 Date: Tue, 3 Oct 2023 19:30:31 -0700 Subject: [PATCH 2/2] Adds Dredd costume to Costume Loadout. --- code/modules/holidays/halloween_loadout.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/holidays/halloween_loadout.dm b/code/modules/holidays/halloween_loadout.dm index ac08942a4c2c..a7627336cafc 100644 --- a/code/modules/holidays/halloween_loadout.dm +++ b/code/modules/holidays/halloween_loadout.dm @@ -140,6 +140,10 @@ display_name = "Costume Head - Dark Cleric Circlet" path = /obj/item/clothing/head/darkcleric +/datum/loadout_entry/seasonal/halloween/costumes/head/aquiline + display_name = "Costume Head - Aquiline Enforcer" + path = /obj/item/clothing/head/helmet/aquiline + // Mask /datum/loadout_entry/seasonal/halloween/costumes/mask name = "Costume Mask - Fake Moustache" @@ -432,6 +436,10 @@ display_name = "Costume Uniform - Dark Cleric Armor" path = /obj/item/clothing/under/darkcleric +/datum/loadout_entry/seasonal/halloween/costumes/under/aquiline + display_name = "Costume Uniform - Aquiline Enforcer" + path = /obj/item/clothing/under/aquiline_enforcer + // Gloves /datum/loadout_entry/seasonal/halloween/costumes/gloves