From 8fdcb2b6fde19d32e1c47ad13c9a7295ccdbb5d5 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 30 Apr 2023 11:41:01 -0400 Subject: [PATCH 01/11] additions of the css suit, helmet and power cell --- .../Clothing/Head/hardsuit-helmets.yml | 15 +++++ .../Clothing/OuterClothing/hardsuits.yml | 53 ++++++++++++++++++ .../Entities/Power/powercells.yml | 21 +++++++ .../Hardsuits/csssuit.rsi/equipped-HELMET.png | Bin 0 -> 456 bytes .../Head/Hardsuits/csssuit.rsi/icon.png | Bin 0 -> 459 bytes .../Hardsuits/csssuit.rsi/inhand-left.png | Bin 0 -> 257 bytes .../Hardsuits/csssuit.rsi/inhand-right.png | Bin 0 -> 262 bytes .../Head/Hardsuits/csssuit.rsi/meta.json | 26 +++++++++ .../csssuit.rsi/equipped-body-light.png | Bin 0 -> 1292 bytes .../csssuit.rsi/equipped-body-unshaded.png | Bin 0 -> 227 bytes .../Hardsuits/csssuit.rsi/equipped-body.png | Bin 0 -> 2035 bytes .../Hardsuits/csssuit.rsi/icon.png | Bin 0 -> 766 bytes .../Hardsuits/csssuit.rsi/inhand-left.png | Bin 0 -> 741 bytes .../Hardsuits/csssuit.rsi/inhand-right.png | Bin 0 -> 649 bytes .../Hardsuits/csssuit.rsi/light-overlay.png | Bin 0 -> 380 bytes .../Hardsuits/csssuit.rsi/meta.json | 38 +++++++++++++ .../Objects/Power/cssCell.rsi/cssCell.png | Bin 0 -> 394 bytes .../Power/cssCell.rsi/cssCellUnshaded.png | Bin 0 -> 146 bytes .../Objects/Power/cssCell.rsi/meta.json | 17 ++++++ 19 files changed, 170 insertions(+) create mode 100644 Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/icon.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/inhand-left.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/inhand-right.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/meta.json create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body-light.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body-unshaded.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/icon.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/inhand-left.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/inhand-right.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/light-overlay.png create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json create mode 100644 Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/cssCell.png create mode 100644 Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/cssCellUnshaded.png create mode 100644 Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml index a56a569e77..f24eb8f9d6 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml @@ -54,3 +54,18 @@ Piercing: 0.95 Heat: 0.9 Radiation: 0.6 + +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHelmetHardsuitCSS + noSpawn: true + name: chief service supervisor's keeper helmet + description: An ingenious and simultaneously impossible, flexible, air-tight mesh helmet used for EVA. + components: + - type: Sprite + sprite: SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi + - type: Clothing + sprite: SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index 5fc5fa8df7..f04b4796f0 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -55,3 +55,56 @@ damageCoefficient: 0.8 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitHoP + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitHoP + name: chief service supervisor's nuclear firmsuit + description: A painfully saturated, nuclear powered, semi-softsuit made by the chief service supervisor after Nanotrasen denied their request for a proper hardsuit. Offers almost no protection from anything besides space. + components: + - type: Sprite + netsync: false + sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi + layers: + - state: icon + - state: light-overlay + visible: false + shader: unshaded + map: [ "light" ] + - type: ToggleableLightVisuals + spriteLayer: light + clothingVisuals: + body: + - state: equipped-body-light + shader: unshaded + - type: Clothing + clothingVisuals: + body: + - state: equipped-body + - state: equipped-body-unshaded + shader: unshaded + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellCSS + - type: PointLight + radius: 8 + energy: 1 + color: "#ff2034" + - type: PressureProtection + highPressureMultiplier: 0.4 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.9 + sprintModifier: 0.9 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.9 + Radiation: 0.70 + - type: ExplosionResistance + damageCoefficient: 0.95 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml b/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml new file mode 100644 index 0000000000..edc1887e1a --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml @@ -0,0 +1,21 @@ +- type: entity + name: css's nuclear cell + description: A tiny, self-sufficient, nuclear power cell. Intended for use in the CSS's jury rigged suit. It slowly recharges by itself. + id: PowerCellCSS + suffix: Full + parent: BasePowerCell + components: + - type: Sprite + sprite: SimpleStation14\Objects\Power\cssCell.rsi + layers: + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: cssCell + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: cssCellUnshaded + shader: unshaded + - type: Battery + maxCharge: 180 + startingCharge: 180 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 0.5 #takes about 6 minutes to charge itself back to full diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/equipped-HELMET.png b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..d7530d08b83075747c4af3d883fef32e8dffdc68 GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zn><|{Ln`LH zy|vfxP=dtKkM==6QZE>mXgY_-&Ye)9uXnF!a<}=Dte)}(+RVILcrKVcR4!F85t@D} zK(6=sb^(pImACg)vRNqnk6wJrGg0E%?6b=%-dpfJ{wd57Ein>(hJG{1BF@o%eiNu-PSt-9YYW^X>TehYI_eVKsV@6DUv zH3UDKE+^J}P@(YvI>eg55_rLP1B zpWH+L>E7L>oN$Z(hW>$7$_dx_8E*GARN6D-STjBQ%dp`s$BggH2ev6E+(VMsze=8A k+y9HJPx$g-Jv~R9J=Wm9b8PP!xv$S}-Bdfg-sKjMmjj8)sj`#g}n%@qu(T)ie41}W&^yCRf;!Fu9 zG64WpkNnLZ#Ky!xI9Ns*Y~MyMb9QP++#>ye4xpQpQ2oiRkzu+3U5MjH6L^UxaD@v< zuoH;=1!63e;a{HsH;H;p9Bcym8#u%_zy?te1S*K?VM3|a7ReOBZ3#M`&$|T?H3mUY znWm{s6h)y-w84pU!bIo4V_-X?+u$NsqtR&oEuUT|MbnR4YeN74002ovPDHLkV1m~@ B%8>v7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/inhand-left.png b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5faead9ff9da739cb6d46a8f23fc16faf126c639 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|c6+)whE&XX zd+RLcAp?fChv&C(G;Lp%(hwGNz;TYdBg@?5hAuHG|GubkTnh4MJ#VOabl-V~{GtxbEzF>HPe)XY}Uy^0hy8 zKZ$0g1nPNuy`Su7E*%%&V7Sb0lFR$2-iJ?nq(+{K`h8haaTdf>5c%tPWeU&Eo7+#m se6-N~x0&UCehx5?b;C_&28KV4{F#zLO8@g^H-Z#Px(#z{m$RCt{2T1#@%Koo4*ij$BJ*MMTd8CbC6BpkpiFTL^+I0qYwQ$Za6u~=w2 zYCVreqeQZxqOO{9DjL0h)AMHZ<^v2EFyJ*K0f0p|kExpi7`rm!yABzEBY;1y9AXSk zlUV~-yFps>JOMBPaN+7w1PYKKZ@da{aAgl*=bi--=zu5wX);^Z*%5oUb^H`RB*4U# zOXLDj1PU;cx<`}+*t@cIPV8cx5Aa6|0DuD2^7{lx09-j@7GD(D2=Mj3*54o^8Up-H za2v~S1xNr~I|o?kfQrB~H| zcO7s%#NPxrvHaSLI_56LkvFc~AP=ou0CxcHrQFH08+nHf(NM1H%^?3Gn}3OExvLk= z&j?76_pCahJ)nj-6gUrX{Oh>a=&1TaXeb8xr^)PROydDyn#{gCAwI|OGXgkSTu8Cb zus0Y9i~{yPd)|sQF?PwNsN`?bcq7Em7=HdSMloTeC_Cg6;>tZ6Ay;>ge3sRS(9dCN z?2q05i4gxwa8bw42pE|%hTka)agDs!@7?b;iXQiojXfL+FaI=|{dh_1-TOg)>qrtP z>Rjp?eD8j3f)uh7LX*0&2->s)WPxI{y)A&>?)TvS&pIJHAyn2~Wb?1}ZS~d*@^cP2 znxcyuojrFbX8!}qa{$xMgL#j(EQg|sUlFyy^3)6Rr&7r_)~2-j**l>4+#OMfvqd@o z-Wz+$W1aNzKVh28zQwfOQ!mJ$no4^q>}^eZwXs!sz!v!z!3x20(zpPB8wm1KfDEU- zZI`^-cpDLR9Y6s#@QY!`VikWI2=XflD=>^V$n)lvE04&Rq)Pw~$R|LS2YL1=@2tgv zx~1s}|00`z;KM~W{}j_&t>@kk^4pAz$qZ1Q{n@)sR)abmw1jZNzsTnAk>?k&`vJ>E zHvj1O*#VXORsgP+Z2s(9-^c6+Y*CJ=n9pE{KL*Pt{JwEUCm8k``WpVeU#-V?ITT_x zL+bcTSY-2ep7$H^hqlCY_Uv>|umQitL&g81`Rg`CGZZ1z`mS&UEWgEX&;OQ9_?v8t zw~l{dTfD7r?SG3wfW95*8-oCSJJ2@<0s3~JZwvzT?Lgmn^#b&o3U`UvH2c*@K;3Gv z4kMKB4cH@dU6$Id@IGxn;kg2gkRONfNQ?)M)=9lDuy&=+*)DCL;5hp~n z*@5m7^X%{u)!SQL+V-NU027=ZhpVI3NjkVfIg}qfj&^Cg5={gcp?q89&i&F^9+}fg z9+|ID>?Q%_t+V49Y_}$W@9GLKO3=|u=gc4EW0Ma0LiZBIeVs0CwjI6xhn`u65l*S1>|z;{nT$J`FZEX+_m zn0og9z&UKUCV-ya^5|=W@?D_~PRA*ar|e1b;Y_w$6F`rceBb3Qs%L6Fq0z(2bJ%W8 zfTJVQgHgRMQ}?Y_XIChHrny$sqx}_Im$nBC7%*VKfB^#r5Ptz(11S$J=6jR?0000H~s3rb|C=aQf77_vY6h+OhYS>0Yx9x4W6t`$+nJ{qBbKHdWs*?fM>6%*enHu*!OK WTkMVV43c|68a-Y8T-G@yGywo;Em~m! literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body.png new file mode 100644 index 0000000000000000000000000000000000000000..3560bd94e1163e6b59fbd7275dabe4b56a28d4c5 GIT binary patch literal 2035 zcmVPx+tw}^dRCt{2n?G;cNE*g}6o-mv$p&#J#um}8DP=9puSIsQLkWvR5*ya9k5{2n=ub7{RG2=LrLC2fA# z-I=z3=lDyd5&&TsCil~2dHF>aayj@t0w_PQSy(Fr(EsN#LI{*nRR12A9exOr&*Qr3 zj!c6z|H{e=Qc8|*4TuhOQpZ|?@*5Y=^JukNx%f+yD)d!1a$T450~>(D4@0`|`qb-n z0P6KR-FJNsKMaA`Nv`YCSKTO|sh9JYN+s+s;p2@Kp65}1O zbO6BdtpN*b6##TkQ-0&JzrT-Civ9h4%5PkBFCLMFwF<|#2DywJ2dy>wW{_O}w!Dky zc`UrI#eDB;c%H{^%ezS(@iz;t^|`h#!dM41o6RV^9bngNj(!NyJLfUwBpp(JS zHv@d%pU6Mf0cpd`-%?5d?tQn;F28W^yLAAhl!OiyFX=2;IF6HC4~N649N;hekue_PM9U;%>FH%+ zP5Qpp8rz=ifJ~EADTR*W`PA)p0Vs(QRkuoi&`-($bQA|HAw=@bG%&`S`5Xkn$nRMg z!_6Br2@^-hUyhfOz0RIx-iTVQ#{T|(Qm0<8)9dx<5Bf$<1GAow6JY z_3|{w5O*y&D$-Ihh$Wlo)#)Hucfuq|%8N{?@L8C&*m&Dqe+q~t8@pzY@Y^*Tu{1g9 zxv;&w4_x0_fgL#DG~ajswS>zO9Xf?Nkrkl|;YZNuk+S3G$yM$)b2%VX;Yjc^FlC|2 z-+{a^-~Ja}r}qdlx0k1~<2YEBg=JZZv7ri+vT>UwR|T`gO)ATZTnszVAmuh&cHOV`I}J zph5*JrRA0MX*&fGtV2P1W^5MdaO4e*~L z_|7rM9COSu#~gFa@xO-L`*)2-Bf4xy)^VJvw!!}h{@mY>hTL%+$`5S3Z>uZC2cNyu zPvV8O3UI&x@z6O@t75o|hck z8%;ubK=PD5Xp^I#Noclz5(p=Xq>x#+rdyp~+`#ZEh!gh96>`koh|gG6#!BqY-U9x}PXQ zww`SB{Oz-33Z%EoXSEun<4e6>k3~^6n+IQPjP&c-;}@Cxkjnw#?EwAb=*h6SYY}ai zu-4<4Fw65nb2e$$?1WRjjFP^DDvVWPue0X^xnqDa9%2E)wVx_bf#LR$5~TvERd(2x z4X=Ogr$d=zfYJV#4M=k&-R*W0eL$sBxe`slWzdlx5n~u$)0a@i z>XoWk%sdQ*5~0B$J{L44Ohs!4!T(T3~hPlO763+PB=bOM$WH=$leGt~y9 z;V=7ZM zxzdbq72JiDj0=m4 zY>J)DPXpVsv8>Z6Uql=M1!KV3bNE^70xrT?&LY|Xm?8)oJ%EAl`%#|n@S<32-Z*#s zeYP)oFx4uMCKf_)sCzTp3^6#=y=X)vIfd~sMG!Q(fa$=r{~M4MX`ZX#{4WJM8yE1I RX`}!E002ovPDHLkV1lvb^w0nR literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/icon.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..384cb7e1427e0933e164472e581c8eede0982b1f GIT binary patch literal 766 zcmVPx%xJg7oR9J=Wm9cKqKpe(@XP?ugsU-`=G?pTkibr558$(rZ?XN||Nh@+`@1_>;(v!|I$>jQ z8vvDlDICZ7WnGqKc%2({|92nH=GMuk;wt@80JQGgtZuXbNS;oSQlhn{`=I2$y)&q1 zW$mnyt7!BE`u%<(r6j*Mt-1U>=jK^}QVP%W_2LcjY+x`L6lOESUbC4ToBGYQ*6bea z@Z{4Gy9YaHt+{y?ke}yFjt%yjjoHi?3^B?4oWGcoS*lF4Q%gk zarEJk-GiN)OZUFg>-9J}e9psQpOeGq^m;wgy{~o6?!gX69}d~x-2|tkt(jyK#9f1R>R>jr%Qw1sE?!%#I4ejgNzw#c*mGCH!uvoa4rLyUHn?wHXv6sQ zvaa23!`n6^JwgkOl#*_z%XmDV+qcn1REg(Bxy(kR5dfC7=ytj!X;O2QX{}2W)tswX zI0I1_i6l*!WD}w=5|*@ZU6&vTu!YTdJjNC_K@i}&E|#>2!bnWA2}zm|g;C>e|DRxC zSN^(Rto!Q#gi%NoMq(b<)WE_SFxn8u@lSlk8Eu+s0}V3ZI1WMxgb=lu(Wd5pcQjv% zfjqxVaV0h@Iy-*t27KQy0JPCRh*j5$uj;PVfbaW-l(O8*O(|x~#V;_X6gTBrA*F0= w;*TLT#xR{uXNW7~7kT)hW{D-1SfT;G0|hu&;3{X@G5`Po07*qoM6N<$g3k|WEC2ui literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/inhand-left.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0de2aebef1c6b97dbb259a64cb676e20dbb63691 GIT binary patch literal 741 zcmVPx%pGibPRCt{2+ObOuW(p({?6;k>Q0$1x_pJVPAEC>>Q01VP?Wi?L6;1OQPKk(836 zD5BZvxxw=^_5P|zU7uF&XTZ$N4Bg(|VtjlYe~xEoXHUM*^E`507XVN$m!Xsb0BEhz z>2z|>oBMw z;oiFYlZBL$%)&hYpt|hBb`h)_Bl<=|ocO37*RZm=WIK(umCYqok82PoKJ<+q?aSA< z)@Yx0DQx+a+yfYGg8mMOqKLwlPy4h>>sxD98LS$2{;Hsfljo26|Lu0Wuom{;NGa*z z-GiSmuW|A5N9qjLp}oK(_Z8q&9Gri+80p6+!j?~TPtc!$&Ud@Z6ZXwf1DKwHI{0^e zOLagnJp&l~IWl#JOGlL~<+;e3A=3glj+1HiGc)%04-%OcAh`pOw*Q}pPx%LrFwIRCt{2+C6LAKo|$`|5<*G+hQV}UP1;#2xQO~=wc|H+D_TJWGL+#=#-Dq zrAvlvg%I)`LZOR?4w*{`cql~FV2-4wc6!p&!N^UlC~0Lkw&?R)9ym_oe-FnkcK~CI zF~%5Uj4{R-W9)w-CI{A5*P(v&sIgtga4$mTO#$kCAC20wIQ@DukBomM&Tq5;eIBCt z$UyiBsrd_&1ATolUcA;C!@UTN?K=AUg6?GnQ#v0iGFpIr;sF>{qcs}8X?~&smSv&8 zdkL*IcFx{HYmNTyB`nMO$I)lQaU2xdB`Bq^^yLARQYf@ba2)5)esD-n#2L_RHfb;zpjxeBvUWP1#Qa4gr6j{J006~e5n5{iKp2MT zcDsrEsS9#n%5lengXD*cZux0roWFOZQu8OyfLMK_hTxzp>KnCLXS)}bl`?uqN>o&_lgc_pS&%b;&%k|&XiTAi$8nQq^0AB*WM2VL6FN! z#LS_kBguFIh?2nBhi|!DJOC6ke;EPMFamwde2grFsnQqPrCH^eo2eQggaD#hMVXJO j8W6uB$lLn?#(w(+nAp#h9BWqh00000NkvXXu0mjf2@ESM literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/light-overlay.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/light-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..9e5aab19cfd68162a6753ccb88f4e6906b2e058a GIT binary patch literal 380 zcmV-?0fYXDP)Px$Hc3Q5R9J=WmC0^{KoCS9i-*U)j=8%7jWNg584pfPTAQ?C$mno^#mNng7 z)5`z}|BUR}fv?Bs+}|azlP!Q;u^zx3xB(r|%8u}!eT)LF!45bA2VgH2qHz-&@d{id zX7(maaROe%C}Jl8uE0&nV)8vu1Lv&*PCzAVMiFHY&`pwCV6Ipr5laN@mFzeXQqfn# zB69lvJ9*7e85qw-vqpdi&OJXcwBnVa8l{3?!Y!S&m2abSs|0w$^T0yBr36*L8}Lov z1}7>eevUJ`-80-7*2{D$JNj~GvR$y9&P6}RStY>x9M>uiRZHLRxf!VS+rGcvg(U(S z`o6}bUbidHx8N*Z#3saEyoPf_<^5jr4!9bd-vNtoU?>06mkPx$L`g(JR9J=WmCs57Q51*2{?IDBgu$p}v=bMKkpwMdT4+M6-oR~d&@=QH(F0VQ zpry2E<03K_?n1@ug;5wcf-Rb@&|O=O^nfuA`MBTOkmuJv0CvkS740(R9`yw7@x<0&hH2SY}{w? zPui>{wx`yI-DlKgh5=8aJh1>kx>o%712^EO>x#@7=d?uzmMs oL)``0Tz=+VAZ>23SS){nSGA^Rdh5wS761SM07*qoM6N<$f+YR2)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/cssCellUnshaded.png b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/cssCellUnshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..f0e389c12c835cfd81e47cae990351a01f66d555 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArY-_ zFK*;Lpuod$P`!BK)(JBdgpwWI68SF~F#7$xzOypg$YYWU>y*&qNKdTE*ayere`JmoxJE6I5O@8?p=hU@m^K9%wFur>mdKI;Vst0IN_gwg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json new file mode 100644 index 0000000000..c478fb19b9 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Cabbage#9633", + "states": [ + { + "name": "cssCell" + }, + { + "name": "cssCellUnshaded" + } + ] +} From 2bb7b2f1a85cf346412d900ebded29bfab9687e6 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 30 Apr 2023 11:53:16 -0400 Subject: [PATCH 02/11] fixed meta --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- .../Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index f04b4796f0..be7241e77e 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -58,7 +58,7 @@ - type: entity parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitHoP + id: ClothingOuterHardsuitCSS name: chief service supervisor's nuclear firmsuit description: A painfully saturated, nuclear powered, semi-softsuit made by the chief service supervisor after Nanotrasen denied their request for a proper hardsuit. Offers almost no protection from anything besides space. components: diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json index 58fda01dbd..5e1d54d0f0 100644 --- a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json @@ -11,8 +11,7 @@ "name": "icon" }, { - "name": "light-overlay", - "directions": 4 + "name": "light-overlay" }, { "name": "equipped-body", From 27c52adfd28059039af1ee94a4ee8b2bd63bd205 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 30 Apr 2023 11:56:24 -0400 Subject: [PATCH 03/11] unimportant minor change to hardsuit.yml for testing --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index be7241e77e..b5d0b0cc01 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -63,7 +63,6 @@ description: A painfully saturated, nuclear powered, semi-softsuit made by the chief service supervisor after Nanotrasen denied their request for a proper hardsuit. Offers almost no protection from anything besides space. components: - type: Sprite - netsync: false sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi layers: - state: icon @@ -71,6 +70,8 @@ visible: false shader: unshaded map: [ "light" ] + - type: HandheldLight + addPrefix: false - type: ToggleableLightVisuals spriteLayer: light clothingVisuals: From 97032cc7ca9bd51075ecb0a33fc1ad1997fe5999 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 30 Apr 2023 12:06:02 -0400 Subject: [PATCH 04/11] changes for testing --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index b5d0b0cc01..320d8800f4 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -70,6 +70,8 @@ visible: false shader: unshaded map: [ "light" ] + - type: Clothing + sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi - type: HandheldLight addPrefix: false - type: ToggleableLightVisuals From 7c4fa368264e1e096f4cdf12c2bed11415ab9b39 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 30 Apr 2023 12:09:58 -0400 Subject: [PATCH 05/11] reverted it cuz it wouldnt let me do the revert function properly --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index 320d8800f4..b5d0b0cc01 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -70,8 +70,6 @@ visible: false shader: unshaded map: [ "light" ] - - type: Clothing - sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi - type: HandheldLight addPrefix: false - type: ToggleableLightVisuals From 4365bbf88ae33942b4f0cddc17507aa3d4d0b2b7 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Thu, 11 May 2023 00:29:02 -0400 Subject: [PATCH 06/11] fixed the parent and hopefull it will work now --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index b5d0b0cc01..4e5d3f83a2 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -57,7 +57,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitHoP - type: entity - parent: ClothingOuterHardsuitBase + parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitCSS name: chief service supervisor's nuclear firmsuit description: A painfully saturated, nuclear powered, semi-softsuit made by the chief service supervisor after Nanotrasen denied their request for a proper hardsuit. Offers almost no protection from anything besides space. From 5c7ff6841c260e6c7db85e44fae73b96f72fcf40 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Thu, 11 May 2023 01:12:44 -0400 Subject: [PATCH 07/11] testing --- .../Clothing/OuterClothing/hardsuits.yml | 37 ++++++++++++++++-- .../Entities/Power/powercells.yml | 2 +- .../Objects/Power/cssCell.rsi/meta.json | 2 +- .../{cssCellUnshaded.png => o2.png} | Bin 4 files changed, 36 insertions(+), 5 deletions(-) rename Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/{cssCellUnshaded.png => o2.png} (100%) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index 4e5d3f83a2..7014a7e08b 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -70,8 +70,6 @@ visible: false shader: unshaded map: [ "light" ] - - type: HandheldLight - addPrefix: false - type: ToggleableLightVisuals spriteLayer: light clothingVisuals: @@ -89,9 +87,42 @@ cell_slot: name: power-cell-slot-component-slot-name-default startingItem: PowerCellCSS + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot {} - type: PointLight + netsync: false + enabled: false radius: 8 - energy: 1 + energy: 2 + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + - type: Appearance + - type: HandheldLight + addPrefix: true + blinkingBehaviourId: blinking + radiatingBehaviourId: radiating + - type: LightBehaviour + behaviours: + - !type:FadeBehaviour + id: radiating + interpolate: Linear + maxDuration: 2.0 + startValue: 3.0 + endValue: 2.0 + isLooped: true + property: Radius + enabled: false + reverseWhenFinished: true + - !type:PulseBehaviour + id: blinking + interpolate: Nearest + maxDuration: 1.0 + minValue: 0.1 + maxValue: 2.0 + isLooped: true + property: Radius + enabled: false color: "#ff2034" - type: PressureProtection highPressureMultiplier: 0.4 diff --git a/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml b/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml index edc1887e1a..e7ceba2318 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Power/powercells.yml @@ -11,7 +11,7 @@ - map: [ "enum.PowerCellVisualLayers.Base" ] state: cssCell - map: [ "enum.PowerCellVisualLayers.Unshaded" ] - state: cssCellUnshaded + state: o2 shader: unshaded - type: Battery maxCharge: 180 diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json index c478fb19b9..e08cef52fb 100644 --- a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json @@ -11,7 +11,7 @@ "name": "cssCell" }, { - "name": "cssCellUnshaded" + "name": "o2" } ] } diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/cssCellUnshaded.png b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/o2.png similarity index 100% rename from Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/cssCellUnshaded.png rename to Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/o2.png From f99a45b7eff4afa4739c357f7d6d142ae5a80642 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Thu, 11 May 2023 10:50:54 -0400 Subject: [PATCH 08/11] eugh --- .../Entities/Clothing/Head/hardsuit-helmets.yml | 4 ++-- .../Entities/Clothing/OuterClothing/hardsuits.yml | 9 +++++++-- .../Hardsuits/csssuit.rsi/icon-unshaded.png | Bin 0 -> 162 bytes .../OuterClothing/Hardsuits/csssuit.rsi/meta.json | 3 +++ .../Objects/Power/cssCell.rsi/meta.json | 3 +++ .../Objects/Power/cssCell.rsi/o1.png | Bin 0 -> 146 bytes 6 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/icon-unshaded.png create mode 100644 Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/o1.png diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml index f24eb8f9d6..5cbe7d6494 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/Head/hardsuit-helmets.yml @@ -56,9 +56,9 @@ Radiation: 0.6 - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetHardsuitCSS - noSpawn: true + noSpawn: false name: chief service supervisor's keeper helmet description: An ingenious and simultaneously impossible, flexible, air-tight mesh helmet used for EVA. components: diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index 7014a7e08b..b4ed534a19 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -63,9 +63,12 @@ description: A painfully saturated, nuclear powered, semi-softsuit made by the chief service supervisor after Nanotrasen denied their request for a proper hardsuit. Offers almost no protection from anything besides space. components: - type: Sprite + netsync: false sprite: SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi layers: - state: icon + - state: icon-unshaded + shader: unshaded - state: light-overlay visible: false shader: unshaded @@ -73,15 +76,17 @@ - type: ToggleableLightVisuals spriteLayer: light clothingVisuals: - body: + outerclothing: - state: equipped-body-light shader: unshaded - type: Clothing clothingVisuals: - body: + outerclothing: - state: equipped-body - state: equipped-body-unshaded shader: unshaded + - type: PowerCellSlot + cellSlotId: cell_slot - type: ItemSlots slots: cell_slot: diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/icon-unshaded.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/icon-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..1fe04e31fbd0023fe387b2987e76411b56f5e8cc GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}F`h1tArY-_ zFK*;*P!MT(c-WF7Ir4_!w?_vfiC(BvQO(yT5@BIa5L%78ouPgg&e IbxsLQ0HIwv{r~^~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json index 5e1d54d0f0..cfc86fd337 100644 --- a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon-unshaded" + }, { "name": "light-overlay" }, diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json index e08cef52fb..a486e8c744 100644 --- a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "cssCell" }, + { + "name": "o1" + }, { "name": "o2" } diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/o1.png b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/o1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d21d12ddfcce1564faf0b62a089a02140f239a4 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}KAtX)ArY-_ zFCOGxq&lB8x3-<|ur smOrjZE82FGnc>9s8T;2%G^%*&D;^XG+5JVt9%wFur>mdKI;Vst03Dw(NdN!< literal 0 HcmV?d00001 From 727efb2424d58f653461d5a9215f9620b92b4f0a Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 28 May 2023 10:13:45 -0400 Subject: [PATCH 09/11] updated metadata --- .../Clothing/Head/Hardsuits/csssuit.rsi/meta.json | 2 +- .../Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json | 2 +- .../SimpleStation14/Objects/Power/cssCell.rsi/meta.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/meta.json index a0785494e7..0f1848f970 100644 --- a/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Clothing/Head/Hardsuits/csssuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Cabbage#9633", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json index cfc86fd337..e38073fd55 100644 --- a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Cabbage#9633", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json index a486e8c744..018584514d 100644 --- a/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Power/cssCell.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by Cabbage#9633", + "copyright": "Made by DSC@Cabbage#9633 (561159087765848084)", "states": [ { "name": "cssCell" From be48055e42320552eb71a406c3457a679e0e215f Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 28 May 2023 10:22:44 -0400 Subject: [PATCH 10/11] renamed files and state for better clarification --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 6 +++--- ...y-light.png => equipped-outerclothing-light.png} | Bin ...aded.png => equipped-outerclothing-unshaded.png} | Bin ...equipped-body.png => equipped-outerclothing.png} | Bin .../OuterClothing/Hardsuits/csssuit.rsi/meta.json | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) rename Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/{equipped-body-light.png => equipped-outerclothing-light.png} (100%) rename Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/{equipped-body-unshaded.png => equipped-outerclothing-unshaded.png} (100%) rename Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/{equipped-body.png => equipped-outerclothing.png} (100%) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index b4ed534a19..957fdeaa0d 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -77,13 +77,13 @@ spriteLayer: light clothingVisuals: outerclothing: - - state: equipped-body-light + - state: equipped-outerclothing-light shader: unshaded - type: Clothing clothingVisuals: outerclothing: - - state: equipped-body - - state: equipped-body-unshaded + - state: equipped-outerclothing + - state: equipped-outerclothing-unshaded shader: unshaded - type: PowerCellSlot cellSlotId: cell_slot diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body-light.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-outerclothing-light.png similarity index 100% rename from Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body-light.png rename to Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-outerclothing-light.png diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body-unshaded.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-outerclothing-unshaded.png similarity index 100% rename from Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body-unshaded.png rename to Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-outerclothing-unshaded.png diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body.png b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-outerclothing.png similarity index 100% rename from Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-body.png rename to Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/equipped-outerclothing.png diff --git a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json index e38073fd55..b0a6bb7bf4 100644 --- a/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Clothing/OuterClothing/Hardsuits/csssuit.rsi/meta.json @@ -17,15 +17,15 @@ "name": "light-overlay" }, { - "name": "equipped-body", + "name": "equipped-outerclothing", "directions": 4 }, { - "name": "equipped-body-light", + "name": "equipped-outerclothing-light", "directions": 4 }, { - "name": "equipped-body-unshaded", + "name": "equipped-outerclothing-unshaded", "directions": 4 }, { From fc67efe59c80bea0f1c589238fc957642f1e4d22 Mon Sep 17 00:00:00 2001 From: Cabbage Date: Sun, 28 May 2023 10:34:43 -0400 Subject: [PATCH 11/11] light more --- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml index 957fdeaa0d..8b3076e28f 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Clothing/OuterClothing/hardsuits.yml @@ -99,7 +99,7 @@ netsync: false enabled: false radius: 8 - energy: 2 + energy: 8 mask: /Textures/Effects/LightMasks/cone.png autoRot: true - type: Appearance