Skip to content

Commit

Permalink
IdCard Resprite (#537)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Resprite the IDCards with newers looking sprites, making them also
modular so easy to edit/create new cards without the need to make
compleatly new sprites.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] ID Cards
- [x] Cleanup

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/10b50980-b7d4-470d-b6d7-baf5a18b5710)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: We got new ID Cards the old ones were soo tiny that they were
lost.
  • Loading branch information
FoxxoTrystan committed Jul 14, 2024
1 parent d5e175e commit 18df90e
Show file tree
Hide file tree
Showing 131 changed files with 588 additions and 422 deletions.
443 changes: 335 additions & 108 deletions Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
components:
- type: Sprite
layers:
- state: orange
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: nyanoprisoner
- state: prisoner
- state: department
color: "#292929"
- state: subdepartment
color: "#A54900"
- state: warden
- type: PresetIdCard
job: Prisoner

Expand All @@ -18,9 +21,12 @@
components:
- type: Sprite
layers:
- state: orange
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: nyanogladiator
- state: default
- state: department
color: "#878787"
- state: subdepartment
color: "#878787"
- state: gladiator
- type: PresetIdCard
job: Gladiator

Expand All @@ -32,8 +38,11 @@
- type: Sprite
layers:
- state: default
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: nyanoprisonguard
- state: department
color: "#CB0000"
- state: subdepartment
color: "#CB0000"
- state: prisonguard
- type: PresetIdCard
job: PrisonGuard

Expand All @@ -45,8 +54,11 @@
- type: Sprite
layers:
- state: default
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: nyanomailcarrier
- state: department
color: "#B18644"
- state: subdepartment
color: "#B18644"
- state: mailcarrier
- type: PresetIdCard
job: MailCarrier

Expand All @@ -59,8 +71,11 @@
- type: Sprite
layers:
- state: default
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: nyanomartialartist
- state: department
color: "#878787"
- state: subdepartment
color: "#878787"
- state: martialartist
- type: PresetIdCard
job: MartialArtist

Expand All @@ -69,10 +84,13 @@
id: ForensicMantisIDCard
name: psionic mantis ID card # DeltaV - Rename Forensic Mantis to Psionic Mantis
components:
- type: Sprite
layers:
- state: default
- sprite: DeltaV/Objects/Misc/id_cards.rsi
state: nyanomantis
- type: PresetIdCard
job: ForensicMantis
- type: Sprite
layers:
- state: default
- state: department
color: "#C96DBF"
- state: subdepartment
color: "#C96DBF"
- state: detective
- type: PresetIdCard
job: ForensicMantis
4 changes: 2 additions & 2 deletions Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
sprite:
sprite: Objects/Consumable/Food/meat.rsi
state: corgi
#

- type: stealTargetGroup
id: CaptainIDCard
name: captain ID card
sprite:
sprite: Objects/Misc/id_cards.rsi
state: ert_commander #no one will know the difference.
state: gold

- type: stealTargetGroup
id: JetpackCaptainFilled
Expand Down
Binary file not shown.
32 changes: 0 additions & 32 deletions Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
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 added Resources/Textures/Objects/Misc/id_cards.rsi/cc.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/Objects/Misc/id_cards.rsi/centcom.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.
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/Objects/Misc/id_cards.rsi/default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/gold.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading

0 comments on commit 18df90e

Please sign in to comment.