From d1eec14dd11cb210a5e722b8555a84ad2d31f31c Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Wed, 11 Dec 2024 22:23:01 -0600 Subject: [PATCH] Adds Old Detective Suits to Loadouts + Fixes Generic Bowman Headset Sprite (#3898) ## About The Pull Request Adds the hardworn and noir suits and jumpskirts to loadout. They're stripped of any negligible armour values they once held. Also fixes the generic bowman to have a sprite. ## Why It's Good For The Game They look better than the other suits. ## Changelog :cl: add: Added hardworn and noir suits and suitskirts to loadout. del: Removed the 10 melee armour from detective suits. fix: Generic Bowmans now have a sprite /:cl: --------- Co-authored-by: github-actions --- .../objects/items/devices/radio/headset.dm | 6 +++--- .../modules/client/loadout/loadout_uniform.dm | 16 ++++++++++++++++ code/modules/clothing/under/jobs/security.dm | 1 - icons/mob/clothing/ears.dmi | Bin 2612 -> 6763 bytes 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 9e4af7ac59a1..cc091b4edbce 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -314,7 +314,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/headset_com/alt name = "command bowman headset" desc = "An officer's headset. Protects ears from flashbangs." - icon_state = "com_headset_alt" + icon_state = "headset_alt" /obj/item/radio/headset/headset_com/alt/ComponentInitialize() . = ..() @@ -333,7 +333,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/heads/captain/alt name = "captain's bowman headset" desc = "Dresses the ears of independent ship captains across the frontier. Protects ears from flashbangs." - icon_state = "com_headset_alt" + icon_state = "headset_alt" /obj/item/radio/headset/heads/captain/alt/ComponentInitialize() . = ..() @@ -459,7 +459,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/heads/hos/alt name = "\proper the head of security's bowman headset" desc = "The headset of the man in charge of keeping order and protecting the innocent. Protects ears from flashbangs." - icon_state = "com_headset_alt" + icon_state = "headset_alt" /obj/item/radio/headset/heads/hos/ComponentInitialize() . = ..() diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm index 666aa8176e03..a042ab353070 100644 --- a/code/modules/client/loadout/loadout_uniform.dm +++ b/code/modules/client/loadout/loadout_uniform.dm @@ -176,6 +176,22 @@ display_name = "suit, checkered" path = /obj/item/clothing/under/suit/checkered +/datum/gear/uniform/suit/detective + display_name = "suit, hardworn" + path = /obj/item/clothing/under/rank/security/detective + +/datum/gear/uniform/suit/detective/skirt + display_name = "suitskirt, hardworn" + path = /obj/item/clothing/under/rank/security/detective/skirt + +/datum/gear/uniform/suit/detective/grey + display_name = "suit, noir" + path = /obj/item/clothing/under/rank/security/detective/grey + +/datum/gear/uniform/suit/detective/grey/skirt + display_name = "suitskirt, noir" + path = /obj/item/clothing/under/rank/security/detective/grey/skirt + // Dresses /datum/gear/uniform/dress subtype_path = /datum/gear/uniform/dress diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 46a1ff275d15..03f1cf19580f 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -55,7 +55,6 @@ desc = "Someone who wears this means business." icon_state = "detective" item_state = "det" - armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) strip_delay = 50 alt_covers_chest = TRUE sensor_mode = 3 diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi index e7376425f5455054e4b4d6e3480a6998ff3b787a..f973447b6f46ca08877cda91ad881a5a1d1b6ec3 100644 GIT binary patch literal 6763 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 literal 2612 zcmY*Z2{hZ;9uDnTTe=ukv|4IuZAHg2t%SC;wkj>PN72SsOfAunq%%{+^wFo$&e(fA zOKVHg&Zyy>O8W0c=5fS0#<%K{XQd3ji+}t`rAYWhKe}OZ*cc23TUl9o z`=y6OJ}@#gv@kPsJ$v?ygM*fqR+vHNUGG9`YipTIc1G9B#Kc54aZ^{-?7)EofH;=1 zOAury*M0J6tqJMcUii0X z?i7SZsk2RY;fLZ?M^oahO+_1NS1(_GtvoVNu_|%XrnMj^A&2tQ1eqscX1X>X6f@w+ z$YSDx;rr>dxZ=BO8gn+`a-Aox$#vSieR~S5Ssq`rsB)~7H(zqjBxd>hFnNpTeG4?~ zM{}O)rm8UK#K0a8zY`wEIaWZ6+8?1_#{JJ(~V=!Y5wH-XqsmZ z=<~GQ)D9RYrH|Kv5B>1;v3#$tTAnmp+BOAA&mQ}+()pXvQ;>@J0lC>u-{bf?`!Y+)4q@{m9U;XX);pn~7}TSX=G8+kt2L8^LcNr8vvbgBYDKTb%L1*x>L)FDG=yqY<*+@EOS^CR|zZ^Y`*s z9KnnTKZJ7VLU96r7Sb&i&ip3joAs;{ZlbvzZd-8=FQWFLrO6eAvu^8zZ98V~_v!G} ze>(<4rO%JT){-8HmutxzYI*}DPjwUKH#ZZLJ%`1s@s$n2zzlRYO>;bW|DW{oV=UpX zWHLMDpEtitic6&Dz_nAiL|kVP-+Kb#H^rqi-hM8fT^m0Q_(A{V5(ok^Ha|VD0bxGP zWgLtcN^B%^KjHydw5AS)NnG-{u)|RIbe;cdHA+%_r{h%@^hq^70Gd~@#1`*n5%{f= zYCcI~SEHAA;T4y#q{a{uM+Im}kgRXrB^`;%0?JFx-2a2Wtk=-1#BUMmQ2GpD2@El1 zOO-NDZ@(+YZ=FH%jWTb)5bFO92D<#N`)EI`+6s4Yts`;m8n8nvwGRVN1MfD}g7^+l z#ORjFICQVXRNK1doTNuJdQ9Yk(vI9hlP+TVkifRWr?m(0uYape1B;1D+i?UCbrU|Ed7O{-TGH7Hl->=P= z1-L`!->74|2=%mp2JHR#Dm$3LawZN#KNJVdW4WY+4zQ$UwM-NjU;oPUT5RWOW8^_? zHH}M7jh2=bHiBr8n9|$OcjTr)rf|-|4ybojMikIfm-vhI!tiuCvRwS-nL@vZkVq1V(Em7ub#q6RxZx_a1aL+s-+PJT{Ch|k{NA7( zy-X&$3j^(Rjxb{( z1Pw*yyDxaNysEg)KfihQ2Ss5?cpab6L9c^@-|p3UJWg}^4q`@W6qN9BCVh*&fEP>p z$gv73Vj3UsD!sX*bP7gCKvi=RMHq(Y1Tlr%>9nw7IeLVF%6k{Yaj2K&nXCE^X7|r)bYL z^)=D;UCgHp{HIW0EMVd4SazlufzAo3@Ejf<=JnSi zR>f274Q!eq-dBQWI_Zpkq?Cjp3`sF~JZyiOeKv