cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Layers are now defines (#17949)

Browse Source 
* Layers are now defines

* this looks better

* GAS_phil_LAYER

* no message

* remove the three unneeded defines

* no message
This commit is contained in:
Joan Lung
2016-05-27 22:16:21 +02:00
committed by phil235
parent b61d1fd81f
commit 2cfb2d8eed
156 changed files with 296 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -124,7 +124,7 @@
icon_state = "orb"
var/obj/item/device/wisp_lantern/home
luminosity = 7
layer = FLY_LAYER - 0.3
layer = ABOVE_ALL_MOB_LAYER
/obj/item/device/warp_cube
name = "blue cube"
code/modules/mining/lavaland/ruins/gym.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon = 'goon/icons/obj/fitness.dmi'
icon_state = "punchingbag"
anchored = 1
layer = MOB_LAYER+1 // TODO LAYER
layer = WALL_OBJ_LAYER
var/list/hit_sounds = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg',\
'sound/weapons/punch1.ogg', 'sound/weapons/punch2.ogg', 'sound/weapons/punch3.ogg', 'sound/weapons/punch4.ogg')
@@ -69,7 +69,7 @@
user.Stun(4)
user.loc = src.loc
var/image/W = image('goon/icons/obj/fitness.dmi',"fitnessweight-w")
W.layer = MOB_LAYER+1
W.layer = WALL_OBJ_LAYER
overlays += W
var/bragmessage = pick("pushing it to the limit","going into overdrive","burning with determination","rising up to the challenge", "getting strong now","getting ripped")
user.visible_message("<B>[user] is [bragmessage]!</B>")
code/modules/mining/lavaland/weather.dm
+2 -2
View File
@@ -22,7 +22,7 @@
var/start_up_overlay = "lava"
var/duration_overlay = "lava"
var/overlay_layer = 10 //This is the default area layer, and above everything else. 2 is floors/below walls and mobs.
var/overlay_layer = AREA_LAYER //This is the default area layer, and above everything else. TURF_LAYER is floors/below walls and mobs.
var/purely_aesthetic = FALSE //If we just want gentle rain that doesn't hurt people
var/list/impacted_areas = list()
var/immunity_type = "storm"
@@ -95,6 +95,6 @@
if(END_STAGE)
N.icon_state = initial(N.icon_state)
N.icon = 'icons/turf/areas.dmi'
N.layer = 10 //Just default back to normal area stuff since I assume setting a var is faster than initial
N.layer = AREA_LAYER //Just default back to normal area stuff since I assume setting a var is faster than initial
N.invisibility = INVISIBILITY_MAXIMUM
N.opacity = 0
code/modules/mining/lavaland/weather_types.dm
+3 -3
View File
@@ -16,7 +16,7 @@
start_up_overlay = "lava"
duration_overlay = "lava"
overlay_layer = 2 //Covers floors only
overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only
immunity_type = "lava"
@@ -50,7 +50,7 @@
start_up_overlay = ""
duration_overlay = ""
overlay_layer = 10
overlay_layer = AREA_LAYER
/datum/weather/advanced_darkness/update_areas()
for(var/area/A in impacted_areas)
@@ -80,7 +80,7 @@
start_up_overlay = "light_ash"
duration_overlay = "ash_storm"
overlay_layer = 10
overlay_layer = AREA_LAYER
immunity_type = "ash"