cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts (fixes) pressure tanks looking like garbage (#21715)

Browse Source 
* Reverts (fixes) pressure tanks

* reruns

* linter

* attempt numero uno

* kinda works

need to fix da stripe

* repaths

* kill me

* rerun

* linter

* kill me 2x
This commit is contained in:
AMyriad
2024-06-18 06:00:31 +02:00
committed by GitHub
parent c5a885c0bc
commit 8a420d5569
11 changed files with 32 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_maps/RandomRuins/StationRuins/BoxStation/engine_teg.dmm
View File

@@ -352,7 +352,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/tank/toxins{
/obj/machinery/atmospherics/components/unary/tank/plasma{
dir = 8;
volume = 6e+006
},

2
_maps/RandomRuins/StationRuins/MetaStation/meta_teg.dmm
View File

@@ -908,7 +908,7 @@
/turf/open/floor/engine,
/area/engine/engineering)
"Hc" = (
/obj/machinery/atmospherics/components/unary/tank/toxins{
/obj/machinery/atmospherics/components/unary/tank/plasma{
dir = 4;
volume = 6e+006
},

2
_maps/map_files/AsteroidStation/AsteroidStation.dmm
View File

@@ -78649,7 +78649,7 @@
/turf/open/floor/circuit/telecomms/server,
/area/ai_monitored/secondarydatacoreserver)
"xyw" = (
/obj/machinery/atmospherics/components/unary/tank/toxins{
/obj/machinery/atmospherics/components/unary/tank/plasma{
dir = 4
},
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{

2
_maps/map_files/YogStation/YogStation.dmm
View File

@@ -34297,7 +34297,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/security/prison)
"jjR" = (
/obj/machinery/atmospherics/components/unary/tank/toxins,
/obj/machinery/atmospherics/components/unary/tank/plasma,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"jjS" = (

8
code/datums/greyscale/config_types/greyscale_configs.dm
View File

@@ -28,10 +28,10 @@
icon_file = 'icons/obj/atmospherics/prototype_canister.dmi'
json_config = 'code/datums/greyscale/json_configs/canister_proto.json'
/datum/greyscale_config/stationary_canister
name = "Stationary Canister"
icon_file = 'icons/obj/atmospherics/stationary_canisters.dmi'
json_config = 'code/datums/greyscale/json_configs/smooth_canister_stationary.json'
/datum/greyscale_config/pressure_tank
name = "Pressure Tank"
icon_file = 'icons/obj/atmospherics/pressure_tank.dmi'
json_config = 'code/datums/greyscale/json_configs/pressure_tank.json'
/datum/greyscale_config/carp
name = "Space Carp"

10
code/datums/greyscale/json_configs/pressure_tank.json Normal file
View File

@@ -0,0 +1,10 @@
{
"base": [
{
"type": "icon_state",
"icon_state": "base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}

186
code/datums/greyscale/json_configs/smooth_canister_stationary.json
View File

@@ -1,186 +0,0 @@
{
"smooth": [
{
"type": "icon_state",
"icon_state": "smooth",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"window-fg": [
{
"type": "icon_state",
"icon_state": "window-fg",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"window-bg": [
{
"type": "icon_state",
"icon_state": "window-bg",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"1-i": [
{
"type": "icon_state",
"icon_state": "1-i",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"2-i": [
{
"type": "icon_state",
"icon_state": "2-i",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"3-i": [
{
"type": "icon_state",
"icon_state": "3-i",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"4-i": [
{
"type": "icon_state",
"icon_state": "4-i",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"1-n": [
{
"type": "icon_state",
"icon_state": "1-n",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"2-n": [
{
"type": "icon_state",
"icon_state": "2-n",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"3-s": [
{
"type": "icon_state",
"icon_state": "3-s",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"4-s": [
{
"type": "icon_state",
"icon_state": "4-s",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"1-w": [
{
"type": "icon_state",
"icon_state": "1-w",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"2-e": [
{
"type": "icon_state",
"icon_state": "2-e",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"3-w": [
{
"type": "icon_state",
"icon_state": "3-w",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"4-e": [
{
"type": "icon_state",
"icon_state": "4-e",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"1-nw": [
{
"type": "icon_state",
"icon_state": "1-nw",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"2-ne": [
{
"type": "icon_state",
"icon_state": "2-ne",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"3-sw": [
{
"type": "icon_state",
"icon_state": "3-sw",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"4-se": [
{
"type": "icon_state",
"icon_state": "4-se",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"1-f": [
{
"type": "icon_state",
"icon_state": "1-f",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"2-f": [
{
"type": "icon_state",
"icon_state": "2-f",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"3-f": [
{
"type": "icon_state",
"icon_state": "3-f",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
],
"4-f": [
{
"type": "icon_state",
"icon_state": "4-f",
"blend_mode": "overlay",
"color_ids": [ 1 ]
}
]
}

25
code/modules/atmospherics/machinery/components/unary_devices/tank.dm
View File

@@ -1,18 +1,18 @@
#define AIR_CONTENTS ((25*ONE_ATMOSPHERE)*(air_contents.return_volume())/(R_IDEAL_GAS_EQUATION*air_contents.return_temperature()))
/obj/machinery/atmospherics/components/unary/tank
icon = 'icons/obj/atmospherics/stationary_canisters.dmi'
icon_state = "smooth"
name = "pressure tank"
desc = "A large vessel containing pressurized gas."
icon = 'icons/obj/atmospherics/pressure_tank.dmi'
icon_state = "base"
max_integrity = 800
density = TRUE
layer = ABOVE_WINDOW_LAYER
pipe_flags = PIPING_ONE_PER_TURF
greyscale_config = /datum/greyscale_config/stationary_canister
greyscale_config = /datum/greyscale_config/pressure_tank
greyscale_colors = "#ffffff"
var/volume = 10000 //in liters
@@ -25,12 +25,12 @@
air_contents.set_temperature(T20C)
if(gas_type)
air_contents.set_moles(gas_type, AIR_CONTENTS)
name = "[name] ([GLOB.gas_data.names[gas_type]])"
name = "[name] ([GLOB.gas_data.names[gas_type]])" // Automatically names them after gas type
set_piping_layer(piping_layer)
/obj/machinery/atmospherics/components/unary/tank/air
greyscale_colors = "#c6c0b5"
name = "pressure tank (Air)"
greyscale_colors = "#f5f3f0"
/obj/machinery/atmospherics/components/unary/tank/air/Initialize(mapload)
. = ..()
@@ -40,24 +40,27 @@
/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide
gas_type = GAS_CO2
greyscale_colors = "#2f2f38"
/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide/Initialize(mapload)
. = ..()
var/datum/gas_mixture/air_contents = airs[1]
air_contents.set_moles(GAS_CO2, AIR_CONTENTS)
/obj/machinery/atmospherics/components/unary/tank/toxins
greyscale_colors = "#f62800"
/obj/machinery/atmospherics/components/unary/tank/plasma
gas_type = GAS_PLASMA
greyscale_config = null
greyscale_colors = null
icon_state = "plasma"
/obj/machinery/atmospherics/components/unary/tank/toxins/Initialize(mapload)
/obj/machinery/atmospherics/components/unary/tank/plasma/Initialize(mapload)
. = ..()
var/datum/gas_mixture/air_contents = airs[1]
air_contents.set_moles(GAS_PLASMA, AIR_CONTENTS)
/obj/machinery/atmospherics/components/unary/tank/oxygen
greyscale_colors = "#2786E5"
gas_type = GAS_O2
greyscale_colors = "#148df4"
/obj/machinery/atmospherics/components/unary/tank/oxygen/Initialize(mapload)
. = ..()
@@ -65,8 +68,8 @@
air_contents.set_moles(GAS_O2, AIR_CONTENTS)
/obj/machinery/atmospherics/components/unary/tank/nitrogen
greyscale_colors = "#d41010"
gas_type = GAS_N2
greyscale_colors = "#2d8f44"
/obj/machinery/atmospherics/components/unary/tank/nitrogen/Initialize(mapload)
. = ..()

BIN
icons/obj/atmospherics/pipes/pressure_tank.dmi
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
icons/obj/atmospherics/pressure_tank.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
icons/obj/atmospherics/stationary_canisters.dmi
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB