]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[FEATURE] More icons (#42200)
authorThatGuyUSA <thatguyusa123@gmail.com>
Tue, 6 Jan 2026 10:28:04 +0000 (02:28 -0800)
committerGitHub <noreply@github.com>
Tue, 6 Jan 2026 10:28:04 +0000 (10:28 +0000)
* innit bruv, but also done!

* added comment to signify why it's like that

* init, but done

* init commit

* you think you got everythin, until you didn't

* credits and one last touch up

* i fucking hate git

* KILL OLD COMMITS

This reverts commit 6f834a51de611f215ede02f291a9d834777884a5.

* KILLING OLD COMMITS

This reverts commit 36e1f4a476b873f2326723740eccf455060520d8.

* I am going to become the joker

* one day i'll learn how to delete old commits properly

* god fucking damn it

* capitalization!

25 files changed:
Resources/Locale/en-US/job/job-description.ftl
Resources/Locale/en-US/job/job-names.ftl
Resources/Locale/en-US/prototypes/roles/antags.ftl
Resources/Prototypes/Entities/Mobs/Corpses/corpses.yml
Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
Resources/Prototypes/Entities/Objects/Devices/pda.yml
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
Resources/Prototypes/Roles/Antags/ninja.yml
Resources/Prototypes/Roles/Antags/nukeops.yml
Resources/Prototypes/Roles/Antags/pirate.yml
Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
Resources/Prototypes/Roles/Jobs/CentComm/official.yml
Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
Resources/Prototypes/StatusIcon/job.yml
Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png [new file with mode: 0644]
Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png [new file with mode: 0644]
Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
Resources/Textures/Objects/Devices/pda.rsi/meta.json
Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png [new file with mode: 0644]
Resources/Textures/Objects/Misc/id_cards.rsi/orange.png
Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png

index 35ada63d8c46f97ffbb3f65e6d3cac79342183d1..15a9c9a1730a3cc24385123ecf5b54686a4d643b 100644 (file)
@@ -8,7 +8,7 @@ job-description-cadet = Learn the basics of arresting criminals and managing the
 job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
 job-description-cargotech = Deal with requisitions and deliveries, pilot the cargo shuttle to the trade station and back, and work with others to make ludicrous amounts of cash and then waste it all gambling.
 job-description-ce = Manage the Engineering department to ensure power, atmospherics, and the hull are in perfect shape.
-job-description-centcomoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet.
+job-description-centcommoff = Act as an ambassador to the newest state-of-the-art space station in Nanotrasen's fleet.
 job-description-chaplain = Preach the good word of your deity and religion, and conduct spiritual healing and miracles with your bible.
 job-description-chef = Keep the station fed with a variety of food items, butcher dead animals to ensure ammonia doesn't leak, and help keep the bar lively.
 job-description-chemist = Produce medicinal drugs for the doctors to use, research ethically dubious rare chemicals, and produce weapons of war when enemies of the station arrive.
index f7d3167dca160a04a69afa2be57a8adc8cc12730..76f9e78ee62c89d4ff9beceeb1feae5a273b265a 100644 (file)
@@ -1,70 +1,80 @@
-job-name-warden = Warden
-job-name-security = Security Officer
+job-name-atmostech = Atmospheric Technician
+job-name-bartender = Bartender
+job-name-borg = Cyborg
+job-name-botanist = Botanist
+job-name-brigmedic = Brigmedic
 job-name-cadet = Security Cadet
-job-name-hos = Head of Security
+job-name-captain = Captain
+job-name-cargotech = Cargo Technician
+job-name-cburn = CentComm Quarantine Officer
+job-name-ce = Chief Engineer
+job-name-centcommoff = CentComm Official
+job-name-chef = Chef
+job-name-chaplain = Chaplain
+job-name-chemist = Chemist
+job-name-clown = Clown
+job-name-cluwne = Cluwne
+job-name-cmo = Chief Medical Officer
+job-name-deathsquad = Death Squad
 job-name-detective = Detective
-job-name-brigmedic = Brigmedic
-job-name-borg = Cyborg
-job-name-scientist = Scientist
-job-name-research-assistant = Research Assistant
-job-name-rd = Research Director
-job-name-psychologist = Psychologist
-job-name-intern = Medical Intern
 job-name-doctor = Medical Doctor
-job-name-paramedic = Paramedic
-job-name-cmo = Chief Medical Officer
-job-name-chemist = Chemist
-job-name-technical-assistant = Technical Assistant
 job-name-engineer = Station Engineer
-job-name-atmostech = Atmospheric Technician
+job-name-ertchaplain = ERT Chaplain
+job-name-ertengineer = ERT Engineer
+job-name-ertjanitor = ERT Janitor
+job-name-ertleader = ERT Leader
+job-name-ertmedic = ERT Medic
+job-name-ertsecurity = ERT Security
 job-name-hop = Head of Personnel
-job-name-captain = Captain
-job-name-serviceworker = Service Worker
-job-name-centcomoff = CentComm Official
-job-name-cburn = Centcomm Quarantine Officer
-job-name-deathsquad = Centcomm Agent
-job-name-reporter = Reporter
-job-name-musician = Musician
-job-name-librarian = Librarian
+job-name-hos = Head of Security
+job-name-intern = Medical Intern
+job-name-janitor = Janitor
 job-name-lawyer = Lawyer
+job-name-librarian = Librarian
 job-name-mime = Mime
-job-name-ce = Chief Engineer
-job-name-janitor = Janitor
-job-name-chaplain = Chaplain
-job-name-botanist = Botanist
-job-name-bartender = Bartender
+job-name-musician = Musician
+job-name-paramedic = Paramedic
 job-name-passenger = Passenger
+job-name-psychologist = Psychologist
+job-name-qm = Quartermaster
+job-name-rd = Research Director
+job-name-reporter = Reporter
+job-name-research-assistant = Research Assistant
 job-name-salvagespec = Salvage Specialist
+job-name-scientist = Scientist
+job-name-security = Security Officer
+job-name-serviceworker = Service Worker
 job-name-station-ai = Station AI
-job-name-qm = Quartermaster
-job-name-cargotech = Cargo Technician
-job-name-chef = Chef
-job-name-clown = Clown
-job-name-ertleader = ERT Leader
-job-name-ertchaplain = ERT Chaplain
-job-name-ertengineer = ERT Engineer
-job-name-ertsecurity = ERT Security
-job-name-ertmedic = ERT Medic
-job-name-ertjanitor = ERT Janitor
+job-name-technical-assistant = Technical Assistant
 job-name-visitor = Visitor
-job-name-cluwne = Cluwne
+job-name-warden = Warden
 
 # unused jobs
 # these are required for the agent ID job icon tooltips
 # I am keeping them for roleplaying opportunities
 job-name-geneticist = Geneticist
+job-name-boxer = Boxer
 job-name-no-id = No ID
 job-name-prisoner = Prisoner
 job-name-roboticist = Roboticist
-job-name-syndicate = Syndicate
 job-name-unknown = Unknown
 job-name-virologist = Virologist
+job-name-zookeeper = Zookeeper
+
+# antagonist jobs
+job-name-ninja = Ninja
+job-name-syndicate = Syndicate
+job-name-syndicate-commander = Syndicate Commander
+job-name-syndicate-corpsman = Syndicate Corpsman
+job-name-syndicate-operative = Syndicate Operative
+job-name-pirate = Pirate
+job-name-wizard = Wizard
 job-name-zombie = Zombie
 
 # Job titles
-job-title-visitor = Visitor
 job-title-cluwne = Cluwne
 job-title-universal = Universal
+job-title-visitor = Visitor
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
index 3fa969d17057dd4703d5a0989971b0f1f74e757c..f0c80f9dfcaea3a714bcd17bfdbb28e19e0915b6 100644 (file)
@@ -36,6 +36,8 @@ roles-antag-space-ninja-objective = Use your stealth to sabotage the station, no
 roles-antag-paradox-clone-name = Paradox Clone
 roles-antag-paradox-clone-objective = A freak space-time anomaly has teleported you into another reality! Now you have to find your counterpart and kill and replace them.
 
+roles-antag-pirate-name = Pirate
+
 roles-antag-thief-name = Thief
 roles-antag-thief-objective = Add some NT property to your personal collection without using violence.
 
index c8d2f236fa16e0075d984e8736fb4aa39a4121d3..f4b632df4fd0f9a597c95c1d0515a9343d968268 100644 (file)
@@ -79,7 +79,7 @@
   - type: Loadout
     prototypes:
     - HoPGear
-    - CentcomGear
+    - CentcommGear
     - CaptainGear
     - HoSGear
     - ResearchDirectorGear
index 51a9b7a02cdb9960c6b36cb538f2028ce6d4a01b..75e4cbd60edb8ff2f20a4436b216a255a958c5ca 100644 (file)
         settings: default
       job: CentralCommandOfficial
     - type: Loadout
-      prototypes: [ CentcomGear ]
+      prototypes: [ CentcommGear ]
       roleLoadout: [ RoleSurvivalStandard ]
 
 ## Syndicate
index 877a64b20e3456983043c5fc13c345d5a558d22a..b1bbe6bb2dcdf132a9b94deef744a019d86f7807 100644 (file)
   - type: Icon
     state: pda-seniorcourier
 
+- type: entity
+  parent: [ BaseHighlyIllegalContraband, BasePDA ]
+  id: NinjaPDA
+  name: ninja PDA
+  description: You stealthy bastard, you!
+  components:
+  - type: Pda
+    id: NinjaIDCard
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-ninja
+  - type: Icon
+    state: pda-ninja
+
 - type: entity
   parent: [ BaseMajorContraband, SyndiPDA ]
   id: PiratePDA
index e175b6a77fbd5048ab8bc83a73e590a3fe491ed0..9a5a649015c1ebd1ac6344ef0f792a07cca57e86 100644 (file)
       offset: *icon-offset
       state: SyndicateOperative
   - type: AgentIDCard
+  - type: IdCard
+    jobIcon: JobIconSyndicateOperative
 
 - type: entity
   parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ]
     - sprite: *icon-rsi
       offset: *icon-offset
       state: SyndicateCorpsman
