cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes Overlay Hidden w/o Mesons

Browse Source
This commit is contained in:
Neerti
2018-01-22 16:12:05 -05:00
parent d71a610a97
commit c2670a2bd5
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__defines/_planes+layers.dm
View File

@@ -58,6 +58,8 @@ What is the naming convention for planes or layers?
//////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
//#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define //#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define
#define DECALS_LAYER 2.01
#define OVERTURF_LAYER 2.1
#define DOOR_OPEN_LAYER 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6 #define DOOR_OPEN_LAYER 2.7 //Under all objects if opened. 2.7 due to tables being at 2.6
//#define OBJ_LAYER 3 //For easy recordkeeping; this is a byond define //#define OBJ_LAYER 3 //For easy recordkeeping; this is a byond define
#define DOOR_CLOSED_LAYER 3.1 //Above most items if closed #define DOOR_CLOSED_LAYER 3.1 //Above most items if closed
@@ -91,6 +93,7 @@ What is the naming convention for planes or layers?
#define PLANE_CH_SPECIAL 23 //Special role icon (revhead or w/e) #define PLANE_CH_SPECIAL 23 //Special role icon (revhead or w/e)
#define PLANE_CH_STATUS_OOC 24 //OOC status hud for spooks #define PLANE_CH_STATUS_OOC 24 //OOC status hud for spooks
#define PLANE_MESONS 30 //Stuff seen with mesons, like open ceilings. This is 30 for downstreams.
//Fullscreen overlays under inventory //Fullscreen overlays under inventory
#define PLANE_FULLSCREEN 90 //Blindness, mesons, druggy, etc #define PLANE_FULLSCREEN 90 //Blindness, mesons, druggy, etc

4
code/__defines/mobs.dm
View File

@@ -252,4 +252,6 @@
#define VIS_ADMIN2 17 #define VIS_ADMIN2 17
#define VIS_ADMIN3 18 #define VIS_ADMIN3 18
#define VIS_COUNT 18 //Must be highest number from above. #define VIS_MESONS 19
#define VIS_COUNT 19 //Must be highest number from above.

2
code/game/turfs/flooring/flooring_decals.dm
View File

@@ -6,7 +6,7 @@ var/list/floor_decals = list()
/obj/effect/floor_decal /obj/effect/floor_decal
name = "floor decal" name = "floor decal"
icon = 'icons/turf/flooring/decals.dmi' icon = 'icons/turf/flooring/decals.dmi'
layer = TURF_LAYER + 0.01 layer = DECALS_LAYER
var/supplied_dir var/supplied_dir
/obj/effect/floor_decal/New(var/newloc, var/newdir, var/newcolour) /obj/effect/floor_decal/New(var/newloc, var/newdir, var/newcolour)

11
code/game/turfs/simulated/floor_icon.dm
View File

@@ -1,5 +1,14 @@
var/list/flooring_cache = list() var/list/flooring_cache = list()
var/image/no_ceiling_image = null
/hook/startup/proc/setup_no_ceiling_image()
cache_no_ceiling_image()
/proc/cache_no_ceiling_image()
no_ceiling_image = image(icon = 'icons/turf/open_space.dmi', icon_state = "no_ceiling", layer = OVERTURF_LAYER)
no_ceiling_image.plane = PLANE_MESONS
/turf/simulated/floor/update_icon(var/update_neighbors) /turf/simulated/floor/update_icon(var/update_neighbors)
if(lava) if(lava)
@@ -87,7 +96,7 @@ var/list/flooring_cache = list()
// Show 'ceilingless' overlay. // Show 'ceilingless' overlay.
var/turf/above = GetAbove(src) var/turf/above = GetAbove(src)
if(above && isopenspace(above) && !istype(src, /turf/simulated/floor/outdoors)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways. if(above && isopenspace(above) && !istype(src, /turf/simulated/floor/outdoors)) // This won't apply to outdoor turfs since its assumed they don't have a ceiling anyways.
overlays |= image(icon = 'icons/turf/open_space.dmi', icon_state = "no_ceiling", layer = TURF_LAYER + 0.02) overlays |= no_ceiling_image
/turf/simulated/floor/proc/get_flooring_overlay(var/cache_key, var/icon_base, var/icon_dir = 0) /turf/simulated/floor/proc/get_flooring_overlay(var/cache_key, var/icon_base, var/icon_dir = 0)
if(!flooring_cache[cache_key]) if(!flooring_cache[cache_key])

2
code/modules/clothing/glasses/glasses.dm
View File

@@ -70,7 +70,7 @@ BLIND // can't see anything
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
toggleable = 1 toggleable = 1
vision_flags = SEE_TURFS vision_flags = SEE_TURFS
enables_planes = (VIS_FULLBRIGHT) enables_planes = list(VIS_FULLBRIGHT, VIS_MESONS)
/obj/item/clothing/glasses/meson/New() /obj/item/clothing/glasses/meson/New()
..() ..()

2
code/modules/mob/mob_planes.dm
View File

@@ -33,6 +33,8 @@
plane_masters[VIS_D_COLORBLIND] = new /obj/screen/plane_master/colorblindness //Colorblindness (affects world) plane_masters[VIS_D_COLORBLIND] = new /obj/screen/plane_master/colorblindness //Colorblindness (affects world)
plane_masters[VIS_D_COLORBLINDI]= new /obj/screen/plane_master/colorblindness/items //Colorblindness (items in HUD, subplane of above, don't toggle) plane_masters[VIS_D_COLORBLINDI]= new /obj/screen/plane_master/colorblindness/items //Colorblindness (items in HUD, subplane of above, don't toggle)
plane_masters[VIS_MESONS] = new /obj/screen/plane_master{plane = PLANE_MESONS} //Meson-specific things like open ceilings.
..() ..()
/datum/plane_holder/Destroy() /datum/plane_holder/Destroy()