Skip to content

Commit

Permalink
Merge pull request #2 from Inorien/sprites-again
Browse files Browse the repository at this point in the history
Sprites again
  • Loading branch information
spess-empyrean authored Jan 12, 2025
2 parents c774009 + 7f880d2 commit 90e9e6a
Show file tree
Hide file tree
Showing 1,407 changed files with 1,726 additions and 2,422 deletions.
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/Clothing/Head/Hats/hoshat.rsi/icon.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/Clothing/Head/Hats/hoshat.rsi/inhand-left.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/Clothing/Head/Hats/hoshat.rsi/inhand-right.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.
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.
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.
14 changes: 14 additions & 0 deletions Resources/Textures/Objects/Devices/camera_bug.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "created by pofitlo",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "camera_bug"
}
]
}
Binary file modified Resources/Textures/Objects/Economy/cash.rsi/cash.png
Binary file modified Resources/Textures/Objects/Economy/cash.rsi/cash_10.png
Binary file modified Resources/Textures/Objects/Economy/cash.rsi/cash_100.png
Binary file modified Resources/Textures/Objects/Economy/cash.rsi/cash_1000.png
Binary file modified Resources/Textures/Objects/Economy/cash.rsi/cash_500.png
Binary file modified Resources/Textures/Objects/Fun/pai.rsi/icon-pai-off.png
Binary file modified Resources/Textures/Objects/Fun/pai.rsi/pai-base.png
Binary file modified Resources/Textures/Objects/Fun/pai.rsi/pai-off-overlay.png
Binary file modified Resources/Textures/Objects/Fun/pai.rsi/pai-on-overlay.png
Binary file modified Resources/Textures/Objects/Fun/pai.rsi/pai-searching-overlay.png
Binary file modified Resources/Textures/Objects/Materials/ore.rsi/bananium.png
Binary file modified Resources/Textures/Objects/Materials/ore.rsi/diamond.png
Binary file modified Resources/Textures/Objects/Materials/ore.rsi/gold.png
Binary file modified Resources/Textures/Objects/Materials/ore.rsi/iron.png
82 changes: 81 additions & 1 deletion Resources/Textures/Objects/Materials/ore.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd",
"copyright": "silver, plasma taken from https://github.com/vgstation-coders/vgstation13 at commit f2ef221849675915a78fd92fe622c32ab740e085, spacequartz taken from https://github.com/goonstation/goonstation at commit b51daf824df46a3a1426475f982c09479818e522 and reshaded by Alekshhh, bananium; uranium; iron; gold; coal by Alekshhh, diamond at commit https://github.com/tgstation/tgstation/pull/78524, edited by TheShuEd. Inhands by mubururu_ (github).",
"size": {
"x": 32,
"y": 32
Expand All @@ -10,30 +10,102 @@
{
"name": "bananium"
},
{
"name": "bananium-inhand-left",
"directions": 4
},
{
"name": "bananium-inhand-right",
"directions": 4
},
{
"name": "gold"
},
{
"name": "gold-inhand-left",
"directions": 4
},
{
"name": "gold-inhand-right",
"directions": 4
},
{
"name": "iron"
},
{
"name": "iron-inhand-left",
"directions": 4
},
{
"name": "iron-inhand-right",
"directions": 4
},
{
"name": "uranium"
},
{
"name": "uranium-inhand-left",
"directions": 4
},
{
"name": "uranium-inhand-right",
"directions": 4
},
{
"name": "plasma"
},
{
"name": "plasma-inhand-left",
"directions": 4
},
{
"name": "plasma-inhand-right",
"directions": 4
},
{
"name": "spacequartz"
},
{
"name": "spacequartz-inhand-left",
"directions": 4
},
{
"name": "spacequartz-inhand-right",
"directions": 4
},
{
"name": "silver"
},
{
"name": "silver-inhand-left",
"directions": 4
},
{
"name": "silver-inhand-right",
"directions": 4
},
{
"name": "coal"
},
{
"name": "coal-inhand-left",
"directions": 4
},
{
"name": "coal-inhand-right",
"directions": 4
},
{
"name": "salt"
},
{
"name": "salt-inhand-left",
"directions": 4
},
{
"name": "salt-inhand-right",
"directions": 4
},
{
"name": "bluespace"
},
Expand All @@ -42,6 +114,14 @@
},
{
"name": "diamond"
},
{
"name": "diamond-inhand-left",
"directions": 4
},
{
"name": "diamond-inhand-right",
"directions": 4
}
]
}
Binary file modified Resources/Textures/Objects/Materials/ore.rsi/plasma.png
Binary file modified Resources/Textures/Objects/Materials/ore.rsi/uranium.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetNT.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetUSA.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetblack.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetblue.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetbrigmedic.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetbrown.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetcaptain.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetce.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetcentcom.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetclown.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetcmo.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetcult.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetgreen.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetgrey.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheethop.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheethos.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetian.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetmedical.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetmime.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetorange.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetpurple.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetqm.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetrainbow.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetrd.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetred.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetsyndie.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetwhite.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetwiz.png
Binary file modified Resources/Textures/Objects/Misc/bedsheets.rsi/sheetyellow.png
18 changes: 9 additions & 9 deletions Resources/Textures/Objects/Misc/bureaucracy.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 tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician.",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -40,6 +40,9 @@
{
"name": "folder-sec-doc"
},
{
"name": "folder-stamp-inverse"
},
{
"name": "label_cart"
},
Expand Down Expand Up @@ -209,6 +212,9 @@
{
"name": "paper_stamp-chaplain"
},
{
"name": "paper_stamp-lawyer"
},
{
"name": "paper_stamp-clown"
},
Expand Down Expand Up @@ -252,19 +258,13 @@
"name": "paper_stamp-generic"
},
{
"name": "paper_stamp-mantis"
"name": "paper_stamp-greytide"
},
{
"name": "paper_stamp-lawyer"
"name": "syndicate_card"
},
{
"name": "paper_stamp-psychologist"
},
{
"name": "paper_stamp-notary"
},
{
"name": "paper_stamp-signature"
}
]
}
Binary file modified Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_bin0.png
Binary file modified Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_bin1.png
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/ParadiseSS13/Paradise // Hand Sprites taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit 9bebd81ae0b0a7f952b59886a765c681205de31f",
"size": {
"x": 32,
"y": 32
Expand Down
129 changes: 69 additions & 60 deletions Resources/Textures/Objects/Misc/stamps.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,71 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "stamp-cap"
},
{
"name": "stamp-ce"
},
{
"name": "stamp-centcom"
},
{
"name": "stamp-chaplain"
},
{
"name": "stamp-clown"
},
{
"name": "stamp-cmo"
},
{
"name": "stamp-deny"
},
{
"name": "stamp-detective"
},
{
"name": "stamp-hop"
},
{
"name": "stamp-hos"
},
{
"name": "stamp-ok"
},
{
"name": "stamp-mime"
},
{
"name": "stamp-qm"
},
{
"name": "stamp-rd"
},
{
"name": "stamp-syndicate"
},
{
"name": "stamp-trader"
},
{
"name": "stamp-warden"
}
]
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos. stamp-lawyer is a darker version of stamp-cap. paper_stamp-greytide is a grey and shaded in version of stamp-hos. paper_stamp-psychologist is a recolored stamp-cmo.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "stamp-cap"
},
{
"name": "stamp-ce"
},
{
"name": "stamp-centcom"
},
{
"name": "stamp-chaplain"
},
{
"name": "stamp-lawyer"
},
{
"name": "stamp-clown"
},
{
"name": "stamp-cmo"
},
{
"name": "stamp-deny"
},
{
"name": "stamp-detective"
},
{
"name": "stamp-hop"
},
{
"name": "stamp-hos"
},
{
"name": "stamp-ok"
},
{
"name": "stamp-mime"
},
{
"name": "stamp-qm"
},
{
"name": "stamp-rd"
},
{
"name": "stamp-syndicate"
},
{
"name": "stamp-trader"
},
{
"name": "stamp-warden"
},
{
"name": "stamp-greytide"
},
{
"name": "stamp-psychologist"
}
]
}
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-cap.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-ce.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-centcom.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-chaplain.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-clown.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-cmo.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-deny.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-hop.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-hos.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-mime.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-ok.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-qm.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-rd.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-syndicate.png
Binary file modified Resources/Textures/Objects/Misc/stamps.rsi/stamp-warden.png
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
Binary file modified Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
Loading

0 comments on commit 90e9e6a

Please sign in to comment.