+  - type: IdCard
+    jobIcon: JobIconSyndicateCorpsman
 
 - type: entity
   parent: [ SyndiOperativeIDCard, BaseSyndicateContraband ]
     - sprite: *icon-rsi
       offset: *icon-offset
       state: SyndicateCommander
+  - type: IdCard
+    jobIcon: JobIconSyndicateCommander
+
+- type: entity
+  parent: [ IDCardStandard, BaseHighlyIllegalContraband ]
+  id: NinjaIDCard
+  name: ninja ID card
+  suffix: Ninja
+  components:
+  - type: Sprite
+    layers:
+    - state: ninja
+    - state: stripe_top
+      color: "#38D848"
+    - state: stripe_bottom
+      color: "#309000"
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Ninja
+  - type: Item
+    heldPrefix: green
+  - type: AgentIDCard
+  - type: IdCard
+    jobIcon: JobIconNinja
+  - type: Access
+    tags:
+    - Maintenance
 
 - type: entity
   parent: [ IDCardStandard, BaseMajorContraband ]
   - type: Sprite
     layers:
     - state: pirate
+    - sprite: *icon-rsi
+      offset: *icon-offset
+      state: Pirate
   - type: Item
     heldPrefix: orange #this is close enough to the weird puce color pirate IDs have going on
