From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Sat, 15 Apr 2023 22:43:15 +0000 (+0300) Subject: [Entity] Centcom PDA (#15415) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a3102147cac2d6ba149ccd379c028a21ec953775;p=space-station-14.git [Entity] Centcom PDA (#15415) * [PDA] Centcom PDA * Centcom pen update * sheesh * Pen based on CyberPen --- 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 0000000000..d4b81c5eb4 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-centcom.png differ 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 0000000000..75b7a74313 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/pen_centcom.png differ