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.

Sign up for GitHub

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

Sprite Tweaks & Da Big Vape #1111

Merged
merged 4 commits into from
Dec 24, 2024
Merged

Sprite Tweaks & Da Big Vape #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5397e1
tweaks to seclite sprite based on feedback
AftrLite Dec 21, 2024
62c84cc
Medkit tweaks based on feedback
AftrLite Dec 22, 2024
c82b3fa
New canisters + Gas Vapor
AftrLite Dec 24, 2024
4419115
Attribution
AftrLite Dec 24, 2024
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
10 changes: 5 additions & 5 deletions Resources/Prototypes/Atmospherics/gases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
heatCapacityRatio: 1.7
molarMass: 120
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlayState: plasma
gasOverlayState: plasma_atmos
color: FF3300
reagent: Plasma
pricePerMole: 0
Expand All @@ -47,7 +47,7 @@
heatCapacityRatio: 1.3
molarMass: 6
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlayState: tritium
gasOverlayState: tritium_atmos
color: 13FF4B
reagent: Tritium
pricePerMole: 2
Expand All @@ -59,7 +59,7 @@
heatCapacityRatio: 1.33
molarMass: 18
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlayState: water_vapor
gasOverlayState: water_vapor_atmos
color: bffffd
reagent: Water
pricePerMole: 0
Expand All @@ -71,7 +71,7 @@
heatCapacityRatio: 1.4
molarMass: 44
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlayState: miasma
gasOverlayState: miasma_atmos
gasMolesVisible: 2
gasVisbilityFactor: 3.5
color: 56941E
Expand All @@ -95,7 +95,7 @@
heatCapacityRatio: 1.33
molarMass: 50
gasOverlaySprite: /Textures/Effects/atmospherics.rsi
gasOverlayState: frezon
gasOverlayState: frezon_atmos
gasMolesVisible: 0.6
color: 3a758c
reagent: Frezon
Expand Down
Binary file added Resources/Textures/Effects/atmospherics.rsi/frezon_atmos.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 21 additions & 1 deletion Resources/Textures/Effects/atmospherics.rsi/meta.json
View file
Open in desktop
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 at 04e43d8c1d5097fdb697addd4395fb849dd341bd",
"copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd. New tritium, plasma, water vapor, miasma, and frezon by AftrLite(Github)",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -69,6 +69,26 @@
{
"name": "water_vapor_old",
"delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]
},
{
"name": "plasma_atmos",
"delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
},
{
"name": "tritium_atmos",
"delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
},
{
"name": "frezon_atmos",
"delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
},
{
"name": "water_vapor_atmos",
"delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
},
{
"name": "miasma_atmos",
"delays": [[0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09,0.09]]
}
]
}
Binary file added Resources/Textures/Effects/atmospherics.rsi/miasma_atmos.png
View file
Open in desktop
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/Effects/atmospherics.rsi/plasma_atmos.png
View file
Open in desktop
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/Effects/atmospherics.rsi/tritium_atmos.png
View file
Open in desktop
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/Effects/atmospherics.rsi/water_vapor_atmos.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/blackkit.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/brutekit.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/burnkit.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/firstaid.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/purplekit.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/radkit.png
View file
Open in desktop
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/Specific/Medical/firstaidkits.rsi/toxinkit.png
View file
Open in desktop
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/Tools/seclite.rsi/seclite-on.png
View file
Open in desktop
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/Tools/seclite.rsi/seclite-overlay.png
View file
Open in desktop
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/Tools/seclite.rsi/seclite.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/black-1.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/black.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/blue-1.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/blue.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/can-connector.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/can-o0.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/can-o1.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/can-o2.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/can-o3.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/can-open.png
View file
Open in desktop
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/Structures/Storage/canister.rsi/frezon-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/frezon.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/green-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/green.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/greenys.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/grey.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/locked.png
View file
Open in desktop
2 changes: 2 additions & 0 deletions Resources/Textures/Structures/Storage/canister.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
"name": "can-o0",
"delays": [
[
0.25,
0.25,
0.25,
0.25,
0.25,
Expand Down
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/orange.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/red-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/red.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/redws.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
View file
Open in desktop
Binary file modified Resources/Textures/Structures/Storage/canister.rsi/yellow.png
View file
Open in desktop
Loading