-  - type: Access
-    tags:
-    - NuclearOperative
-    - SyndicateAgent
+  - type: IdCard
+    jobIcon: JobIconPirate
 
 - type: entity
   parent: IDCardStandard
     - Xenoborg
 
 - type: entity
-  parent: IDCardStandard
+  parent: [ IDCardStandard, BaseMagicalContraband ]
   id: WizardIDCard
   name: wizard ID card
   components:
     - Wizard
     - External
     - Maintenance
+  - type: IdCard
+    jobIcon: JobIconWizard
 
 #ERT/Centcomm
 
index b43dbf72c15d006aded8830a05e49f443ce0e413..919471a61c485d2ed79efa909b68206ac98a4cb5 100644 (file)
@@ -18,7 +18,7 @@
     gloves: ClothingHandsGlovesSpaceNinja
     outerClothing: ClothingOuterSuitSpaceNinja
     shoes: ClothingShoesSpaceNinja
-    id: AgentIDCard
+    id: NinjaPDA
     ears: ClothingHeadsetNinja
     pocket1: SpiderCharge
     pocket2: PinpointerStation
@@ -41,7 +41,7 @@
 - type: chameleonOutfit
   id: NinjaChameleonOutfit
   name: roles-antag-space-ninja-name
+  icon: "JobIconNinja"
   startingGear: SpaceNinjaGear
   equipment:
