cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 16:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some things being layered under grilles and other objects (#9669)

Browse Source
This commit is contained in:
fernerr
2020-08-12 16:51:49 +02:00
committed by GitHub
parent f8ceaec432
commit d29a55b7a9
6 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/doors/airlock_control.dm
View File

@@ -154,9 +154,10 @@
return ..() return ..()
/obj/machinery/airlock_sensor /obj/machinery/airlock_sensor
name = "airlock sensor"
icon = 'icons/obj/airlock_machines.dmi' icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off" icon_state = "airlock_sensor_off"
name = "airlock sensor" layer = OBJ_LAYER
anchored = 1 anchored = 1
power_channel = ENVIRON power_channel = ENVIRON
@@ -233,9 +234,10 @@
command = "cycle_exterior" command = "cycle_exterior"
/obj/machinery/access_button /obj/machinery/access_button
name = "access button"
icon = 'icons/obj/airlock_machines.dmi' icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_standby" icon_state = "access_button_standby"
name = "access button" layer = OBJ_LAYER
anchored = 1 anchored = 1
power_channel = ENVIRON power_channel = ENVIRON

1
code/game/machinery/doors/brigdoors.dm
View File

@@ -19,6 +19,7 @@
icon_state = "frame" icon_state = "frame"
desc = "A remote control for a door." desc = "A remote control for a door."
req_access = list(access_brig) req_access = list(access_brig)
layer = OBJ_LAYER
anchored = 1.0 // can't pick it up anchored = 1.0 // can't pick it up
density = 0 // can walk through it. density = 0 // can walk through it.
var/id = null // id of door it controls. var/id = null // id of door it controls.

1
code/game/machinery/embedded_controller/embedded_controller_base.dm
View File

@@ -3,6 +3,7 @@
name = "Embedded Controller" name = "Embedded Controller"
anchored = 1 anchored = 1
layer = OBJ_LAYER
use_power = 1 use_power = 1
idle_power_usage = 10 idle_power_usage = 10

2
code/game/machinery/flasher.dm
View File

@@ -5,6 +5,7 @@
desc = "A wall-mounted flashbulb device." desc = "A wall-mounted flashbulb device."
icon = 'icons/obj/stationobjs.dmi' icon = 'icons/obj/stationobjs.dmi'
icon_state = "mflash1" icon_state = "mflash1"
layer = OBJ_LAYER
var/id = null var/id = null
var/range = 2 //this is roughly the size of brig cell var/range = 2 //this is roughly the size of brig cell
var/disable = 0 var/disable = 0
@@ -22,6 +23,7 @@
name = "portable flasher" name = "portable flasher"
desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements."
icon_state = "pflash1" icon_state = "pflash1"
layer = OBJ_LAYER - 0.01
strength = 8 strength = 8
anchored = 0 anchored = 0
base_state = "pflash" base_state = "pflash"

3
code/game/machinery/status_display.dm
View File

@@ -10,9 +10,10 @@
// Alert status // Alert status
// And arbitrary messages set by comms computer // And arbitrary messages set by comms computer
/obj/machinery/status_display /obj/machinery/status_display
name = "status display"
icon = 'icons/obj/status_display.dmi' icon = 'icons/obj/status_display.dmi'
icon_state = "frame" icon_state = "frame"
name = "status display" layer = OBJ_LAYER
anchored = 1 anchored = 1
density = 0 density = 0
use_power = 1 use_power = 1

4
html/changelogs/Ferner-200812-bugfix_machinerylayers.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Ferner
delete-after: True
changes:
- bugfix: "Fixed some machinery type objects being layered underneath grilles."