From d984259db680e3e401e796d0064e7bb731ae2bcd Mon Sep 17 00:00:00 2001 From: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Date: Sat, 19 Apr 2025 07:41:35 -0700 Subject: [PATCH] Removed Interior Shuttle Walls (#34261) * Removed Interior Shuttle Walls * Update migration.yml * Update walls.yml * Update girder.yml * Fix Migration --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- .../Entities/Structures/Walls/walls.yml | 46 ------------------ .../Construction/Graphs/structures/girder.yml | 33 ------------- .../Recipes/Construction/structures.yml | 18 ------- .../Walls/shuttleinterior.rsi/full.png | Bin 1746 -> 0 bytes .../Walls/shuttleinterior.rsi/meta.json | 46 ------------------ .../Walls/shuttleinterior.rsi/state0.png | Bin 881 -> 0 bytes .../Walls/shuttleinterior.rsi/state1.png | Bin 651 -> 0 bytes .../Walls/shuttleinterior.rsi/state2.png | Bin 881 -> 0 bytes .../Walls/shuttleinterior.rsi/state3.png | Bin 628 -> 0 bytes .../Walls/shuttleinterior.rsi/state4.png | Bin 627 -> 0 bytes .../Walls/shuttleinterior.rsi/state5.png | Bin 704 -> 0 bytes .../Walls/shuttleinterior.rsi/state6.png | Bin 704 -> 0 bytes .../Walls/shuttleinterior.rsi/state7.png | Bin 388 -> 0 bytes Resources/migration.yml | 9 ++-- 14 files changed, 6 insertions(+), 146 deletions(-) delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png delete mode 100644 Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 97823cec28..3c2f8c1de1 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -900,7 +900,6 @@ parent: BaseWall id: WallShuttle name: shuttle wall - suffix: Reinforced, Exterior components: - type: Damageable damageContainer: StructuralInorganic @@ -957,51 +956,6 @@ - type: Reflect reflectProb: 1 -- type: entity - parent: BaseWall - id: WallShuttleInterior - name: shuttle wall - suffix: Interior - components: - - type: RCDDeconstructable - cost: 6 - delay: 8 - fx: EffectRCDDeconstruct8 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 400 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - collection: MetalSlam - - trigger: - !type:DamageTrigger - damage: 200 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalSlam - - !type:ChangeConstructionNodeBehavior - node: girder - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Sprite - sprite: Structures/Walls/shuttleinterior.rsi - - type: Icon - sprite: Structures/Walls/shuttleinterior.rsi - - type: Construction - graph: Girder - node: shuttleInteriorWall - - type: IconSmooth - key: walls - base: state - - type: Reflect - reflectProb: 1 - - type: entity parent: BaseWall id: WallSolid diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml index 99525b653b..fb783e0da5 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml @@ -134,22 +134,6 @@ amount: 2 doAfter: 2 - - to: shuttleInteriorWall - completed: - - !type:SnapToGrid - southRotation: true - conditions: - - !type:EntityAnchored { } - steps: - - material: MetalRod - amount: 2 - doAfter: 1 - - tool: Screwing - doAfter: 1 - - material: Steel - amount: 2 - doAfter: 1 - - node: wall entity: WallSolid edges: @@ -256,23 +240,6 @@ - tool: Prying doAfter: 5 - - node: shuttleInteriorWall - entity: WallShuttleInterior - edges: - - to: girder - completed: - - !type:SpawnPrototype - prototype: SheetSteel1 - amount: 2 - - !type:SpawnPrototype - prototype: PartRodMetal1 - amount: 2 - steps: - - tool: Welding - doAfter: 10 - - tool: Screwing - doAfter: 1 - - node: reinforcedGirder entity: ReinforcedGirder edges: diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index 435524c854..7602a6cb11 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -232,24 +232,6 @@ conditions: - !type:TileNotBlocked -- type: construction - name: interior shuttle wall - id: InteriorShuttleWall - graph: Girder - startNode: start - targetNode: shuttleInteriorWall - category: construction-category-structures - description: Keeps the air in and the greytide out. - icon: - sprite: Structures/Walls/shuttleinterior.rsi - state: full - objectType: Structure - placementMode: SnapgridCenter - canRotate: false - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - - type: construction name: diagonal shuttle wall id: DiagonalShuttleWall diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png deleted file mode 100644 index f336d4c73bcece092dd4b3e83c11660e3a2f3ee9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1746 zcmV;@1}*uCP)6~n{BkW~_bf`VYSSfJHv;gkRkBsiT;I2;bBR4QmR8u82*Kl2#-&2G1g z-)gm5%y-H%WWHz({@vBp1)ihVxuU52=jrHTgZ#|SHq>7b-=&C%IkLfEfJ&=D zTU#3{Dk@-i+7J*B052~uSchz*Ub1IwoIzTxR$+v_;k&!LyO__B@?S(jg@&qCyBhlL0inVLgFg3uJQUKT;c7d3O;vsvdc*#a}I-M}Cq=$hq z2x1CFwjD>0)(E2=9UWM;@&%YorRePJgk)HlEXTyeAR}`fnwpx>-259-Q&Yv_PNxI@ zKAytpSRRagBYuz(zBmp1TLHv|`8~hu9$xCRbOT@S66(Xjs{hVw{aIFl9$5MwL59i|1P%P7xim*#Z}}28RzH zL3(;RjQNFvbJEqdKtW!?!#XeiS6o^QDh2TIawk$k09f+mGsxbw8Nau*j6{F|a0=>v`d*|! zl4NxE_KOG@DOckeradNb1bn?ciNKObLDFMOMG6D}<^TiO`R+SZ9?#*$loe#pi9fn~ z1P8Wm**YHk*i*4ba3H|<5n4xu6Sb!hZ%D+>9dC{Rm`~dqW$j_DNw02FqKte+42>rEGx$~-iFM92&w~{va@jf(~nX7 z-rL01Vf2};=r`N2&A4qm_OaWv8=iVCy!1NST`nki<1M`O@~hZaS%qe*yb}*#!c#Ee zB%JVVIN^ope^H7j^e~$6<2WIKN^xWaN=r@HfAE0NhAf{g7BgH)$yn|30|kjvrN#;p zey4~SokqgY--5)`b3~A=&mcjPXGBXARl=ks5+tD^FwwDj@X#ToXRH-c%8O*Sklu7I zjBP*^-N$#uD66CUNiu>jBv~IRXkO=ogNKo^ZXJwt%y+bsBx4fJoH-Mlvp10>Z$x`X zD^{;wE%cs52ly0k_fc;YA*x6&1=zi!l)YCXaJzSqI<675eC*gU1P6s8cGfH*N?H0# ziHo0-{rvr5+-5{=Z7qUAf^nncI#SbKN9gpatStW_zeUSNz&JX5SHgWiSx#=F_4+MT zA32J^py}u!iJp>@0@H32x>%NngvH89Nl9oWg_@OpT_2JH)JEG&^@u0@!=kxV&qjV~3#>dB_s=NxJAt9)%tApqb+2mmx@lqjhX8a zMgnMXIWHzz0$^8v|C;{p>61q+9azF^8gW1f0Fd&vYE?~4 zP3j(7w`>mm`|m$~`Oo(5*v`^{CA^*hK>4#5O6tqPg6i$-(^oXyw`%nK){Sc{9azHa z0l?1P2Ufj8L6t^Is`6~cSN`;wQ>trIhxHZh?Hw!~Si;uP#pqxHu((*&UmnU+vw`3Y z0Jq0)st5NUHYpziKb6mQvOXe9IL-iVeaHd`fU(hw>gVreo0$LHDFEKgy;DPjhqQ78 z0;~e9R{N$ruiL*rTs)%hPYe}VACV;-`!hv!G%X+u04R?rfrdzd_M-A!UsKNmYyeyu zxuTUvq-fQg2LLWG`)XD;03btT@7y{+{rmRlpNP_qj@?nkql2nEUe>caH=pN*Vm1%R00^-Fnz%r5 zO$(Twd8vAO3hr9~05CH<|umc5(-U}a@F z(gMuoEhvx7&M6*X1Ar16QXbsEDJp#V>UC`awhav0?7$U~0#V|_{Jg5yzq08#Cm&$H z{OzaDz6-?J&N@GQ&R^Ye0)VJwDC)~Vd9>7902VcqnBY>Q(bPQyAnkL2coz^q35pMc z;)#$A0OzT&_+%&v08XaE;ul1S2Z&t~3nN0br!QtvG?)*FUltd?F(Q6z3@(xF4olb` zPqG-&s&BAXICTXQ830TKg2mEei=;r9!YV~Yl*vT_Ai7X8E0z7bpD4OmT2#3_lofqo zLiCXtDwY;|XiDs{IXXEi_TXf8boSrranXmT&3x*AAD{mNS_f)wlOvt^00000NkvXX Hu0mjflUj{* diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png deleted file mode 100644 index 3041fa3daf8ab5adf7c2a638d55da8e43f6791bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 651 zcmV;60(AX}P)< z7+_#(;rO2tC!9X9pOF&%6ltc!Vwm2rsAP%)VAZm@6#0Q7&D02hV`neJ13+3zoG2ro zK6?pQXJxEQksm11Oq6R0C@QaR1_yw)o*qfYUA=S(tiH3gmLfk;q?sfa<52wb=U0ld z06RN3MSh@2^JoB2Ap{;ie??IWke3vrC=w~sOa=cljQ9Y6Rf9hMe(>;w6>zu$7`ecV z3-_le5-HM5jT8W@20;$_56TQs7lHX83y{RH**D~?!4cmO8V!Jv-V`290i!8ki1!8u zItf!+6;s>}7!7~{&cmZAfWion#Aj60+1CYn`$O%kJJ2T|iiL8g>EU;+hM)-gR zDc#sD8#jU7LFuUOfCs=p4`_@A0EHnyaTXZpQC$lC4;z0W-=X7`}giKP&&Uq z8UPfA0L6tMt}+0W0`AEHm=*i zkd>2;kp)If3K$K5(G)P61xCw&(L!*v78t?R;Am4AOJ86_^#-w}fMFK^6!u0LKm#g@ zN=gi%-Xo~x*i=^pHuA;0uVDJ%q2uu0BR0Dzomio`J3JZy6ovqD3IJu9@Bo*QnF2sV zXQ1Sc9stv(%!Ci24eKm08UUjyU^EMimI0%M;Akx{S`Cgighp&j5H^)Iq5}Y1ZxA$v l2AgRf)=gnt-C003XIWHzz0$^8v|C;{p>61q+9azF^8gW1f0Fd&vYE?~4 zP3j(7w`>mm`|m$~`Oo(5*v`^{CA^*hK>4#5O6tqPg6i$-(^oXyw`%nK){Sc{9azHa z0l?1P2Ufj8L6t^Is`6~cSN`;wQ>trIhxHZh?Hw!~Si;uP#pqxHu((*&UmnU+vw`3Y z0Jq0)st5NUHYpziKb6mQvOXe9IL-iVeaHd`fU(hw>gVreo0$LHDFEKgy;DPjhqQ78 z0;~e9R{N$ruiL*rTs)%hPYe}VACV;-`!hv!G%X+u04R?rfrdzd_M-A!UsKNmYyeyu zxuTUvq-fQg2LLWG`)XD;03btT@7y{+{rmRlpNP_qj@?nkql2nEUe>caH=pN*Vm1%R00^-Fnz%r5 zO$(Twd8vAO3hr9~05CH<|umc5(-U}a@F z(gMuoEhvx7&M6*X1Ar16QXbsEDJp#V>UC`awhav0?7$U~0#V|_{Jg5yzq08#Cm&$H z{OzaDz6-?J&N@GQ&R^Ye0)VJwDC)~Vd9>7902VcqnBY>Q(bPQyAnkL2coz^q35pMc z;)#$A0OzT&_+%&v08XaE;ul1S2Z&t~3nN0br!QtvG?)*FUltd?F(Q6z3@(xF4olb` zPqG-&s&BAXICTXQ830TKg2mEei=;r9!YV~Yl*vT_Ai7X8E0z7bpD4OmT2#3_lofqo zLiCXtDwY;|XiDs{IXXEi_TXf8boSrranXmT&3x*AAD{mNS_f)wlOvt^00000NkvXX Hu0mjflUj{* diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png deleted file mode 100644 index 1263f7a1badc82ace2097096bfeef82eb9bfde68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n2LP)< z7+_#(;rO2tC!9X9pOF&%6ltc!Vwm2rsAP%)VAZm@6#0Q7&D02hV`neJ13+3zoG2ro zK6?pQXJxEQksm11Oq6R0C@QaR1_yw)o*qfYUA=S(tiH3gmLfk;q?sfa<52wb=U0ld z06RN3MSh@2^JoB2Ap{;ie??IWke3vrC=w~sOa=cljQ9Y6Rf9hMe(>;w6>zu$7`ecV z3-_le5-HM5jTC@f4U%KtkgoCN;w-ReH?>VAq-z(7xJ4R`>I_=eCxPj3&}6i`rHz%ZeA z0z-FiJJ^j9Lfl}wuBnf~KPUh!cmLi!21@7mM+1Pu5TLja#8n1>Qox-%_ZaN$EKyRx z$_;xMR8*8kMhd_c0H8oAEv_8?SzyEmz{YhO7_xHGF|xpjNdcn)Fq#5Jv%qK>Fj@$X z)&e8A8XRp3W9bWwsNNv96fo=pfWqD=186`+QAvpb)O!TA9GmKjz(&4!_Z3VZJaio1 zd&FiJr4uU@cZWvkWdY&|ovo!@4Pqt2<2V0002qQI%igt5B~1 O0000< z7+_#(;rL%sNr|DLxPW2fx(y6Xbwywoy?FN(OqUi{g5@UkPQdEYRmhO%{rZBGF;E3r94A}q(i%R~Fty>IB()M>fNC?g-297U^D=5qyX4d*RXF1f@X9;>H-iH}TThQ9cU--639P=ewU%NxkYq8MVu~&Q`SUA9WdJ)nH^puk4FC#4 zfa1`9`1}<`DL`IQjAA!X;C}{+Eg$g#uxRB*cnW|OY`9_sxuD##aT8eCu&M^hNs2?h z8pJg*LTq3R`4li3061obMpFQhAuyT+C|vDLWH{qgMsYh}#Fqh-#=t-aAjK(QGyo_J zfzcE&z}4tz7N9T%Q>=Z&X946fMRG!u($3VN$pSw9esKSj(yfjQ_ov7Y6lo?W#?bW) z^nl7}08k?qDKTT9N0kRW1&sIr80d+W0Z#z~J+(IA0WjhlLIXX$4geW*m0wPP08sz{ N002ovPDHLkV1len0ptJx diff --git a/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png b/Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png deleted file mode 100644 index 430bab8398bf04435db77a64a4786cfa6442d08f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmV;x0zdtUP)Y5ZzQM(piXBCX!A}W2J@u0WqC|g^h(E7QrAQVv2}}NF;>_7B&`wb`k%87FyXv z?1Irsv9L>#D)J5|T*4)}bHFpRvrTee+`hLnZ|7!qBPQfFzqs5;B;sZ)l`_xevdQPx zogRIB)y&E9si{_9O(vT$#X`}ur&kwe5e@{_!<-k>vzyzy4g3et!@|CEdT1clBml%D zlcRD8IKM14Zc5i?Ha+KnpP8O);q~_JK{f%ffYr4X1EADE0?eOAALqroK)qgTz~9k8 z0)Z#r?*<;%`d$M-0Er%c-NM%kya)o`-aj1zegj?v0W=Gc4nXn!j69Ln_bz}qfM$T8 z;6+%#{o_;91%iycC<|zr_yZn@aDjlBTW(hZ`u$q~BB&O?U_f0UY!?XIgc-);Jj%`o zC;=ghm|6gn0d)Z;fkrhTpavkr>uysM<7_MB3?lpGK`em4S1K<~pOFmZ1~MG*e>x4i z!BgH39XQzAVGja_1oq4QSO9@XW;cKN?`Q3s^6L5IK-w>KRLl}om2}@3*aqx z58Va09SGZn*czY&Fd0w_2v}Tg=bJl=s0%PHnEkl*E})C0ZC@^L{e}tax6D|-Y0CO- mbJlO1)UC6&Z=Mc&`}{Y=WkFx@XB{N~0000< z7+_#(;rL%sNr|DLxPW2fx(y6Xbwywoy?FN(OqUf`g5~;qCt!8ys%3K-De(eDnklgu zrk9ui$Oi_%gpm*cckbL{2oG>UNdX5B9cNHcQ3M9S#NnL+x_jFhK%T`6fMX1*D$2t@ z3*ZX?6<`1i`z(Mf0H#iv$q*0}FmeN6+T@uG{=xnuw+xsDO##Ec8pM?arcIf_;2#t? zg0lcH1^5R7%YeRN-Vnl<0s??3V8mvD5nl_8m;eBEcyKp`m4<&Ih^sdU=?jeH05}K? z0M$Vp0AW$d|FLz`U`g8E&JrvwA;b-)>zew2^*W?!d;i`&hSMkZ4``R1V#`MZfW#EA za>E{Yo*woo05rsvm6MK=1wa7+$`+--p{~&Y817}jXbKq30;6TXXdyUS3ykDy5Y)Rv zZwim7cED%=;79?m?(MK|34(fjps~IY+Z!Aa0RWobrevCY*p3Gf8z_`6a3IzmTr(6nqAbOsh+@mjtDC_ApslAzk~^+mx&&6=*;-4n z8%VMkO)ow09dqg zBRmDb3N~CZf?QB;*|-U;Y*@i*I zL;66)>9c+mj>ixneJo|3Zs^S$>D02V0WoegvVu)rod05Kpe z&^rVVAwZUbPJw`F_Z?sk*gFFZLc8w(6ohsT!J4T1p907Nn~K79CyHoOQ&CMgYdjiW zPuJz?$LsO_=F1SHIB#LPktX-h_h}UXdDsrX6xRY!0T}=VEJ9ESf_r*@h_bYUWdK!B z2FL&zkiDzDx{vPj)WSlLDkubnpb!*-gd ze|nPcGY1%iOoBWLQxCRIl6V(T0H}Z+(0G^70