-    id: PassengerPDA
     neck: ClothingNeckGoldmedal
index e2018b91a6f9672cd8444bd5d26ed79f7179e5d9..de86b7056094f328eba30a95202c8989cf36849c 100644 (file)
@@ -69,7 +69,7 @@
   id: NukeopsOutfit
   name: roles-antag-nuclear-operative-name
   startingGear: SyndicateOperativeGearFullNoUplink
-  icon: "JobIconSyndicate"
+  icon: "JobIconSyndicateOperative"
   equipment:
     head: ClothingHeadHelmetHardsuitSyndie
     neck: ClothingNeckScarfStripedSyndieRed
@@ -89,7 +89,7 @@
   id: NukeopsCommanderOutfit
   name: roles-antag-nuclear-operative-commander-name
   startingGear: SyndicateCommanderGearFull
-  icon: "JobIconSyndicate"
+  icon: "JobIconSyndicateCommander"
   equipment:
     head: ClothingHeadHelmetHardsuitSyndieCommander
     neck: ClothingNeckScarfStripedSyndieGreen
   id: NukeopsMedicOutfit
   name: roles-antag-nuclear-operative-agent-name
   startingGear: SyndicateOperativeMedicFull
-  icon: "JobIconSyndicate"
+  icon: "JobIconSyndicateCorpsman"
   equipment:
     head: ClothingHeadHelmetHardsuitSyndieMedic
     neck: ClothingNeckScarfStripedLightBlue
index 849e9dc1f289f05556a6585a19997113e2756fc9..0585ec075ae16e39129caeaa80bdf0f623acb65e 100644 (file)
   equipment:
     head: ClothingHeadHatPirateTricord
     outerClothing: ClothingOuterCoatGentle
+
+- type: chameleonOutfit
+  id: PirateChameleonOutfit
+  name: roles-antag-pirate-name
+  icon: "JobIconPirate"
+  startingGear: PirateFirstmateGear
+  equipment:
+    eyes: ClothingEyesEyepatch
+    ears: ClothingHeadsetFreelance
+    mask: ClothingMaskNeckGaiter
+    neck: ClothingNeckBling
+    gloves: ClothingHandsGlovesColorLightBrown
+    outerClothing: ClothingOuterCoatPirate
+
index 2ba54d48b1f7a2d9a3aeabe8266b54e87490456e..a17acc9898163303cd351f556cd2cb30e66491d3 100644 (file)
@@ -5,7 +5,7 @@
   playTimeTracker: JobCBURN
   setPreference: false
   startingGear: CBURNGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconCBURN"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
index 3231783fd3d564e8930975ddb7cb29d52a2bc216..0b197af4d80385699ab842e8b4c9ee01d4a753a5 100644 (file)
@@ -5,7 +5,7 @@
   playTimeTracker: JobDeathSquad
   setPreference: false
   startingGear: DeathSquadGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconDeathSquad"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
index e0aa56d79e97a1abf208daab902a51fec708a8c5..27c61ac3378e5827b362eb32ecf8a992efa2be76 100644 (file)
@@ -6,7 +6,7 @@
   playTimeTracker: JobERTLeader
   setPreference: false
   startingGear: ERTLeaderGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTLeader"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   playTimeTracker: JobERTChaplain
   setPreference: false
   startingGear: ERTChaplainGear
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTChaplain"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   playTimeTracker: JobERTEngineer
   setPreference: false
   startingGear: ERTEngineerGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTEngineer"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   playTimeTracker: JobERTSecurity
   setPreference: false
   startingGear: ERTSecurityGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTSecurity"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   playTimeTracker: JobERTMedical
   setPreference: false
   startingGear: ERTMedicalGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTMedic"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
   playTimeTracker: JobERTJanitor
   setPreference: false
   startingGear: ERTJanitorGearEVA
