diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 6a024d29fa..ade592ec9c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1092,6 +1092,60 @@ - NotekeeperCartridge - NanoTaskCartridge +- type: entity + parent: [ SyndiPDA, BaseSyndicateContraband ] + id: SyndiOperativePDA + name: syndicate operative PDA + description: Death to NT! + components: + - type: Pda + id: SyndiOperativeIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-syndi-operative + - type: Icon + state: pda-syndi-operative + +- type: entity + parent: [ SyndiOperativePDA, BaseSyndicateContraband ] + id: SyndiCorpsmanPDA + name: syndicate corpsman PDA + description: Commander... I need to cook! + components: + - type: Pda + id: SyndiCorpsmanIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-syndi-corpsman + - type: Icon + state: pda-syndi-corpsman + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - NotekeeperCartridge + - NanoTaskCartridge + - MedTekCartridge + +- type: entity + parent: [ SyndiOperativePDA, BaseSyndicateContraband ] + id: SyndiCommanderPDA + name: syndicate commander PDA + description: So what are we, some kind of Nukie squad? + components: + - type: Pda + id: SyndiCommanderIDCard + - type: Appearance + appearanceDataInit: + enum.PdaVisuals.PdaType: + !type:String + pda-syndi-commander + - type: Icon + state: pda-syndi-commander + - type: entity parent: BaseSecurityPDA id: ERTLeaderPDA @@ -1461,30 +1515,6 @@ - type: Icon state: pda-pirate -- type: entity - parent: [ BaseMedicalPDA, BaseSyndicateContraband ] - id: SyndiAgentPDA - name: syndicate corpsman PDA - description: For those days when healing normal syndicates aren't enough, try healing nuclear operatives instead! - components: - - type: Pda - id: SyndicateIDCard - - type: Appearance - appearanceDataInit: - enum.PdaVisuals.PdaType: - !type:String - pda-syndi-agent - - type: PdaBorderColor - borderColor: "#891417" - - type: Icon - state: pda-syndi-agent - - type: CartridgeLoader - uiKey: enum.PdaUiKey.Key - preinstalled: - - NotekeeperCartridge - - NanoTaskCartridge - - MedTekCartridge - - type: entity parent: [BasePDA, SelectableLock] id: ChameleonPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index d236383226..5437830586 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -645,12 +645,44 @@ components: - type: Sprite layers: - - state: syndie + - state: black + - state: syndi - type: Access tags: - NuclearOperative - SyndicateAgent +- type: entity + parent: [ SyndicateIDCard, BaseSyndicateContraband ] + id: SyndiOperativeIDCard + name: syndicate operative ID card + components: + - type: Sprite + layers: + - state: black + - state: syndi_operative + - type: AgentIDCard + +- type: entity + parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ] + id: SyndiCorpsmanIDCard + name: syndicate corpsman ID card + components: + - type: Sprite + layers: + - state: black + - state: syndi_corpsman + +- type: entity + parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ] + id: SyndiCommanderIDCard + name: syndicate commander ID card + components: + - type: Sprite + layers: + - state: black + - state: syndi_commander + - type: entity parent: [ IDCardStandard, BaseMajorContraband ] id: PirateIDCard diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 4097e5573c..5e464c1116 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -49,7 +49,7 @@ gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitSyndie shoes: ClothingShoesBootsCombatFilled - id: SyndiPDA + id: SyndiOperativePDA pocket2: PlushieCarp belt: ClothingBeltMilitaryWebbing storage: @@ -79,6 +79,7 @@ id: SyndicateCommanderGearFull parent: SyndicateOperativeGearFull equipment: + id: SyndiCommanderPDA neck: SyndicateWhistle outerClothing: ClothingOuterHardsuitSyndieCommander inhand: @@ -101,7 +102,7 @@ eyes: ClothingEyesHudSyndicateAgent outerClothing: ClothingOuterHardsuitSyndieMedic shoes: ClothingShoesBootsMagSyndie - id: SyndiAgentPDA + id: SyndiCorpsmanPDA belt: ClothingBeltMilitaryWebbingMedFilled storage: back: diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 9606232b68..977d7d17b2 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -1,254 +1,260 @@ { - "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-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser, pda-wizard recolour by Velken", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "id_overlay" + "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-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord), pda-pirate made by brainfood1183 (Github), pda-syndi-agent drawn by Ubaser, pda-wizard recolour by Velken, pda-syndi-commander/operative by Archee1 (Github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "id_overlay_wide" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "insert_overlay" - }, - { - "name": "light_overlay" - }, - { - "name": "light_overlay_wide" - }, - { - "name": "pda" - }, - { - "name": "pda-atmos" - }, - { - "name": "pda-bartender" - }, - { - "name": "pda-boxer" - }, - { - "name": "pda-captain" - }, - { - "name": "pda-cargo" - }, - { - "name": "pda-ce" - }, - { - "name": "pda-chaplain" - }, - { - "name": "pda-chemistry" - }, - { - "name": "pda-clear" - }, - { - "name": "pda-clown" - }, - { - "name": "pda-cmo" - }, - { - "name": "pda-cook" - }, - { - "name": "pda-detective" - }, - { - "name": "pda-engineer" - }, - { - "name": "pda-genetics" - }, - { - "name": "pda-hop" - }, - { - "name": "pda-hos" - }, - { - "name": "pda-hydro" - }, - { - "name": "pda-janitor" - }, - { - "name": "pda-lawyer" - }, - { - "name": "pda-library", - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "pda-medical" - }, - { - "name": "pda-paramedic" - }, - { - "name": "pda-mime" - }, - { - "name": "pda-miner" - }, - { - "name": "pda-pirate" - }, - { - "name": "pda-qm" - }, - { - "name": "pda-r", - "delays": [ - [ - 0.8, - 0.8 - ] - ] - }, - { - "name": "pda-r-library", - "delays": [ - [ - 0.8, - 0.8 - ] - ] - }, - { - "name": "pda-rd" - }, - { - "name": "pda-roboticist" - }, - { - "name": "pda-science" - }, - { - "name": "pda-security" - }, - { - "name": "pda-brigmedic", - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "pda-syndi" - }, - { - "name": "pda-syndi-agent" - }, - { - "name": "pda-centcom", - "delays": [ - [ - 1.2, - 1.2, - 1.2, - 1.2 - ] - ] - }, - { - "name": "pda-virology" - }, - { - "name": "pda-warden" - }, - { - "name": "pda-musician" - }, - { - "name": "pda-reporter" - }, - { - "name": "pda-interncadet" - }, - { - "name": "pda-internmed" - }, - { - "name": "pda-internsci" - }, - { - "name": "pda-internservice" - }, - { - "name": "pda-interntech" - }, - { - "name": "pda-zookeeper" - }, - { - "name": "pda-ert" - }, - { - "name": "pda-cluwne" - }, - { - "name": "pda-seniorengineer" - }, - { - "name": "pda-seniorresearcher" - }, - { - "name": "pda-seniorphysician" - }, - { - "name": "pda-seniorofficer" - }, - { - "name": "pda-seniorcourier" - }, - { - "name": "pda-wizard", - "delays": [ - [ - 0.3, - 0.3, - 0.3, - 0.3 - ] - ] - }, - { - "name": "equipped-IDCARD", - "directions": 4 - } - ] + "states": [ + { + "name": "id_overlay" + }, + { + "name": "id_overlay_wide" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "light_overlay_wide" + }, + { + "name": "pda" + }, + { + "name": "pda-atmos" + }, + { + "name": "pda-bartender" + }, + { + "name": "pda-boxer" + }, + { + "name": "pda-captain" + }, + { + "name": "pda-cargo" + }, + { + "name": "pda-ce" + }, + { + "name": "pda-chaplain" + }, + { + "name": "pda-chemistry" + }, + { + "name": "pda-clear" + }, + { + "name": "pda-clown" + }, + { + "name": "pda-cmo" + }, + { + "name": "pda-cook" + }, + { + "name": "pda-detective" + }, + { + "name": "pda-engineer" + }, + { + "name": "pda-genetics" + }, + { + "name": "pda-hop" + }, + { + "name": "pda-hos" + }, + { + "name": "pda-hydro" + }, + { + "name": "pda-janitor" + }, + { + "name": "pda-lawyer" + }, + { + "name": "pda-library", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "pda-medical" + }, + { + "name": "pda-paramedic" + }, + { + "name": "pda-mime" + }, + { + "name": "pda-miner" + }, + { + "name": "pda-pirate" + }, + { + "name": "pda-qm" + }, + { + "name": "pda-r", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "pda-r-library", + "delays": [ + [ + 0.8, + 0.8 + ] + ] + }, + { + "name": "pda-rd" + }, + { + "name": "pda-roboticist" + }, + { + "name": "pda-science" + }, + { + "name": "pda-security" + }, + { + "name": "pda-brigmedic", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "pda-syndi" + }, + { + "name": "pda-syndi-corpsman" + }, + { + "name": "pda-syndi-commander" + }, + { + "name": "pda-syndi-operative" + }, + { + "name": "pda-centcom", + "delays": [ + [ + 1.2, + 1.2, + 1.2, + 1.2 + ] + ] + }, + { + "name": "pda-virology" + }, + { + "name": "pda-warden" + }, + { + "name": "pda-musician" + }, + { + "name": "pda-reporter" + }, + { + "name": "pda-interncadet" + }, + { + "name": "pda-internmed" + }, + { + "name": "pda-internsci" + }, + { + "name": "pda-internservice" + }, + { + "name": "pda-interntech" + }, + { + "name": "pda-zookeeper" + }, + { + "name": "pda-ert" + }, + { + "name": "pda-cluwne" + }, + { + "name": "pda-seniorengineer" + }, + { + "name": "pda-seniorresearcher" + }, + { + "name": "pda-seniorphysician" + }, + { + "name": "pda-seniorofficer" + }, + { + "name": "pda-seniorcourier" + }, + { + "name": "pda-wizard", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "equipped-IDCARD", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png deleted file mode 100644 index 84fb47cc79..0000000000 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-agent.png and /dev/null differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-commander.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-commander.png new file mode 100644 index 0000000000..8b8b738acd Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-commander.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-corpsman.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-corpsman.png new file mode 100644 index 0000000000..7ccdcde7ee Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-corpsman.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-operative.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-operative.png new file mode 100644 index 0000000000..dc8ad50b0b Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi-operative.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png index 51fa1bd294..8bb228d7e5 100644 Binary files a/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png and b/Resources/Textures/Objects/Devices/pda.rsi/pda-syndi.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/black.png b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png new file mode 100644 index 0000000000..cc56db775b Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/black.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index e33cd304e1..a8b80d8f9a 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github), wizard and idwizard by ScarKy0 | idboxer and idlawyer recoloured by K-Dynamic (github) | idquartermaster modified by K-Dynamic (github) | idmime and idmusician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24, syndiop/agent/commander made by Archee1 (Github)", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "default" }, + { + "name": "black" + }, { "name": "centcom" }, @@ -209,7 +212,16 @@ "name": "silver" }, { - "name": "syndie" + "name": "syndi" + }, + { + "name": "syndi_operative" + }, + { + "name": "syndi_corpsman" + }, + { + "name": "syndi_commander" }, { "name": "idcluwne" diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png new file mode 100644 index 0000000000..ff49afaf60 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png new file mode 100644 index 0000000000..da0b9f1dd8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_commander.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png new file mode 100644 index 0000000000..95ec8ff75e Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_corpsman.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png new file mode 100644 index 0000000000..b2aa56a268 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/syndi_operative.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png b/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png deleted file mode 100644 index 3d5cc6e384..0000000000 Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png and /dev/null differ