From a3102147cac2d6ba149ccd379c028a21ec953775 Mon Sep 17 00:00:00 2001 From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Sun, 16 Apr 2023 01:43:15 +0300 Subject: [PATCH] [Entity] Centcom PDA (#15415) * [PDA] Centcom PDA * Centcom pen update * sheesh * Pen based on CyberPen --- .../Prototypes/Entities/Objects/Devices/pda.yml | 15 ++++++++++++--- .../Prototypes/Entities/Objects/Misc/paper.yml | 14 ++++++++++++++ .../Textures/Objects/Devices/pda.rsi/meta.json | 13 ++++++++++++- .../Objects/Devices/pda.rsi/pda-centcom.png | Bin 0 -> 1031 bytes .../Objects/Misc/bureaucracy.rsi/meta.json | 5 ++++- .../Objects/Misc/bureaucracy.rsi/pen_centcom.png | Bin 0 -> 389 bytes 6 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_centcom.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index b419855ec2..860c37355c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -553,14 +553,23 @@ state: pda-security - type: entity - parent: PassengerPDA + parent: BasePDA id: CentcomPDA name: CentCom PDA - description: Colored the numbing grey of bureaucracy. + description: Light green sign of walking bureaucracy. components: - type: PDA id: CentcomIDCardSyndie - state: pda + state: pda-centcom + penSlot: + startingItem: PenCentcom + whitelist: + tags: + - Write + - type: PDABorderColor + borderColor: "#32CD32" + - type: Icon + state: pda-centcom - type: entity parent: BasePDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index d35fb1eafb..4dfaac71ef 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -224,6 +224,20 @@ sprite: Objects/Misc/bureaucracy.rsi state: pen_cap +- type: entity + name: Centcom pen + parent: CyberPen + id: PenCentcom + description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style. + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: pen_centcom + netsync: false + - type: Item + sprite: Objects/Misc/bureaucracy.rsi + heldPrefix: pen_centcom + - type: entity name: hop's fountain pen parent: Pen diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 01b16f56fc..7fa756f9a6 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14, pda-brigmed made by PuroSlavKing (Github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14, pda-brigmed and pda-centcom made by PuroSlavKing (Github)", "size": { "x": 32, "y": 32 @@ -150,6 +150,17 @@ { "name": "pda-syndi" }, + { + "name": "pda-centcom", + "delays": [ + [ + 1.2, + 1.2, + 1.2, + 1.2 + ] + ] + }, { "name": "pda-virology" }, diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..d4b81c5eb4011ad056c32b35a505c580d84db346 GIT binary patch literal 1031 zcmV+i1o-=jP)dQfbHfW6cfn^Ntj1SN|L7VP$r%sSbuyR&~L1I;`LWOjym zZ-4XK-P!#;V%s+Q8Fyq0kPQ_8*#cxk1wgg{*|_W1sc8jNt7j-pPXmArfc*Juc#f@B z&peOEdCK&HpDP0>>22hqA(G!W1KO||^03QE!V2m&e^3ByG|H&98+Ai>I&wdmQTG6R zD*-rYwP(t}#u2dEuz5ttV}TGp<~+$b0Q&Nx2+SQ-GnJRL(WUq&up#?nA|F@F3kmsdL~f8-3X(y6X2 zxT@6vOki>46u=~!xa6Ha5LPJR~Rufn57YqfSZ3)opd z=AAk;+}Rh0pF0C6*j2Zf=mWrR@dOKpVlsf`Hqp8Aarn8P0;Ta;0Nv3)`|%4v=UsT? z!!h2zP9_6bey^2}%g>bo+3aBJS?kje+}wqqy_jtGB$ELm`HA1#lBN~x>h}FsqoUtB z&cO_`6RYUJ6Tr6Z$XnrF@N;E=J)(m&%E1F!oQwcSW;-mB-!}sYAvQjav>Lp7`;+$g z)z;tyRLWXn=+4}wU4fV(>FE{sOy=k^Cs&?+%4kJFV9?GLchDVXP` z!$~zz&w_A&fR`h~y$T}z0d798Oo+lC%OYdC#<2ByRCG+eO6Dd=;WkMC=+F>_pF04o zBP5j{^1KE``UBh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index d50251f6e3..98f3c82813 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. stamp-syndicate is a modified version of stamp-warden. paper_stamp-syndicate by Veritius. paper_receipt by eoineoineoin", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. stamp-syndicate is a modified version of stamp-warden. paper_stamp-syndicate by Veritius. paper_receipt by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github)", "size": { "x": 32, "y": 32 @@ -213,6 +213,9 @@ { "name": "pen_cap" }, + { + "name": "pen_centcom" + }, { "name": "pen_hop" }, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_centcom.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..75b7a743138e070c02c560d604f86a18e7b4916c GIT binary patch literal 389 zcmV;00eb$4P)9 z;L;OhW=O&Y?ds%;OVjl8V7y1}4A`J8Mg@!t*tBGK7v5Lv1AM$tZRZ_GIwys2mEbuC z;?l?xK@PnR%ln-50s&TwK+?erU_3?)Bj_hu&Z=l00000NkvXXu0mjf09vB9 literal 0 HcmV?d00001 -- 2.51.2