-  icon: "JobIconNanotrasen"
+  icon: "JobIconERTJanitor"
   supervisors: job-supervisors-centcom
   canBeAntag: false
   accessGroups:
index 86cf79d2079fa040bebfaa8d706d8d32db3ad8e3..0ec4910b7c2b90db0bb6f96423def8f0ada94a25 100644 (file)
@@ -1,10 +1,10 @@
 - type: job
   id: CentralCommandOfficial
-  name: job-name-centcomoff
-  description: job-description-centcomoff
+  name: job-name-centcommoff
+  description: job-description-centcommoff
   playTimeTracker: JobCentralCommandOfficial
   setPreference: false
-  startingGear: CentcomGear
+  startingGear: CentcommGear
   icon: "JobIconNanotrasen"
   supervisors: job-supervisors-hos
   canBeAntag: false
@@ -17,7 +17,7 @@
     implants: [ MindShieldImplant, DeathRattleImplantCentcomm ]
 
 - type: startingGear
-  id: CentcomGear
+  id: CentcommGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomOfficial
     shoes: ClothingShoesBootsCombatFilled
index e59e08bf79d084418cef3c952d7a0b9da0f83f19..a02fdfadf15c00a18dd74a13b47669e971b5a631 100644 (file)
@@ -33,6 +33,7 @@
   id: WizardChameleonOutfit
   name: roles-antag-wizard-name
   startingGear: WizardBlueGear
+  icon: "JobIconWizard"
   equipment:
     eyes: ClothingEyesGlassesCheapSunglasses
     mask: ClothingMaskBreath
index 3ac1ab07be73b73fae3b43f9a0c2a82d820db668..cdcabfd649e8fb874f53adc2cf16496408e585e0 100644 (file)
     state: Cluwne
   jobName: job-name-cluwne
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconNinja
+  icon:
+    sprite: *icon-rsi
+    state: Ninja
+  jobName: job-name-ninja
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconPirate
+  icon:
+    sprite: *icon-rsi
+    state: Pirate
+  jobName: job-name-pirate
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconPrisoner
     state: Syndicate
   jobName: job-name-syndicate
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicateCommander
+  icon:
+    sprite: *icon-rsi
+    state: SyndicateCommander
+  jobName: job-name-syndicate-commander
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicateCorpsman
+  icon:
+    sprite: *icon-rsi
+    state: SyndicateCorpsman
+  jobName: job-name-syndicate-corpsman
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconSyndicateOperative
+  icon:
+    sprite: *icon-rsi
+    state: SyndicateOperative
+  jobName: job-name-syndicate-operative
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconWizard
+  icon:
+    sprite: *icon-rsi
+    state: Wizard
+  jobName: job-name-wizard
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconZombie # This is a perfectly legitimate profession to pursue
 
 # Admin
 
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCBURN
+  icon:
+    sprite: *icon-rsi
+    state: CBURN
+  jobName: job-name-cburn
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconDeathSquad
+  icon:
+    sprite: *icon-rsi
+    state: DeathSquad
+  jobName: job-name-deathsquad
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTLeader
+  icon:
+    sprite: *icon-rsi
+    state: ERTLeader
+  jobName: job-name-ertleader
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTChaplain
+  icon:
+    sprite: *icon-rsi
+    state: ERTChaplain
+  jobName: job-name-ertchaplain
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTEngineer
+  icon:
+    sprite: *icon-rsi
+    state: ERTEngineer
+  jobName: job-name-ertengineer
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTSecurity
+  icon:
+    sprite: *icon-rsi
+    state: ERTSecurity
+  jobName: job-name-ertsecurity
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTMedic
+  icon:
+    sprite: *icon-rsi
+    state: ERTMedical
+  jobName: job-name-ertmedic
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconERTJanitor
+  icon:
+    sprite: *icon-rsi
+    state: ERTJanitor
+  jobName: job-name-ertjanitor
+
 - type: jobIcon
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
     sprite: *icon-rsi
     state: Nanotrasen
