cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 05:51:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes various issues with layers (#18846)

Browse Source 
Fixes #18842, among other misc issues

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2024-04-03 20:17:21 +00:00
committed by GitHub
co-authored by Cody Brittain
parent 49188243fd
commit 03c61e542c
7 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/pipes.dm
-17
View File
@@ -7,7 +7,6 @@
var/volume = 0
force = 25
layer = PIPE_LAYER
use_power = POWER_USE_OFF
var/alert_pressure = ATMOS_DEFAULT_ALERT_PRESSURE
@@ -373,7 +372,6 @@
a Universal Adapter pipe."
icon_state = "intact-fuel"
connect_types = CONNECT_TYPE_FUEL
layer = 2.40
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -384,7 +382,6 @@
a Universal Adapter pipe."
icon_state = "intact-aux"
connect_types = CONNECT_TYPE_AUX
layer = 2.41
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -441,7 +438,6 @@
a Universal Adapter pipe."
icon_state = "intact-fuel"
connect_types = CONNECT_TYPE_FUEL
layer = 2.40
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -452,7 +448,6 @@
a Universal Adapter pipe."
icon_state = "intact-aux"
connect_types = CONNECT_TYPE_AUX
layer = 2.41
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -698,7 +693,6 @@
a Universal Adapter pipe."
icon_state = "map-fuel"
connect_types = CONNECT_TYPE_FUEL
layer = 2.40
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -709,7 +703,6 @@
a Universal Adapter pipe."
icon_state = "map-aux"
connect_types = CONNECT_TYPE_AUX
layer = 2.41
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -766,7 +759,6 @@
a Universal Adapter pipe."
icon_state = "map-fuel"
connect_types = CONNECT_TYPE_FUEL
layer = 2.40
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -777,7 +769,6 @@
a Universal Adapter pipe."
icon_state = "map-aux"
connect_types = CONNECT_TYPE_AUX
layer = 2.41
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -1025,7 +1016,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-fuel"
connect_types = CONNECT_TYPE_FUEL
layer = 2.38
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -1036,7 +1026,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-aux"
connect_types = CONNECT_TYPE_AUX
layer = 2.39
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -1093,7 +1082,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-fuel"
connect_types = CONNECT_TYPE_FUEL
layer = 2.38
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -1104,7 +1092,6 @@
a Universal Adapter pipe."
icon_state = "map_4way-aux"
connect_types = CONNECT_TYPE_AUX
layer = 2.39
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -1231,7 +1218,6 @@
name = "fuel pipe endcap"
desc = "An endcap for fuel pipes"
connect_types = CONNECT_TYPE_FUEL
layer = 2.40
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -1239,7 +1225,6 @@
name = "auxiliary pipe endcap"
desc = "An endcap for auxiliary pipes"
connect_types = CONNECT_TYPE_AUX
layer = 2.41
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
@@ -1266,7 +1251,6 @@
name = "fuel pipe endcap"
desc = "An endcap for fuel pipes"
connect_types = CONNECT_TYPE_FUEL
layer = 2.40
icon_connect_type = "-fuel"
color = PIPE_COLOR_YELLOW
@@ -1274,7 +1258,6 @@
name = "auxiliary pipe endcap"
desc = "An endcap for auxiliary pipes"
connect_types = CONNECT_TYPE_AUX
layer = 2.41
icon_connect_type = "-aux"
color = PIPE_COLOR_CYAN
code/modules/power/lights/construction.dm
+2 -3
View File
@@ -206,7 +206,6 @@
icon = 'icons/obj/machinery/light.dmi'
icon_state = "slight-construct-stage1"
anchored = TRUE
layer = 5
stage = 1
fixture_type = "spotlight"
sheets_refunded = 3
@@ -217,7 +216,7 @@
icon = 'icons/obj/machinery/light.dmi'
icon_state = "floor-construct-stage1"
anchored = TRUE
layer = 2.5
layer = TURF_DETAIL_LAYER
stage = 1
fixture_type = "floorbulb"
sheets_refunded = 1
@@ -228,6 +227,6 @@
icon = 'icons/obj/machinery/light.dmi'
icon_state = "floortube-construct-stage1"
anchored = TRUE
layer = 2.5
layer = TURF_DETAIL_LAYER
stage = 1
fixture_type = "floorlight"
code/modules/power/lights/fixtures.dm
+2 -2
View File
@@ -76,7 +76,7 @@
icon_state = "floortube_example"
base_state = "floortube"
desc = "A lighting fixture. This one is set into the floor."
layer = 2.5
layer = TURF_DETAIL_LAYER
fitting_has_empty_icon = TRUE
fitting_is_on_floor = TRUE
@@ -100,7 +100,7 @@
icon_state = "floor_example"
base_state = "floor"
desc = "A small lighting fixture. This one is set into the floor."
layer = 2.5
layer = TURF_DETAIL_LAYER
fitting_is_on_floor = TRUE
/obj/machinery/light/small/emergency