Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes ID card sprites (#2764)

Browse Source
This commit is contained in:
Swept
2020-12-18 10:09:53 +00:00
committed by GitHub
parent a679e691c2
commit 740fe65a39
16 changed files with 246 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View File

@@ -7,7 +7,6 @@
components: components:
- type: Sprite - type: Sprite
sprite: Objects/Misc/id_cards.rsi sprite: Objects/Misc/id_cards.rsi
- type: Clothing - type: Clothing
Slots: Slots:
- idcard - idcard
@@ -26,9 +25,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idassistant - state: idassistant
- type: PresetIdCard - type: PresetIdCard
job: Assistant job: Assistant
@@ -40,9 +37,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: gold - state: gold
- state: assigned
- state: idcaptain - state: idcaptain
- type: Clothing - type: Clothing
HeldPrefix: gold HeldPrefix: gold
- type: PresetIdCard - type: PresetIdCard
@@ -56,9 +51,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idsecurityofficer - state: idsecurityofficer
- type: PresetIdCard - type: PresetIdCard
job: SecurityOfficer job: SecurityOfficer
@@ -70,9 +63,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idwarden - state: idwarden
- type: PresetIdCard - type: PresetIdCard
job: Warden job: Warden
@@ -84,9 +75,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idstationengineer - state: idstationengineer
- type: PresetIdCard - type: PresetIdCard
job: StationEngineer job: StationEngineer
@@ -98,9 +87,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idmedicaldoctor - state: idmedicaldoctor
- type: PresetIdCard - type: PresetIdCard
job: MedicalDoctor job: MedicalDoctor
@@ -112,9 +99,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idcargotechnician - state: idcargotechnician
- type: PresetIdCard - type: PresetIdCard
job: CargoTechnician job: CargoTechnician
@@ -126,9 +111,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idquartermaster - state: idquartermaster
- type: PresetIdCard - type: PresetIdCard
job: Quartermaster job: Quartermaster
@@ -140,9 +123,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idscientist - state: idscientist
- type: PresetIdCard - type: PresetIdCard
job: Scientist job: Scientist
@@ -154,9 +135,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idclown - state: idclown
- type: PresetIdCard - type: PresetIdCard
job: Clown job: Clown
@@ -168,9 +147,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idmime - state: idmime
- type: PresetIdCard - type: PresetIdCard
job: Mime job: Mime
@@ -182,7 +159,7 @@
# - type: Sprite # - type: Sprite
# layers: # layers:
# - state: default # - state: default
# - state: assigned #
# - state: idchaplain # - state: idchaplain
# #
# - type: PresetIdCard # - type: PresetIdCard
@@ -196,9 +173,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idjanitor - state: idjanitor
- type: PresetIdCard - type: PresetIdCard
job: Janitor job: Janitor
@@ -210,9 +185,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idbartender - state: idbartender
- type: PresetIdCard - type: PresetIdCard
job: Bartender job: Bartender
@@ -224,9 +197,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idcook - state: idcook
- type: PresetIdCard - type: PresetIdCard
job: Chef job: Chef
@@ -238,13 +209,10 @@
- type: Sprite - type: Sprite
layers: layers:
- state: default - state: default
- state: assigned
- state: idbotanist - state: idbotanist
- type: PresetIdCard - type: PresetIdCard
job: Botanist job: Botanist
- type: entity - type: entity
parent: IDCardStandard parent: IDCardStandard
id: HoPIDCard id: HoPIDCard
@@ -253,9 +221,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: silver - state: silver
- state: assigned
- state: idheadofpersonnel - state: idheadofpersonnel
- type: Clothing - type: Clothing
HeldPrefix: silver HeldPrefix: silver
- type: PresetIdCard - type: PresetIdCard
@@ -269,9 +235,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: silver - state: silver
- state: assigned
- state: idchiefengineer - state: idchiefengineer
- type: Clothing - type: Clothing
HeldPrefix: silver HeldPrefix: silver
- type: PresetIdCard - type: PresetIdCard
@@ -285,9 +249,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: silver - state: silver
- state: assigned
- state: idchiefmedicalofficer - state: idchiefmedicalofficer
- type: Clothing - type: Clothing
HeldPrefix: silver HeldPrefix: silver
- type: PresetIdCard - type: PresetIdCard
@@ -301,9 +263,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: silver - state: silver
- state: assigned
- state: idresearchdirector - state: idresearchdirector
- type: Clothing - type: Clothing
HeldPrefix: silver HeldPrefix: silver
- type: PresetIdCard - type: PresetIdCard
@@ -317,9 +277,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: silver - state: silver
- state: assigned
- state: idheadofsecurity - state: idheadofsecurity
- type: Clothing - type: Clothing
HeldPrefix: silver HeldPrefix: silver
- type: PresetIdCard - type: PresetIdCard
@@ -333,9 +291,7 @@
- type: Sprite - type: Sprite
layers: layers:
- state: gold - state: gold
- state: assigned
- state: idcentcom - state: idcentcom
- type: Clothing - type: Clothing
HeldPrefix: gold HeldPrefix: gold
- type: IdCard - type: IdCard

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/assigned.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 125 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idassistant.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 171 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 175 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 180 B

After

Width:  |  Height:  |  Size: 184 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 231 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idchiefmedicalofficer.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 234 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idgeneticist.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 187 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 191 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 197 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idresearchdirector.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 206 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 214 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 178 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idvirologist.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 210 B

BIN
Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 214 B

846
Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
View File

@@ -1,603 +1,247 @@
{ {
"version": 1, "version": 1,
"size": { "license": "CC-BY-SA-3.0",
"x": 32, "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e",
"y": 32 "size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "default",
"directions": 1
}, },
"states": [ {
{ "name": "centcom",
"name": "assigned", "directions": 1
"directions": 1, },
"delays": [ {
[ "name": "ert_chaplain",
1.0 "directions": 1
] },
] {
}, "name": "ert_commander",
{ "directions": 1
"name": "centcom", },
"directions": 1, {
"delays": [ "name": "ert_engineer",
[ "directions": 1
1.0 },
] {
] "name": "ert_janitor",
}, "directions": 1
{ },
"name": "default", {
"directions": 1, "name": "ert_medic",
"delays": [ "directions": 1
[ },
1.0 {
] "name": "ert_security",
] "directions": 1
}, },
{ {
"name": "default-inhand-left", "name": "gold",
"directions": 4, "directions": 1
"delays": [ },
[ {
1.0 "name": "idassistant",
], "directions": 1
[ },
1.0 {
], "name": "idatmospherictechnician",
[ "directions": 1
1.0 },
], {
[ "name": "idbartender",
1.0 "directions": 1
] },
] {
}, "name": "idbotanist",
{ "directions": 1
"name": "default-inhand-right", },
"directions": 4, {
"delays": [ "name": "idcaptain",
[ "directions": 1
1.0 },
], {
[ "name": "idcargotechnician",
1.0 "directions": 1
], },
[ {
1.0 "name": "idcentcom",
], "directions": 1
[ },
1.0 {
] "name": "idchaplain",
] "directions": 1
}, },
{ {
"name": "ert_chaplain", "name": "idchemist",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "idchiefengineer",
] "directions": 1
] },
}, {
{ "name": "idchiefmedicalofficer",
"name": "ert_commander", "directions": 1
"directions": 1, },
"delays": [ {
[ "name": "idclown",
1.0 "directions": 1
] },
] {
}, "name": "idcook",
{ "directions": 1
"name": "ert_engineer", },
"directions": 1, {
"delays": [ "name": "idcurator",
[ "directions": 1
1.0 },
] {
] "name": "iddetective",
}, "directions": 1
{ },
"name": "ert_janitor", {
"directions": 1, "name": "idgeneticist",
"delays": [ "directions": 1
[ },
1.0 {
] "name": "idheadofpersonnel",
] "directions": 1
}, },
{ {
"name": "ert_medic", "name": "idheadofsecurity",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "idjanitor",
] "directions": 1
] },
}, {
{ "name": "idlawyer",
"name": "ert_security", "directions": 1
"directions": 1, },
"delays": [ {
[ "name": "idmedicaldoctor",
1.0 "directions": 1
] },
] {
}, "name": "idmime",
{ "directions": 1
"name": "gold", },
"directions": 1, {
"delays": [ "name": "idparamedic",
[ "directions": 1
1.0 },
] {
] "name": "idprisoner",
}, "directions": 1
{ },
"name": "gold-inhand-left", {
"directions": 4, "name": "idquartermaster",
"delays": [ "directions": 1
[ },
1.0 {
], "name": "idresearchdirector",
[ "directions": 1
1.0 },
], {
[ "name": "idroboticist",
1.0 "directions": 1
], },
[ {
1.0 "name": "idscientist",
] "directions": 1
] },
}, {
{ "name": "idsecurityofficer",
"name": "gold-inhand-right", "directions": 1
"directions": 4, },
"delays": [ {
[ "name": "idshaftminer",
1.0 "directions": 1
], },
[ {
1.0 "name": "idstationengineer",
], "directions": 1
[ },
1.0 {
], "name": "idunknown",
[ "directions": 1
1.0 },
] {
] "name": "idvirologist",
}, "directions": 1
{ },
"name": "idassistant", {
"directions": 1, "name": "idwarden",
"delays": [ "directions": 1
[ },
1.0 {
] "name": "orange",
] "directions": 1
}, },
{ {
"name": "idatmospherictechnician", "name": "prisoner_001",
"directions": 1, "directions": 1
"delays": [ },
[ {
1.0 "name": "prisoner_002",
] "directions": 1
] },
}, {
{ "name": "prisoner_003",
"name": "idbartender", "directions": 1
"directions": 1, },
"delays": [ {
[ "name": "prisoner_004",
1.0 "directions": 1
] },
] {
}, "name": "prisoner_005",
{ "directions": 1
"name": "idbotanist", },
"directions": 1, {
"delays": [ "name": "prisoner_006",
[ "directions": 1
1.0 },
] {
] "name": "prisoner_007",
}, "directions": 1
{ },
"name": "idcaptain", {
"directions": 1, "name": "silver",
"delays": [ "directions": 1
[ },
1.0 {
] "name": "syndie",
] "directions": 1
}, },
{ {
"name": "idcargotechnician", "name": "gold-inhand-left",
"directions": 1, "directions": 4
"delays": [ },
[ {
1.0 "name": "gold-inhand-right",
] "directions": 4
] },
}, {
{ "name": "default-inhand-right",
"name": "idcentcom", "directions": 4
"directions": 1, },
"delays": [ {
[ "name": "default-inhand-right",
1.0 "directions": 4
] },
] {
}, "name": "silver-inhand-left",
{ "directions": 4
"name": "idchaplain", },
"directions": 1, {
"delays": [ "name": "silver-inhand-right",
[ "directions": 4
1.0 }
] ]
] }
},
{
"name": "idchemist",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idchiefengineer",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idchiefmedicalofficer",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idclown",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idcook",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idcurator",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "iddetective",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idgeneticist",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idheadofpersonnel",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idheadofsecurity",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idjanitor",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idlawyer",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idmedicaldoctor",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idmime",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idparamedic",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idprisoner",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idquartermaster",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idresearchdirector",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idroboticist",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idscientist",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idsecurityofficer",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idshaftminer",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idstationengineer",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idunknown",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idvirologist",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "idwarden",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "orange",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_001",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_002",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_003",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_004",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_005",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_006",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "prisoner_007",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "silver",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "silver-inhand-left",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "silver-inhand-right",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "syndie",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}