-  jobName: job-name-centcomoff
+  jobName: job-name-centcommoff
 
 - type: jobIcon
   parent: JobIcon
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png
new file mode 100644 (file)
index 0000000..0345d9d
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Ninja.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png
new file mode 100644 (file)
index 0000000..9299eda
Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/Pirate.png differ
index 97c3546abad19347b91c006104e2530c4804cfb4..4b137a937a3e326a8ca3378526b7813b5a039f91 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github)",
+    "copyright": "Taken and modified from /tg/station113 from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Admin recolored from MedicalIntern by TsjipTsjip | StationAi resprite to 8x8 size by lunarcomets | Service Worker resprite by anno_midi (Discord) and spanky-spanky (Github) | service icons darkened by frobnic8 (Discord and Github) | paradoxClone taken from tg station at commit https://github.com/tgstation/tgstation/commit/d0db1ff267557017ae7bde68e6490e70cbb6e42f and modifed by slarticodefast (Github) | Boxer, Chaplain, Janitor, Lawyer, Librarian recoloured by K-Dynamic (github) | Cluwne icon by Professor Renderer (Discord) | QuarterMaster modified by K-Dynamic (github) | Mime and Musician recolor by DinnerCalzone (github) at https://github.com/impstation/imp-station-14/commit/233161f02bab7f9f9c03f09f39638ea7c200ee24 | Wizard originally by ScarKy0 (github) at https://github.com/space-wizards/space-station-14/commit/7c6028bc8037306536dca68f3c2cdd5edec56d14, edited by DinnerCalzone (github) | SyndicateCommander/Corpsman/Operative originally by Archeel1 (github) at https://github.com/space-wizards/space-station-14/commit/1a92ada, edited by DinnerCalzone (github), ninja icon by ThatGuyUSA (github)",
     "size": {
         "x": 8,
         "y": 8
         {
             "name": "Nanotrasen"
         },
+        {
+            "name": "Ninja"
+        },
         {
             "name": "NoId"
         },
         {
             "name": "Passenger"
         },
+        {
+            "name": "Pirate"
+        },
         {
             "name": "Prisoner"
         },
             "name": "Wizard"
         },
         {
-            "name": "Zombie"
+            "name": "Zookeeper"
         },
         {
-            "name": "Zookeeper"
+            "name": "Zombie"
         }
     ]
 }
index 977d7d17b2a9ca0612e0c237d7423a49fce74b19..e5833360bdbccdefddbc483b52aecd5e3d24b2d5 100644 (file)
@@ -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-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)",
+    "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), pda-ninja by ThatGuyUSA (github)",
     "size": {
         "x": 32,
         "y": 32
         {
             "name": "pda-miner"
         },
+        {
+            "name": "pda-ninja"
+        },
         {
             "name": "pda-pirate"
         },
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png
new file mode 100644 (file)
index 0000000..8d980a3
Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-ninja.png differ
index 29a2e4f741a6d419f4943ce49037529776daa9f7..24f3e34af4c0e6ab13fc707468fe52bb46cf2916 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-       "copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github)",
+       "copyright": "Taken and modified from /tg/station 13 at commit https://github.com/tgstation/tgstation/commit/d917f4c, edited by AJCM-git, CrudeWax, and DinnerCalzone (github) | inhands taken and modified from /vg/station13 at https://github.com/vgstation-coders/vgstation13/blob/2c2b9966ea0d03b10e6e9c59626f72bbe8475d9d/icons/mob/in-hand/left/items_lefthand.dmi | pirate made by brainfood1183 (github) | wizard by ScarkKy0 (github) | stripe_cluwne by brainfood1183 (github) | black-inhands by DinnerCalzone (github), ninja made by ThatGuyUSA (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -65,6 +65,9 @@
         {
             "name": "icon-captain"
         },
+        {
+            "name": "ninja"
+        },
         {
             "name": "orange"
         },
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png b/Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png
new file mode 100644 (file)
index 0000000..5312d9f
Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/ninja.png differ
index bcb2261e22805a559d3c46541c81439219472656..8f29d0eaff536b9af981da45edd9c66ac16e3bc1 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/orange.png differ
index b7029d819fe44470f18ac2eff3b50841d1179e7a..2ea87c6abeb1d664133c712fc04c7ca066da2121 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png and b/Resources/Textures/Objects/Misc/id_cards.rsi/pirate.png differ