Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tweak] Better Icons #168

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@
heldPrefix: blue
- type: IdCard
jobTitle: Centcom Agent
jobIcon: JobIconDeathSquad # WWDP

- type: entity
name: passenger ID card
Expand Down Expand Up @@ -891,6 +892,7 @@
- JobIconChiefJustice # Delta V - Added justice dept
- JobIconProsecutor # Delta V - Added justice dept
- JobIconVisitor
- JobIconDeathSquad # WWDP
- type: ActivatableUI
key: enum.AgentIDCardUiKey.Key
inHandsOnly: true
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@
parent: JobIcon
id: JobIconUnknown
icon:
sprite: /Textures/Interface/Misc/job_icons.rsi
state: Unknown
sprite: /Textures/_White/Interface/Misc/job_icons.rsi # WWDP-Edit
state: Shrambled # WWDP-Edit
PuroSlavKing marked this conversation as resolved.
Show resolved Hide resolved

- type: statusIcon
parent: JobIcon
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/StatusEffects/security.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: statusIcon
id: SecurityIcon
abstract: true
offset: 1
locationPreference: Left
offset: 2 # WWDP-Edit
locationPreference: Right # WWDP-Edit
isShaded: true

- type: statusIcon
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/_White/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@
icon:
sprite: /Textures/Interface/Misc/job_icons.rsi
state: Maid

- type: statusIcon
parent: JobIcon
id: JobIconDeathSquad
icon:
sprite: /Textures/_White/Interface/Misc/job_icons.rsi
state: DeathSquad
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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 | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord) | Reshaded and edited by PuroSlavKing (Github)",
"size": {
"x": 8,
"y": 8
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 8
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/20ae083f140ac5b4da7e8bc40f95349001b6c086",
"copyright": "Taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/20ae083f140ac5b4da7e8bc40f95349001b6c086 | Reshaded by Skilets (Github) | Edited by PuroSlavKing (Github)",
"states": [
{
"name": "Fine"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Unknown.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png
2 changes: 1 addition & 1 deletion Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.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) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi",
"copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.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) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi | Reshaded by Skilets (Github) | Edited by PuroSlavKing (Github)",

"size": {
"x": 8,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi",
"copyright": "Taken from https://github.com/tgstation/tgstation/blob/7f654b6e8e59021607a9e888dfeb79920401c372/icons/mob/huds/hud.dmi | Reshaded by Skilets (Github) | Edited by PuroSlavKing (Github)",
"size": {
"x": 8,
"y": 8
Expand Down
22 changes: 22 additions & 0 deletions Resources/Textures/_White/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/pull/1247/files | Edited by PuroSlavKing (Github)",

"size": {
"x": 8,
"y": 8
},
"states": [
{
"name": "DeathSquad"
},
{
"name": "Shrambled",
"delays":
[
[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]
]
}
]
}
Loading