From 542817807dbcf2b482623b776811a2c9eee0d0cb Mon Sep 17 00:00:00 2001 From: TakoDragon <69509841+BackeTako@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:35:48 +0200 Subject: [PATCH] Red circuit floor (#32557) * red circuit added * index colour begone --- Resources/Locale/en-US/tiles/tiles.ftl | 1 + .../Entities/Objects/Misc/tiles.yml | 24 ++++++++++++++++++ .../Entities/Structures/Machines/lathe.yml | 1 + Resources/Prototypes/Recipes/Lathes/misc.yml | 7 +++++ .../Prototypes/Stacks/floor_tile_stacks.yml | 6 +++++ Resources/Prototypes/Tiles/floors.yml | 12 +++++++++ .../Textures/Objects/Tiles/tile.rsi/meta.json | 11 ++++++++ .../Tiles/tile.rsi/rcircuit-inhand-left.png | Bin 0 -> 384 bytes .../Tiles/tile.rsi/rcircuit-inhand-right.png | Bin 0 -> 401 bytes .../Objects/Tiles/tile.rsi/rcircuit.png | Bin 0 -> 429 bytes Resources/Textures/Tiles/attributions.yml | 2 +- Resources/Textures/Tiles/blue_circuit.png | Bin 360 -> 769 bytes Resources/Textures/Tiles/green_circuit.png | Bin 360 -> 846 bytes Resources/Textures/Tiles/red_circuit.png | Bin 0 -> 774 bytes 14 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png create mode 100644 Resources/Textures/Objects/Tiles/tile.rsi/rcircuit.png create mode 100644 Resources/Textures/Tiles/red_circuit.png diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl index 35cea19f78..b520235614 100644 --- a/Resources/Locale/en-US/tiles/tiles.ftl +++ b/Resources/Locale/en-US/tiles/tiles.ftl @@ -90,6 +90,7 @@ tiles-reinforced-glass-floor = reinforced glass floor tiles-metal-foam = metal foam floor tiles-green-circuit-floor = green circuit floor tiles-blue-circuit-floor = blue circuit floor +tiles-red-circuit-floor = red circuit floor tiles-snow = snow tiles-snow-plating = snowed plating tiles-snow-dug = dug snow diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index 1e5f2573fd..9032268958 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -1286,6 +1286,22 @@ - type: Stack stackType: FloorTileBCircuit +- type: entity + name: red circuit floor + parent: FloorTileItemBase + id: FloorTileItemRCircuit + components: + - type: Sprite + state: rcircuit + - type: Item + heldPrefix: rcircuit + - type: FloorTile + outputs: + - Plating + - FloorRedCircuit + - type: Stack + stackType: FloorTileRCircuit + # Circuits stacks - type: entity @@ -1304,6 +1320,14 @@ - type: Stack count: 4 +- type: entity + parent: FloorTileItemRCircuit + id: FloorTileItemRCircuit4 + suffix: 4 + components: + - type: Stack + count: 4 + # Terrain - type: entity name: grass tile diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 666550cd8a..846441cb39 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -442,6 +442,7 @@ - UniformPrinterMachineCircuitboard - FloorGreenCircuit - FloorBlueCircuit + - FloorRedCircuit - MicrowaveMachineCircuitboard - ReagentGrinderMachineCircuitboard - ElectricGrillMachineCircuitboard diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml index 0f043df9f8..a0e74fc34e 100644 --- a/Resources/Prototypes/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/Recipes/Lathes/misc.yml @@ -199,6 +199,13 @@ materials: Steel: 100 +- type: latheRecipe + id: FloorRedCircuit + result: FloorTileItemRCircuit4 + completetime: 2 + materials: + Steel: 100 + - type: latheRecipe id: HandheldStationMap result: HandheldStationMapEmpty diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml index de03fcba19..65fd672e1a 100644 --- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml +++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml @@ -538,6 +538,12 @@ spawn: FloorTileItemBCircuit maxCount: 30 +- type: stack + id: FloorTileRCircuit + name: red-circuit floor + spawn: FloorTileItemRCircuit + maxCount: 30 + - type: stack id: FloorTileGrass name: grass floor tile diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 2d552cc33e..c98ee6d582 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1422,6 +1422,18 @@ itemDrop: FloorTileItemBCircuit heatCapacity: 10000 +- type: tile + id: FloorRedCircuit + name: tiles-red-circuit-floor + sprite: /Textures/Tiles/red_circuit.png + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepHull + itemDrop: FloorTileItemRCircuit + heatCapacity: 10000 + # Terrain - type: tile id: FloorAsphalt diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json index 7db50200ed..7562d0f9b1 100644 --- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json +++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json @@ -159,6 +159,9 @@ { "name": "bcircuit" }, + { + "name": "rcircuit" + }, { "name": "carpet-black" }, @@ -472,6 +475,14 @@ "name": "gold-inhand-left", "directions": 4 }, + { + "name": "rcircuit-inhand-right", + "directions": 4 + }, + { + "name": "rcircuit-inhand-left", + "directions": 4 + }, { "name": "reinforced-inhand-right", "directions": 4 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..06a279199c033322d0941b5ead62a4d0ac598670 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ztvp>ELn`LH zy=9np$U&s#q5G8C3pB1rxIAuBn$E!Ga@2A~0M{gA6(_GQlfW9*=^Pg)7VC&kbWPlF z{q&7<|EEs-Ya_LG%UNS)pt%eT2mW7LU7av%Sz4Oe%)Y-bZ=U|O^-I0ezVdUif8WK< zJb3-ooX;mUHr^}~H%Z@iH`2&Ur}$ia-R@bpxM%nruiHN(x_;-TvjqYs+V<-8O0Pto zvV57YeOv$8w=aJ$cUZbE64@Zh_wSH-qTj^d63+Gf?A3KO2EYGg9hswaF^^I8r|tzc zkp+AU+!$XmWRc9c_KWGjlT}Eiq4O*Y)~=eD3M$=d#Wzp$Py>W20RF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/rcircuit-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..44703f72f7df667297f0d6785f773c677b4baba8 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zy**tVLn`LH zy=9wq*g=5xf#(O`p2yieg^Lfl>Luz!jyp%h-aXs=;p^|0A1!y~uQ0p))%3r6sQc&pQQ|j4 zx2CN2@mqE9mbr=g)d_2jZibe=j@#U@>_qA=`xAvbe_VVqA$QyB54Ppfn;TyKQ}CU5 z`tR-PbjIHgPUeag#OSRP_wH2xekAIT&HSf{cEXjFZ*^kiZFVm9KfXz4_ZgO@t1g;; z7L#BWYv5}*#&m)4LIi^q!>pf5SJ+?M@8Vx<#7%h1cZfO)}2h7tx76lGG}4(txe zj4v26K#Ig3|`Px$XGugsR9J=WRy$6^KoEVPR8FYHmyRAKfnBp0H3(>buyuTyD<_xw-iAokkdNW z6`pQy6g#cQx;ncDoE^H(v)NTgx&=0bTt#mWl-+Q#{UOhM$NLGmzR;HeI0TE}?SW!f zpzH=^Op>MIlO#)Fll?;A%z#OV(xycUH8b~zS7DR=m@7LW1n3$Xuhy{_QkbH`wA?;{Uo9TODCMQ)s2fIUk{_`H`11J?s|M%HHyOsv5YcSV z#&9-h2cG-=JU`!Lf#=Q!ZI%x_SN)UWly++(GRgih-(--+UJ|&RpM24iwixqal$Nl7 zh~m6pER0(5iht&t3|evs?CSUib8%j`-{sk%8x` ztvP1K@3bH)k5N0ud6DGDo)}8E*!Gc#Spz|~-EzaMN<+ga4Wrb~#!Ha@m2A{zpfoAq)Jx}4eCH`QF(RP zH`?ubJRP7mtu$E?S2E`UVn9`a)G=Tzsu@Ut$SWJoUn~F|#v&(eHR*k|q~y)*6J0$l+kwJ2UKnw(xGQJxb9uU>eJt=s>qWyr({{Jf(t?f&4i8xR-j9Stl zA~Wlzv&fB)%ExZ3qUv7u@};63Jvwv^py5!t+9*}SaLR;))_UjOgbW5hP++iqIC2JsW$c-Z2hZ-0k=WT&0ME8`c>Wo# r?wP|&05_G*kLriseRId>Kl1nia=KE49-V9C00000NkvXXu0mjfDD<45 diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png index 1628c20ae775e19e5302c426977026e22dd425d0..0638d7bde5c123877451a89155723f532bd9f837 100644 GIT binary patch delta 835 zcmV-J1HAm`0?r1I7=H)?0002|8116~0004VQb$4nuFf3k0009BNkl1atYFbuo) z=`K=67M_LK*>C>W`S|GrMhaE|E>Lxm&P=l|R`w3NGeX@BsycfKOdb>I0*FWPsP z4#<?6r}xikV51~GC2~)HFYa(m2M&XCPf9Zu+q10{&b1$Np%evt- zg;A5UV*rRc;Iy`6rUAuis#u8JLOi9vWz#)NLUe4>EBm=zs_ImY19s|2XGe!U(azPQ z+14ftjNTx@8WwORb1vw3C}yc-IKYSjV=)*c~ZqjSauS1NnsUM7;a%A#2v5QGD@SF77ZomA- zAMZKRRwOP3W0>ma{HXvmb(<%iong2fgBOUcq4}WzJRXn08bF>5^-UK|h@_IYiV@K8 zl00`YL}!+kwJ2UKnw(xGQJxb9uU>eJt=s>qWyr({{Jf(t?f&4i8xR-j9Stl zA~Wlzv&fB)%ExZ3qUv7u@};63Jvwv^py5!t+9*}SaLR;))_UjOgbW5hP++iqIC2JsW$c-Z2hZ-0k=WT&0ME8`c>Wo# r?wP|&05_G*kLriseRId>Kl1nia=KE49-V9C00000NkvXXu0mjf!b_RY diff --git a/Resources/Textures/Tiles/red_circuit.png b/Resources/Textures/Tiles/red_circuit.png new file mode 100644 index 0000000000000000000000000000000000000000..44e33bdee31b020f23aa1faaf34c5a65ba79accc GIT binary patch literal 774 zcmV+h1Nr=kP)Px%z)3_wR7i={R=tkeKoI^wu0X<=&gf*(08JvLf{>RmmY>6+@N-Zgo&%kDi9o1M z$~^$GxTC`uDc4?#!Q)}p5E3axMk{N^JF`3gvz1=IiyWMmgDa38Qm5stSDVkH0g+OQ zNrkUh8;h`7t!_6PkBjBC3xd$!zwQZNuQoyG^VZ{H8H9dzJkbe+zwCCjYtcQEI3k)6 z0JG_w$k}x6bv(Xc5=R~|o6ecv>v+jF@j4#kz{A_yPXOrkyIX6GMouG#u!^(kJlQ4} zI?)BhR0_mBi6a?Rw)Jtbq>JeUc{HDCIW0#rX%FPaWyg~wrCUt<=z2=%YI;anBk7hK zW|bNmgnkhEW;PZ<{!=iumPavC1&|$2bRmaGxyb8ycC#VLNgR>ZG9FZ?D##W97AA)> zu9PL8O5K%1$g$_-&h@jLmct!FhJh_D@+Yt4AoNvim6N4H)%1|c_^5AoJkjDl0bu{S z=R{HtVS`w$$}l(l9^h_zKY!)@e)hkDe{MlFJ*2f-y;iHcZFjxe48IKJ*KNDBt0alp zZMzDgMN-6B1zLf(w9A|GU>y46(7!ew zig`dVi6fQ%+NOLS$g(nJ6=_i&0KjE$fYEKtN-n8KqpcMdn7sk2vE&wTC6lH!qN()E zKwh*8sf%g`a^Pgglk5$pZMDP#QYU{CT>Lb}r1#a9;=OB9>@5j@# zdRWMpPxkbzB<0BDaZ)k|d;KouvP@w!!TFst91VC&v8n1Q>L5Fwg3vcJ4A*0D1K1jx z9~OX@-41wwNELc$LL`-ZRh$*de-;TQo>g2l|NlJr1%`q<>F8&d?f?J)07*qoM6N<$ Ef&mt6G5`Po literal 0 HcmV?d00001 -- 2.51.2