From b2b8021d9b22cd6dc28529082c0e32930a485c09 Mon Sep 17 00:00:00 2001 From: py01 <60152240+collinlunn@users.noreply.github.com> Date: Sun, 16 Feb 2020 17:16:06 -0600 Subject: [PATCH] =?UTF-8?q?Adds=20rsi=20sprites=20for=20bureaucracy=20item?= =?UTF-8?q?s,=20fixes=20pen=20and=20paper=20spri=E2=80=A6=20(#711)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Paper/PaperComponent.cs | 4 +-- Resources/Prototypes/Entities/items/paper.yml | 26 ++++++++---------- .../Textures/Objects/Misc/bureaucracy.dmi | Bin 15020 -> 0 bytes .../Misc/bureaucracy.rsi/chestdrawer-open.png | Bin 0 -> 549 bytes .../Misc/bureaucracy.rsi/chestdrawer.png | Bin 0 -> 353 bytes .../Misc/bureaucracy.rsi/clipboard.png | Bin 0 -> 144 bytes .../Misc/bureaucracy.rsi/clipboard_over.png | Bin 0 -> 126 bytes .../Misc/bureaucracy.rsi/clipboard_pen.png | Bin 0 -> 141 bytes .../Misc/bureaucracy.rsi/envelope_closed.png | Bin 0 -> 168 bytes .../Misc/bureaucracy.rsi/envelope_open.png | Bin 0 -> 219 bytes .../bureaucracy.rsi/envelope_open_overlay.png | Bin 0 -> 173 bytes .../Misc/bureaucracy.rsi/envelope_torn.png | Bin 0 -> 211 bytes .../bureaucracy.rsi/envelope_torn_overlay.png | Bin 0 -> 192 bytes .../bureaucracy.rsi/filingcabinet-open.png | Bin 0 -> 579 bytes .../Misc/bureaucracy.rsi/filingcabinet.png | Bin 0 -> 393 bytes .../Objects/Misc/bureaucracy.rsi/folder.png | Bin 0 -> 260 bytes .../Misc/bureaucracy.rsi/folder_blue.png | Bin 0 -> 261 bytes .../Misc/bureaucracy.rsi/folder_paper.png | Bin 0 -> 96 bytes .../Misc/bureaucracy.rsi/folder_red.png | Bin 0 -> 261 bytes .../Misc/bureaucracy.rsi/folder_white.png | Bin 0 -> 273 bytes .../Misc/bureaucracy.rsi/folder_yellow.png | Bin 0 -> 261 bytes .../Misc/bureaucracy.rsi/label_cart.png | Bin 0 -> 283 bytes .../Objects/Misc/bureaucracy.rsi/labeler0.png | Bin 0 -> 471 bytes .../Objects/Misc/bureaucracy.rsi/labeler1.png | Bin 0 -> 478 bytes .../Misc/bureaucracy.rsi/labeler_e.png | Bin 0 -> 420 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 1 + .../Misc/bureaucracy.rsi/nano_paper.png | Bin 0 -> 182 bytes .../Misc/bureaucracy.rsi/nano_paper_words.png | Bin 0 -> 630 bytes .../Misc/bureaucracy.rsi/newspaper.png | Bin 0 -> 1170 bytes .../Misc/bureaucracy.rsi/np_dispenser.png | Bin 0 -> 448 bytes .../bureaucracy.rsi/np_dispenser_empty.png | Bin 0 -> 329 bytes .../Objects/Misc/bureaucracy.rsi/pamphlet.png | Bin 0 -> 741 bytes .../Objects/Misc/bureaucracy.rsi/paper.png | Bin 0 -> 188 bytes .../Misc/bureaucracy.rsi/paper_bin0.png | Bin 0 -> 278 bytes .../Misc/bureaucracy.rsi/paper_bin1.png | Bin 0 -> 300 bytes .../Misc/bureaucracy.rsi/paper_bin2.png | Bin 0 -> 330 bytes .../Misc/bureaucracy.rsi/paper_bin3.png | Bin 0 -> 362 bytes .../Misc/bureaucracy.rsi/paper_plane.png | Bin 0 -> 197 bytes .../Misc/bureaucracy.rsi/paper_stamp-cap.png | Bin 0 -> 157 bytes .../Misc/bureaucracy.rsi/paper_stamp-ce.png | Bin 0 -> 119 bytes .../Misc/bureaucracy.rsi/paper_stamp-cent.png | Bin 0 -> 128 bytes .../bureaucracy.rsi/paper_stamp-chaplain.png | Bin 0 -> 214 bytes .../bureaucracy.rsi/paper_stamp-clown.png | Bin 0 -> 167 bytes .../Misc/bureaucracy.rsi/paper_stamp-cmo.png | Bin 0 -> 134 bytes .../Misc/bureaucracy.rsi/paper_stamp-deny.png | Bin 0 -> 155 bytes .../Misc/bureaucracy.rsi/paper_stamp-hop.png | Bin 0 -> 122 bytes .../Misc/bureaucracy.rsi/paper_stamp-hos.png | Bin 0 -> 126 bytes .../Misc/bureaucracy.rsi/paper_stamp-iaa.png | Bin 0 -> 129 bytes .../Misc/bureaucracy.rsi/paper_stamp-mime.png | Bin 0 -> 129 bytes .../Misc/bureaucracy.rsi/paper_stamp-qm.png | Bin 0 -> 128 bytes .../Misc/bureaucracy.rsi/paper_stamp-rd.png | Bin 0 -> 119 bytes .../bureaucracy.rsi/paper_stamp-trader.png | Bin 0 -> 121 bytes .../bureaucracy.rsi/paper_stamp-warden.png | Bin 0 -> 115 bytes .../Misc/bureaucracy.rsi/paper_talisman.png | Bin 0 -> 219 bytes .../bureaucracy.rsi/paper_talisman_armor.png | Bin 0 -> 285 bytes .../bureaucracy.rsi/paper_talisman_blind.png | Bin 0 -> 278 bytes .../paper_talisman_communicate.png | Bin 0 -> 322 bytes .../paper_talisman_conceal.png | Bin 0 -> 335 bytes .../bureaucracy.rsi/paper_talisman_deafen.png | Bin 0 -> 254 bytes .../bureaucracy.rsi/paper_talisman_emp.png | Bin 0 -> 262 bytes .../paper_talisman_newtome.png | Bin 0 -> 307 bytes .../paper_talisman_revealrunes.png | Bin 0 -> 327 bytes .../paper_talisman_runestun.png | Bin 0 -> 295 bytes .../bureaucracy.rsi/paper_talisman_supply.png | Bin 0 -> 312 bytes .../bureaucracy.rsi/paper_talisman_travel.png | Bin 0 -> 273 bytes .../paper_talisman_travel_unused.png | Bin 0 -> 274 bytes .../bureaucracy.rsi/paper_words-blood.png | Bin 0 -> 356 bytes .../Misc/bureaucracy.rsi/paper_words.png | Bin 0 -> 292 bytes .../Objects/Misc/bureaucracy.rsi/pen.png | Bin 0 -> 197 bytes .../Objects/Misc/bureaucracy.rsi/pen_blue.png | Bin 0 -> 197 bytes .../Objects/Misc/bureaucracy.rsi/pen_red.png | Bin 0 -> 224 bytes .../Objects/Misc/bureaucracy.rsi/scrap.png | Bin 0 -> 438 bytes .../Misc/bureaucracy.rsi/scrap_bloodied.png | Bin 0 -> 620 bytes .../Misc/bureaucracy.rsi/stamp-cap.png | Bin 0 -> 261 bytes .../Objects/Misc/bureaucracy.rsi/stamp-ce.png | Bin 0 -> 248 bytes .../Misc/bureaucracy.rsi/stamp-cent.png | Bin 0 -> 225 bytes .../Misc/bureaucracy.rsi/stamp-chaplain.png | Bin 0 -> 268 bytes .../Misc/bureaucracy.rsi/stamp-clown.png | Bin 0 -> 238 bytes .../Misc/bureaucracy.rsi/stamp-cmo.png | Bin 0 -> 238 bytes .../Misc/bureaucracy.rsi/stamp-deny.png | Bin 0 -> 239 bytes .../Misc/bureaucracy.rsi/stamp-hop.png | Bin 0 -> 270 bytes .../Misc/bureaucracy.rsi/stamp-hos.png | Bin 0 -> 254 bytes .../Misc/bureaucracy.rsi/stamp-iaa.png | Bin 0 -> 272 bytes .../Misc/bureaucracy.rsi/stamp-mime.png | Bin 0 -> 237 bytes .../Objects/Misc/bureaucracy.rsi/stamp-qm.png | Bin 0 -> 239 bytes .../Objects/Misc/bureaucracy.rsi/stamp-rd.png | Bin 0 -> 245 bytes .../Misc/bureaucracy.rsi/stamp-trader.png | Bin 0 -> 187 bytes .../Misc/bureaucracy.rsi/stamp-warden.png | Bin 0 -> 246 bytes .../Misc/bureaucracy.rsi/tallcabinet-open.png | Bin 0 -> 583 bytes .../Misc/bureaucracy.rsi/tallcabinet.png | Bin 0 -> 358 bytes 90 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.dmi create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer-open.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/chestdrawer.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard_over.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/clipboard_pen.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_closed.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_open.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_open_overlay.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_torn.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_torn_overlay.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet-open.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/filingcabinet.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_blue.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_paper.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_red.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_white.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/folder_yellow.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/label_cart.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/labeler0.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/labeler1.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/labeler_e.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper_words.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/newspaper.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser_empty.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pamphlet.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_bin0.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_bin1.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_bin2.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_bin3.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_plane.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cap.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ce.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cent.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-chaplain.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-clown.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cmo.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-deny.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-hop.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-hos.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-mime.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-qm.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-rd.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-trader.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-warden.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_armor.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_blind.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_communicate.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_conceal.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_deafen.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_emp.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_newtome.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_revealrunes.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_runestun.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_supply.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel_unused.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_words-blood.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_words.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_blue.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_red.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/scrap.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/scrap_bloodied.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-trader.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet-open.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/tallcabinet.png diff --git a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs index 9c29df3cde..2162d3bcf7 100644 --- a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs +++ b/Content.Server/GameObjects/Components/Paper/PaperComponent.cs @@ -1,4 +1,4 @@ -using Content.Server.GameObjects.EntitySystems; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; @@ -56,7 +56,7 @@ namespace Content.Server.GameObjects.Components.Interactable if (Owner.TryGetComponent(out SpriteComponent sprite)) { - sprite.LayerSetState(0, "paper_words"); + sprite.LayerSetState(1, "paper_words"); } UpdateUserInterface(); diff --git a/Resources/Prototypes/Entities/items/paper.yml b/Resources/Prototypes/Entities/items/paper.yml index 48cef161f0..6c248a2615 100644 --- a/Resources/Prototypes/Entities/items/paper.yml +++ b/Resources/Prototypes/Entities/items/paper.yml @@ -2,17 +2,16 @@ name: Paper parent: BaseItem id: Paper - description: '' + description: 'A piece of white paper' components: - type: Sprite sprite: Objects/Misc/bureaucracy.rsi - state: paper + layers: + - state: paper_words + - state: paper - type: Icon sprite: Objects/Misc/bureaucracy.rsi state: paper - - type: Item - sprite: Objects/Misc/bureaucracy.rsi - state: paper - type: Paper - type: UserInterface interfaces: @@ -25,13 +24,10 @@ id: Pen description: 'A dark ink pen' components: - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - state: pen - - type: Icon - sprite: Objects/Misc/bureaucracy.rsi - state: pen - - type: Item - sprite: Objects/Misc/bureaucracy.rsi - state: pen - - type: Write + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: pen + - type: Icon + sprite: Objects/Misc/bureaucracy.rsi + state: pen + - type: Write diff --git a/Resources/Textures/Objects/Misc/bureaucracy.dmi b/Resources/Textures/Objects/Misc/bureaucracy.dmi deleted file mode 100644 index 41e890e983f0367a6a323869d50710d1d3bf5052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15020 zcmbt*1yodDyzUt~rBjenKtWo%Q)vVQL>d9$Z7?6^ohI)tp zeRXTCckf$k;>
Z%I(IMg@*0N}rRDf=1#Ad>fQEDW$@C@#Mk08rj~
zYw5bmzIQQm{^02P!NDE?Jk!#X+U@7L@IH#zUahIuS(U}#A0&6}@riHVaRID1Mx{L$h}Z+y2E{se4u
ztH4jX9_G5B*FcCv!oXDv7;Q$3E5TT83&rsP$Bv)4oXrU0YM0{A=|9HFQ*4*n5Al<0
zTO_y~S0wdX<8?5SbzX0~dW~nPZzN9WF?ADX{+eW{p@>N5AlM^`1SkARA!6x^zUM6b
z??wpW2D#yx;A;fA&WOW9JPgWcd0AQ6l^Br&b!7bDl_-P(x(>!_dB$?MzwQGEL>sLhOw4D-uU;ybflwgcV8;OXk;vd$@?2>@amOXdIo
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cap.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cap.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59545708cf553d21c0f3d97e62cee8fcec05383
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6i*k&kcv5P&u!#Apupo2I9XLA
zW`paqg-QKu9FNM)Y&*mnY!NE>)
z1>6^oiZ9U%X+HhIe6c0FT;#lR6~ksBv!IeS79C9r98C%{&Lr`A_^f!J|MI*sr;1w6
z9i?wgc@z6xAJl&cKIWUCzo2(|^r6@V|8{xx+&O4q!ND+L#)KbLyLs0$DKQB$GCWw2
z#~97}+Eo9!J60sYPKQj)XI0yq+I)aJ}rFRrjXu_;~C80k)H$(pNGZ|p_t9##F26ahdR2UK54hHNJO%)SVQ3A0MlShQ2KX8{2cK*}mA878e6j)4
z>Ga|LAPAnVg~Y#?0=9hPDG)``&F$y&*{T4lC@Em0hX%xPTqvcWl)CGD6h+u>x9oQS
zfXjo