From 9753c80958eeb8f1f7b684fbcff00c22288eac29 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 24 Apr 2020 23:43:52 +0200 Subject: [PATCH] Mop sprites and wet floor sign. --- Resources/Prototypes/Entities/janitor.yml | 35 +++++++++++++++--- .../Janitorial/mop.rsi/inhand-left.png | Bin 0 -> 439 bytes .../Janitorial/mop.rsi/inhand-right.png | Bin 0 -> 450 bytes .../Objects/Janitorial/mop.rsi/meta.json | 1 + .../Objects/Janitorial/{ => mop.rsi}/mop.png | Bin .../Janitorial/wet_floor_sign.rsi/caution.png | Bin 0 -> 234 bytes .../wet_floor_sign.rsi/inhand-left.png | Bin 0 -> 347 bytes .../wet_floor_sign.rsi/inhand-right.png | Bin 0 -> 366 bytes .../Janitorial/wet_floor_sign.rsi/meta.json | 1 + 9 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Objects/Janitorial/mop.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Janitorial/mop.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Janitorial/mop.rsi/meta.json rename Resources/Textures/Objects/Janitorial/{ => mop.rsi}/mop.png (100%) create mode 100644 Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/caution.png create mode 100644 Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json diff --git a/Resources/Prototypes/Entities/janitor.yml b/Resources/Prototypes/Entities/janitor.yml index fbc1c0bf9a..0cc504dd1f 100644 --- a/Resources/Prototypes/Entities/janitor.yml +++ b/Resources/Prototypes/Entities/janitor.yml @@ -1,15 +1,21 @@ - type: entity parent: BaseItem - name: "Extra-Grip™ Mop" + name: mop id: MopItem description: A mop that can't be stopped, viscera cleanup detail awaits. components: - type: Sprite - texture: Objects/Janitorial/mop.png + sprite: Objects/Janitorial/mop.rsi + state: mop + - type: Icon - texture: Objects/Janitorial/mop.png + sprite: Objects/Janitorial/mop.rsi + state: mop + - type: Item Size: 10 + sprite: Objects/Janitorial/mop.rsi + - type: Mop - type: Solution maxVol: 10 @@ -49,9 +55,9 @@ - type: entity parent: BaseItem - name: Bucket + name: bucket id: Bucket - description: "It's a bucket." + description: "Dear God." components: - type: Clickable - type: Sprite @@ -75,3 +81,22 @@ mass: 5 Anchored: false - type: Sound + + +- type: entity + name: wet floor sign + id: WetFloorSign + parent: BaseItem + description: Caution! Wet Floor! + components: + - type: Sprite + sprite: Objects/Janitorial/wet_floor_sign.rsi + state: caution + + - type: Icon + sprite: Objects/Janitorial/wet_floor_sign.rsi + state: caution + + - type: Item + sprite: Objects/Janitorial/wet_floor_sign.rsi + diff --git a/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-left.png b/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..316a14c488795ce711241e3eb94e067808cffb7f GIT binary patch literal 439 zcmV;o0Z9IdP)R?tcH&-VIQ0m0QD_) z!hRyxW|VyhNC4#9jI`g2XfmEH4n~(xH$V3L?e8o(k7xpLeRaWb&yN0*@=w5cwy36)5df>rj^Utx_?L+80kU6%&LrSp+ZSyj@>Iv7XE9S^ZR>fG$P_f~Rm7B7TY6;? zkphbzt)CJ4>mH5pOo3JHR?i4U)OJ06^*HahuIWA>aB40f2d^0dw+C=M7mzM|S+ibx hkZFb>J=CTt_yRc$)hJaQtv~<(002ovPDHLkV1mnd!2|#R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-right.png b/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d38a5fc5b619d534d34aa1bc0f16fcbe89a80078 GIT binary patch literal 450 zcmV;z0X_bSP)b;@5JkTuE`XF&C?X9GBlbCfhF5=TfAgs2kW2u=}Agh*Jtwr9Mv z`meDpt#<#+|K7s803n1BLI@#*kT8qIW7)Na5Owrj#SGr<_p$SvqN*=-_k~!Ul@pM< z`+|y2FYXI5dMhQsi~E8%y(DS8eg8sL-52)&uisNEy1lwDRM8(yfLHg0M*6+GFI=kQ zYy!NyFVw0d7x#rwJ^v;k7x#rwJ;m|Mc((lQ)avEF_&eMup}Km<1E!M^*4qO`Ee?^&c^JX@C2$p`>&TIbXJ#(jN+5JCtc zgb<=nZhwk^%=E-CRz6dO^37-);Ixxu0z`Hw{kkFaj(GYu0pS^iO!wB$6|d~ sp>YFF&)-G(s^)ysNIAoorfQ|&8wP9DDDz$pF07*qoM6N<$f|A(E1poj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Janitorial/mop.rsi/meta.json new file mode 100644 index 0000000000..284a18f42c --- /dev/null +++ b/Resources/Textures/Objects/Janitorial/mop.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "mop", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Janitorial/mop.png b/Resources/Textures/Objects/Janitorial/mop.rsi/mop.png similarity index 100% rename from Resources/Textures/Objects/Janitorial/mop.png rename to Resources/Textures/Objects/Janitorial/mop.rsi/mop.png diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/caution.png b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/caution.png new file mode 100644 index 0000000000000000000000000000000000000000..fdd5c1d2cbbbe9684848a0f00a916594b857842e GIT binary patch literal 234 zcmVcrlDmg3=O0Fc9|NiHux`7X3Ce(o18_6JJ;Q^jnE9CjFVPayB|L+D39gkejeJ?AQ&3jGa40Ds3lp&JAnB^|6eiQ%(BYZYw)ly{uH@9y;-fy?Xv~$B8H4};002ovPDHLkV1iorlE?r6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-right.png b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..286dec22cd18ee027898194451cfc531f3449254 GIT binary patch literal 366 zcmV-!0g?WRP)+Ba~Oo*aOJ3vfAVN)7-$6*r)cl++Ojr?7@3tDUeb8I%eCCq;@k zmi2bD@fNcZ00000004mhq)7)}pEcO``C|9Gjqi`0np{S2K4zACP}jGTq~%J(_0^`a zvG=#l#F3{rW*>7dSMB%Yz3kZnNYcyGmn7-&;d1cqIaQX~=5TX+;oj>O;O_q8;Cj7o zCkgi#YO?#Kku+<@Pei5J-4!57pWzn&PHA?x0Fjn_swTTzfb^|tJ3|CD*|YBed%%35 z#`ew#Tc8v>I{*Lx000000KcrL^B4Kdz)y}gNB4DotFCVkdhU_BMV_P0(NyF!1D>h^ zL_Ra%DgFzX$Y%y}s#bs$`^-R2RRPXn$)~Cc5c$l2r}!N}-yJwhTeehXKsXChM*si- M07*qoM6N<$f|p68r2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json new file mode 100644 index 0000000000..3bbf803a8b --- /dev/null +++ b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "caution", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file