From 3103e60c3fcb1449cf2a66bdede7d092e0580171 Mon Sep 17 00:00:00 2001 From: Swept Date: Wed, 21 Oct 2020 20:01:28 +0000 Subject: [PATCH] Fixes icons on consoles (#2351) --- .../Prototypes/Catalog/LatheRecipes/sheet.yml | 8 +++++-- .../{ => Catalog/Research}/technologies.yml | 4 +++- .../Prototypes/Catalog/cargo_products.yml | 20 +++++++++++++----- .../Entities/Constructible/Power/research.yml | 2 -- .../Objects/Materials/materials.rsi/meta.json | 8 ------- .../Materials/materials.rsi/sheet_glass.png | Bin 781 -> 0 bytes .../Materials/materials.rsi/sheet_metal.png | Bin 883 -> 0 bytes .../Objects/Materials/sheets.rsi/meta.json | 4 ++++ .../Materials/sheets.rsi/researchicon.png | Bin 0 -> 879 bytes .../Objects/Tools/cables.rsi/coilall-30.png | Bin 0 -> 499 bytes .../Objects/Tools/cables.rsi/meta.json | 9 ++++++++ 11 files changed, 37 insertions(+), 18 deletions(-) rename Resources/Prototypes/{ => Catalog/Research}/technologies.yml (96%) delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/sheet_glass.png delete mode 100644 Resources/Textures/Objects/Materials/materials.rsi/sheet_metal.png create mode 100644 Resources/Textures/Objects/Materials/sheets.rsi/researchicon.png create mode 100644 Resources/Textures/Objects/Tools/cables.rsi/coilall-30.png diff --git a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml index 90916bc1c8..229280a581 100644 --- a/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml +++ b/Resources/Prototypes/Catalog/LatheRecipes/sheet.yml @@ -1,6 +1,8 @@ - type: latheRecipe id: MetalStack - icon: Objects/Materials/sheets.rsi/metal.png + icon: + sprite: Objects/Materials/sheets.rsi + state: metal result: SteelSheet1 completetime: 500 materials: @@ -8,7 +10,9 @@ - type: latheRecipe id: GlassStack - icon: Objects/Materials/sheets.rsi/glass.png + icon: + sprite: Objects/Materials/sheets.rsi + state: glass result: GlassSheet1 completetime: 500 materials: diff --git a/Resources/Prototypes/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml similarity index 96% rename from Resources/Prototypes/technologies.yml rename to Resources/Prototypes/Catalog/Research/technologies.yml index 561b730b83..776649dc4e 100644 --- a/Resources/Prototypes/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -47,7 +47,9 @@ name: material sheet printing id: Sheets description: Print those sheets! - icon: Objects/Materials/materials.rsi/sheet_metal.png + icon: + sprite: Objects/Materials/sheets.rsi + state: researchicon requiredPoints: 250 requiredTechnologies: - IndustrialEngineering diff --git a/Resources/Prototypes/Catalog/cargo_products.yml b/Resources/Prototypes/Catalog/cargo_products.yml index 6a0c13c19a..010bc232e3 100644 --- a/Resources/Prototypes/Catalog/cargo_products.yml +++ b/Resources/Prototypes/Catalog/cargo_products.yml @@ -14,7 +14,9 @@ name: "medkit" id: cargo.Medkit description: "Everything you need to patch someone up." - icon: Objects/Specific/Medical/medkit_r.png + icon: + sprite: Objects/Specific/Medical/medical.rsi + state: medkit_r product: Medkit cost: 200 category: Medical @@ -48,7 +50,9 @@ name: "fire extinguisher" id: cargo.fireextinguisher description: "Puts out fires. Or propels you in space." - icon: Objects/Misc/fire_extinguisher.png + icon: + sprite: Objects/Misc/fire_extinguisher.rsi + state: fire_extinguisher_closed product: CrateFireExtinguisher cost: 300 category: Other @@ -94,7 +98,9 @@ name: "fuel tank" id: cargo.fueltank description: "Movable fuel tank for welders. No boom boom." - icon: Constructible/Misc/weldtank.png + icon: + sprite: Constructible/Misc/tanks.rsi + state: fueltank product: CrateFuelTank cost: 200 category: Engineering @@ -116,7 +122,9 @@ name: "glass crate" id: cargo.glass description: "50 sheets of glass." - icon: Objects/Materials/sheets.rsi/glass.png + icon: + sprite: Objects/Materials/sheets.rsi + state: glass product: CrateGlass cost: 50 category: Engineering @@ -126,7 +134,9 @@ name: "cable crate" id: cargo.cable description: "50 coils of cable." - icon: /Textures/Objects/Tools/cables.rsi/coil-30.png + icon: + sprite: Objects/Tools/cables.rsi + state: coilall-30 product: CrateCable cost: 50 category: Engineering diff --git a/Resources/Prototypes/Entities/Constructible/Power/research.yml b/Resources/Prototypes/Entities/Constructible/Power/research.yml index ce3dbbef53..1e36c8ae7e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/research.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/research.yml @@ -6,7 +6,6 @@ - type: Sprite sprite: Constructible/Power/server.rsi state: server - - type: Clickable - type: InteractionOutline - type: Physics @@ -30,7 +29,6 @@ - state: rndpointsource shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] - - type: Clickable - type: InteractionOutline - type: Physics diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index f5a8e0510a..65b920d118 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json @@ -94,14 +94,6 @@ { "name": "rods", "directions": 1 - }, - { - "name": "sheet_glass", - "directions": 1 - }, - { - "name": "sheet_metal", - "directions": 1 } ] } diff --git a/Resources/Textures/Objects/Materials/materials.rsi/sheet_glass.png b/Resources/Textures/Objects/Materials/materials.rsi/sheet_glass.png deleted file mode 100644 index 534d188b290bc4b2cde7e5f47ec5fcc783d3c183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 781 zcmV+o1M>WdP)h%2| zWt$yhnIC4L9AB0kUzZ(Wm>y%9A7q;#XPqBqoJftrM~lElioiyTz(|e3Nsq%IW}Qin z!ezAOWwqsIwdH5G=4iL(XSU{KwB<>T!yaUsaJ}hrzv^?p>TU_rU zea7#6#qWB=?s2~AaJ=bew&rNK=6S>JfywZg&+3-W>9FYNd&Tc+x#xh$@Po_oh0O7U z%kh`b>VC)XX}ITXy61w*@QBUvhRpGr(du`?>ukE{gUa!V&hebm>x0VhdBf}%SC2o0 zyI!&5cEat5&hdiE?s&uMbinCOl*buakwApKV6o(P!|r&)>ra-*8eEh@hrVL6T|#89%P$!!R>m(?tI1VaJ}eElErht?SIJdc*5&% zyy!@d!g|H;b;0W!UX~$gpGuF!X}RYcUX>$kqD+#;BW$4}YM>xzo*-tN9%Gv6cT%JP z0004WQchCxU^0~HXND&^s5r`6Tn)5{DrK_p|WuiqLN92$=IaEdaBB;<*BGL_DZ zWTQET5{M*KAGOBPc7A+dBEeAtkq7lcwwQP9$*Ji=5IrE8nVmCAR?%^sa%H|+Q$Vz^ zxI~t%qT@K_%1U+B1){a}4Z3WNm2KPJT&ZrkK-93k!*=7z{N7%E|KPB81R@g+dVFGK zQmNwU;n}$fA_WP#D4isem)Wc9f?onrpiW33a(vT$8*NJj@eV}y51bGhd(7qfbk6Vz zM9(jN&M4)a#~4HOzz?r4521P!e$zBJ{NnlT{ljOP-p?b&2mj3%EBG{cVc8P)00000 LNkvXXu0mjfgru3V diff --git a/Resources/Textures/Objects/Materials/materials.rsi/sheet_metal.png b/Resources/Textures/Objects/Materials/materials.rsi/sheet_metal.png deleted file mode 100644 index 999b6e2927c5e073ced4b4b28335b35a95861cca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 883 zcmV-(1C0EMP)h%3S zK0ZG`KR`f0K|w)7LqkMFL_9n^H8nLdGBPeME?ZeyUR_;aUS3~bUSVKhVqjonVPRok zUtU~XTv=IJSXfk3Qz0?Y-wq1Yin$3YHMg{X=i6;WMo@fT3AoiHVSnjgF0tO-)UEczA_^f{~7nkdBUz zjEr$^ZewC%jEahdgM)l~drM18ad2>nhlgcjV@F3vaBgmZetw9Dhk}5BiHL|gIyyT$ zJ6&8{aBXdMbaZ!ic64%bTv}Q*G&EXSS!ZQsX=rF;U|?BSS1T(kRa8`8U0q#UTO=eT zDk>@{C@3&6Ff%hVCnqNXSy0~q0004WQchCKYoFYN}e=I+%8_@oMSn=^Gdt8Jp;-nwptoD6kN)w6eCbwX=7y(RbA1;lNPfV zbQ-Ot`oVsHKqY2m zd26|->l>BF1{nL7NC{(xWL34Zf^3arZDd`&pR`~DW?VEjnF%>dHe0I7w@9`swY6g? zFz-+nZ8EFo;qBzMLJ7qJo4!2t@d_4Gy9$K7QEw~c!v1j({kKf$8|KQs@hyJaPQ}{v$GGMcYZeo@YnHI7bho2)S|q7a%71k;t(-<3tpjQ zG>+7vM;FTc;UBy)gU7SO52nta1gN!Ait^5TN3CGaId1J+1wd*=i&8})B|_*a!<^S< z%6c*2HBTKs4S-r$c^3S@(>a*!`3*p>Xw8JQ!sR7lctQ!$OY+#!3j%~QaMH1T<7QYg%$z*wkHR&-&( zeq2&ZXce;TeYdwe0Ne80pR-nLUhy^K^8n!r2}`=MZ^3Qd_J|1k2M40NMj(5i7^(cQ-ZHJ4Y;(#4SfSh|6P@BvfnLV_CPbCfqH|P5|OP&Tm8~B_JW=;sROE zkTNN)O{4wSKP&sfB8;N-kwHIcsh2ZHny-V5-jnS^taJl*zp&Cl>hzd+Rgx;LRUw0Rj8|fi0KL~0|#RN12$r_lIN62DG_6APYa%|;|fF*F0C6t z>HlVoD@u*TCOFqbX8^?ln#b5+>UC8>>IPtOe!(FlE)66tt>Fy9e2lTJ zSv7VBc;%PxKELGd_jmRJYx~$Rpf=>Bx!YcWZna1xN zEPJa6+X3~o019TB0;_l)Wu#2nneFZlQDJ~ryItUetB@Qly zg0!@tm_=KoZE1AOjz@j=6S_pld>^ z6R~761hO2pjI^GHkV)AU(VBf~uJt|yXXSkxc)8cj<-`(Qi>2yhxdEV1_%;b?)3qYT z0MY=eW>}(1ItJx>j~TG=Wq^re_Rlv>I6I9@l^6}739JMuwjmi0fh^f=!ae$3Dk9`6 zpZ*PC*;lt$p!?SI-!1eOYhPcj++-O=I(PK11#&!L(vk)eSE&&>7Xbv(6qkkK8JgF`Bcq- z>xa(Y#}G3`VJ7O1mCJ)spT{%LkcH^XTOQbeThtvZmFi}rF|cNylBXj_#e-x&)4*@A p`6pz2!)v1hL4`RS4u?YlfFHtu!}ADQ56S=l002ovPDHLkV1ib{;*9_R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/cables.rsi/meta.json b/Resources/Textures/Objects/Tools/cables.rsi/meta.json index c1e9348602..c5724138d5 100644 --- a/Resources/Textures/Objects/Tools/cables.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/cables.rsi/meta.json @@ -222,6 +222,15 @@ 1 ] ] + }, + { + "name": "coilall-30", + "directions": 1, + "delays": [ + [ + 1 + ] + ] } ] }