From f49d83ac8168784388991bb76eb121c6a24d8654 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Fri, 6 Sep 2024 23:04:31 -0400 Subject: [PATCH] Add justice helm (#31905) * Add justice helm * backslash moment * spinny light * remove power cell from recipe --- .../VendingMachines/Inventories/secdrobe.yml | 1 + .../Entities/Clothing/Head/helmets.yml | 88 ++++++++++++++++++ .../Entities/Objects/Power/lights.yml | 12 +++ .../Graphs/clothing/helmet_justice.yml | 25 +++++ .../Recipes/Construction/clothing.yml | 11 +++ Resources/Prototypes/tags.yml | 6 ++ .../Head/Helmets/justice.rsi/icon-light.png | Bin 0 -> 464 bytes .../Head/Helmets/justice.rsi/icon.png | Bin 0 -> 372 bytes .../Head/Helmets/justice.rsi/inhand-left.png | Bin 0 -> 1509 bytes .../Head/Helmets/justice.rsi/inhand-right.png | Bin 0 -> 1488 bytes .../Head/Helmets/justice.rsi/meta.json | 71 ++++++++++++++ .../justice.rsi/off-equipped-HELMET-vox.png | Bin 0 -> 829 bytes .../justice.rsi/off-equipped-HELMET.png | Bin 0 -> 724 bytes .../justice.rsi/on-equipped-HELMET.png | Bin 0 -> 353 bytes 14 files changed, 214 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/off-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/justice.rsi/on-equipped-HELMET.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 622dbf9561..f81f5854cb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -24,5 +24,6 @@ ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 + ClothingHeadHelmetJustice: 1 contrabandInventory: ClothingMaskClownSecurity: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index a6663b31ec..e8415c3801 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -22,6 +22,7 @@ - type: Tag tags: - WhitelistChameleon + - SecurityHelmet - type: HideLayerClothing slots: - HeadTop @@ -400,3 +401,90 @@ sprite: Clothing/Head/Helmets/podwars_helmet.rsi - type: Clothing sprite: Clothing/Head/Helmets/podwars_helmet.rsi + +#Justice Helmet +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetJustice + name: justice helm + description: Advanced security gear. Protects the station from ne'er-do-wells. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/justice.rsi + layers: + - state: icon + - state: icon-light + visible: false + shader: unshaded + map: [ "light" ] + - type: Appearance + - type: Clothing + sprite: Clothing/Head/Helmets/justice.rsi + equippedPrefix: off + - type: ItemToggle + predictable: false # issues between ToggleCellDraw and ItemToggleActiveSound + onUse: false + soundActivate: + path: /Audio/Items/flashlight_on.ogg + soundDeactivate: + path: /Audio/Items/flashlight_off.ogg + - type: ItemToggleActiveSound + activeSound: + path: /Audio/Effects/Vehicle/policesiren.ogg + params: + volume: -4 + - type: UseDelay + delay: 1.0 + - type: ToggleClothing + action: ActionToggleJusticeHelm + - type: ItemTogglePointLight + - type: ToggleableLightVisuals + clothingVisuals: + head: + - state: on-equipped-HELMET + shader: unshaded + - type: PointLight + enabled: false + radius: 1.4 + energy: 1.4 + color: red + netsync: false + mask: /Textures/Effects/LightMasks/double_cone.png + - type: RotatingLight + speed: 360 + - type: PowerCellSlot + cellSlotId: cell_slot + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellSmall + - type: PowerCellDraw + drawRate: 2 + - type: ToggleCellDraw + - type: Construction + graph: HelmetJustice + node: helmet + +- type: entity + parent: ClothingHeadHelmetJustice + id: ClothingHeadHelmetJusticeEmpty + suffix: Empty + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + +- type: entity + id: ActionToggleJusticeHelm + name: Toggle Justice Helm + description: Toggles the justice helm on and off. + components: + - type: InstantAction + useDelay: 1 + itemIconStyle: BigItem + event: !type:ToggleActionEvent \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index 3f7da1efab..22573669ed 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -126,6 +126,9 @@ lightEnergy: 1.0 lightRadius: 6 lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb - type: entity parent: BaseLightbulb @@ -141,6 +144,9 @@ lightSoftness: 1 BurningTemperature: 350 #LEDs are colder than incandescent bulbs PowerUse: 6 #LEDs are more power efficient than incandescent bulbs + - type: Tag + tags: + - LightBulb - type: entity parent: LightBulb @@ -154,6 +160,9 @@ lightEnergy: 0.3 # old incandescents just arent as bright lightRadius: 6 lightSoftness: 1.1 + - type: Tag + tags: + - LightBulb - type: entity suffix: Broken @@ -178,6 +187,9 @@ lightEnergy: 0.45 lightRadius: 1.5 lightSoftness: 3 + - type: Tag + tags: + - LightBulb - type: entity parent: BaseLightTube diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml new file mode 100644 index 0000000000..0ea6cf404f --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/helmet_justice.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: HelmetJustice + start: start + graph: + - node: start + edges: + - to: helmet + steps: + - tag: SecurityHelmet + name: security helmet + icon: + sprite: Clothing/Head/Helmets/security.rsi + state: icon + - material: Cable + amount: 2 + - material: Glass + amount: 1 + - tag: LightBulb + name: light bulb + icon: + sprite: Objects/Power/light_bulb.rsi + state: normal + doAfter: 5 + - node: helmet + entity: ClothingHeadHelmetJusticeEmpty \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 420f38aab8..dc4eb3d278 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -118,3 +118,14 @@ description: Can hold up to 15 arrows, and fits snug around your waist. icon: { sprite: Clothing/Belt/quiver.rsi, state: icon } objectType: Item + +- type: construction + name: justice helm + id: ClothingHeadHelmetJustice + graph: HelmetJustice + startNode: start + targetNode: helmet + category: construction-category-clothing + description: Advanced security gear. Protects the station from ne'er-do-wells. + icon: { sprite: Clothing/Head/Helmets/justice.rsi, state: icon } + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index d823f93d9d..7daf090b46 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -821,6 +821,9 @@ - type: Tag id: Lemon +- type: Tag + id: LightBulb + - type: Tag id: Lime @@ -1135,6 +1138,9 @@ - type: Tag id: SecBeltEquip +- type: Tag + id: SecurityHelmet + - type: Tag id: SecwayKeys diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/icon-light.png new file mode 100644 index 0000000000000000000000000000000000000000..13bd7c0da1bbff6c4c02f048c2d35e9d6ed4d1cd GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zyF6VSLn`LH zy|vNrP=E;AgZRtGS}z=(u!6Z~!|q~v#(NE|(+e^qA}W|?#`g9X+$g+ukx^oTxIu1_ zOopeaL`MI%gMZ?kb~qIOJKcDoK+nO&C8VRnp>bYE$gKJITv#f<7p2{7U^?uxaOKiz zruL@7Gp(NYtxL>0uXeNl(?zw?CBKm$E-}`P%TWRu{4u zw@QUIOuN})x!|k`%}H;)vVNTtsz*m8)Mp@IKAyO_5(=j2k6gVi+-GQVF2OEbK$ z%$gHzRv_pe|L*j)54A@&_P4#4-}i%E{janEd)d$J$G$tcAi)3op1i_+lC{rg@-QE} z`QSV6Q{L?_tgd@sH=ekBQK=8_3#;w3&!2bkvX-B4)>mHqthwm}$sPXJ&+QD7ny}}m zH$wzdGDF99{i)Rs$$Tr=8eb(WkZPMH8}e`I6N@tij4Rq6n%Q%3J)gagvHIEPrBVKB zANHJ>l5ZvdLHhI0RiAz9n?uh(Uwuwp2@0$n=YMnUs;XPx$E=fc|R9J=WlRZwuFcg5lqQ+_wO1J)OiP?aWTV&u0y#-?G0V=M*#>&JY7&-!q z_-WbNGG?Gr8tE}0N1!4UCsabhpA;$ai{JZfKZC>J`0q68OrC(4_v4zmDixPbM`Sn@ z8I9z#j1A2?60hqu&8tiD+^d{pr;b3^^T>0Lu2)^45@DbviXxdn@kCK1VW6##!Mbt6 zK#SfFX|-AaD5c1<41hFEnLf{$y-Z8zwGuGJ4MxHgH`qv6H({1#D5bc&z2Ar(9vu|B zQI<-#AdX{B&c++#*W**P)>gT!Z^7fk699YaW9rSt`Im1KFN<{(_Im>X@O__ld$$;0 zt=>qI1c1eIzMUrQ_Xe_9&KpMJJ50Q+M5P|ES>dno)2i$IyEXoVgu~%*l;Itq7;B6I SY;?c?0000h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2Xt=`Ln;{G&f4pD*g)WT?2+Rk5{!&Nnn6nprmgXr zSix0xE$_`59UmLU{sZT#U7A=k5?Ry|IAXe_PkYML#{{(3FVXmR^ZWO^`X@`&S@Z-L z7_p-dY8&h&p0yXwspgiDnS4>B-};i7O!j`4lgl%sJm zeHAx$^6{B=dY#zIw_sr6er?(H2lNAZ;Eko%g;S8c-{IW?X9=t>e*j+ z?n*Ph_V??~UbowF&&@BZRT#|KTY0Pe{{+_8#jm#>?JvddZ$x-B9#wG&P1)M8Yerz1 zh^XrMi~Sco3$JXIKQL7={Xc_s!@9}SH|+Q&c;gqd#)i$SXV2MPr!RbM{-*kdH;R8b za^e|O*R%hO|2*Men5&Xe;lW&pUMXfh)Kt-<Dnm{r-UW|9P$OA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/justice.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0dbc1447027e88afc12abe267380ad004d5bdce9 GIT binary patch literal 1488 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2XRX6vL!IaA+MB)U0!7ch*X%CrSLzGJART9z)#8vqxvtZ>x)S%l8jI`|Voaof|Rd zw_P@QTRCs~-InXq%|Cvzx%%tnqn(?AWw~Fgrt8`KKl}aGj%^pS|4erOJKx@)_1?Xu z$3CxfEb(2R9e0ACNr3?$+QzcW$T%Uo|Kprhy7!LGWQ73K`0A*+rEvf|%iEfUt`)CmGM=ihs#DdUyknDG>PqPY3#Yt1SiE2B8q2~i3z5Yl zo>}JS)7W-2EK6gnsGAk}KuRk5dG))W?{~GD%=M4t|N0<({U?XBZg$K8#ab=wz~FEE b@B4uJ%-yaP_RBM$gGy6RS3j3^P6Px%_en%SRCt{2n!j(;KorNnZX(B)gVKsfX?|ErJVbI==z#bmnAj)-VrA*d$e+N{ zfeEoO@Gr0+7G@%Ka4W?wsuToNw(PhK#}L~%A&u-iJEhY5NRbl1-21+Fd3TQdP68)i z02aT$4@kUzZd!j!B#3*BhRASXiqNm-9Wdw{^O--jaOV39*G^8Y(ksC<&AI+)l<3FT zMx#+~{agbEeS`J%E@WB8x3jb4db`s>7>2ONPN|b%nkH*Do7d`3CX?KgkgEc=Dt~>q zI~^#Bf*=T1+RH#w)wTL*dsZ?>Jm?#2t0F;B6v(oSN~Mz6X0sW>Fhmdp_&sB#RDo%l zOjA{;ng#%nWjV2hVF&>5JrADm=c2n-wW4;?|C>sKTlr1 z=i$P2x%6`_0Y$B?EicnFS>R7gTLQp*xdFiO@o}Ot91a!p2!bF8f*=TjAP9mW2;%lq$n*0} zo)susOXz$+noXV+C{jyk0tS79?M08H<6iwYs6eq8YP`tgG& zv0hK_3i$>EH$m5RVUHbb?=-Nz(?EDRU9cbSw+@7&Tj3+ToF;nq*nu0J3*d!&eWrKc z_?NIO3y$NI`ahuC?J~nK04!D>?Px%j!8s8RCt{2+Ru*CKpY3~?~18(Ie<6`3xxzqQZgLXz5570z{*LFUiLkF0x!n+ zAl|%q7Gkoj36u><7onk+G$G?*w`_}IoM|c1{5}auJCn|DX8JeG?+A)M10vjh3LL4n zbLjZ@l62xpv6$rW#L|ebGy$!qDF9&N`?3A3aL!}#!+jO^We;dIO<}fM=;;qOWoE4g z0OIo7aPPMQ=UmikHS{87wcGgpeqTDi)B&xgDe4Uanx+8&^7%Ygs}%qs2m*{pHugCQ zoO8h#+Zo?+9LP?B^c653**Grf&~+V)#R34}`#yenzHC#{3c3#9X0V#3#Rea(mmxI) z#|0hp`5dp`efqFn_vZQIvr?%f-2qv?=Rq$NHiM3qt4Q<~I6tktNOHU^ce#YST*CJ} zOsCV$&-c7d-QF37@!KcvuJSaURI0+VEMZwzELK={QmJP1HrgI+7K0D%8l>vrm7myc z^X@EM48LanB}fP%gb+dqA%qY@2q8p)^1r!<&JRed5C3$2KpK5WB|o6cx#%WXqn8zp zmo!HqmHdEuqY-Y3FA8h)GP<0LFkUoAKs84}IzOQFu!wTG3;@XGa+|vKdW|3maP2tQ z*Ccc~7msf91GZxWz-%_d{QE*GM?v}u0Pfc3*XuQ|CKHt=lwCVcY`=PQ=6_i(|658E z005K7z+b)p7|RzpKdq=X`$sRg;=JuWI}7{47*lFf=^;2C*vhrTbN~Rui%S65YmQQkVHhIJ3y3b2 zXC;iuITuONjQ#O55PI`a*Dep9&i|nBzg6E>wdY&s zCwlFAYybK0{b;>kGHvfwep<>zm5cw}U;lsawz%KtYyNM)#%ig^{D$LxJ9f0rws}!Se wZG(&QgS^+h4X)2mRnHIHzFrVTDMR&VZn-(#EIgStpulACboFyt=akR{0LO`h#sB~S literal 0 HcmV?d00001 -- 2.51.2