Skip to content

Commit

Permalink
Revert "gods all seeing eye gazes down at me"
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint authored Nov 7, 2023
1 parent 1198674 commit 2674e34
Show file tree
Hide file tree
Showing 19 changed files with 2 additions and 346 deletions.
1 change: 0 additions & 1 deletion code/__DEFINES/colors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@
#define DEFAULT_HEX_COLOR_LEN 6

// Color filters
#define CHECK_LIGHT_OCCLUSION(turf) (turf.directional_opacity || turf.opacity)
/// Icon filter that creates ambient occlusion
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA")
/// Icon filter that creates gaussian blur
Expand Down
4 changes: 0 additions & 4 deletions code/__DEFINES/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#define FLOOR_PLANE -11

#define WALL_PLANE -10
#define WALL_RENDER_TARGET "*WALL_PLANE" //monkestation edit
#define GAME_PLANE -9
#define GAME_PLANE_FOV_HIDDEN -8
#define GAME_PLANE_UPPER -7
Expand Down Expand Up @@ -86,9 +85,6 @@

///---------------- MISC -----------------------

/// Shadowcasting
#define SHADOWCASTING_PLANE 18 // monkestation edit

///Pipecrawling images
#define PIPECRAWL_IMAGES_PLANE 20

Expand Down
3 changes: 1 addition & 2 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@
#define INIT_ORDER_STICKY_BAN -10
#define INIT_ORDER_LIGHTING -20
#define INIT_ORDER_OUTDOOR_EFFECTS -21 //monkestation addition
#define INIT_ORDER_SHADOWCASTING -22 // monkestation addition
#define INIT_ORDER_SHUTTLE -23 //monkestation edit -21 > -23
#define INIT_ORDER_SHUTTLE -22 //monkestation edit -21 > -22
#define INIT_ORDER_MINOR_MAPPING -40
#define INIT_ORDER_PATH -50
#define INIT_ORDER_EXPLOSIONS -69
Expand Down
23 changes: 0 additions & 23 deletions code/__HELPERS/~monkestation-helpers/triangles.dm

This file was deleted.

17 changes: 0 additions & 17 deletions code/_onclick/hud/rendering/plane_master.dm
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master)
name = "Wall"
documentation = "Holds all walls. We render this onto the game world. Separate so we can use this + space and floor planes as a guide for where byond blackness is NOT."
plane = WALL_PLANE
render_target = WALL_RENDER_TARGET // monkestation edit
render_relay_planes = list(RENDER_PLANE_GAME_WORLD, LIGHT_MASK_PLANE)

/atom/movable/screen/plane_master/wall/Initialize(mapload, datum/plane_master_group/home, offset)
Expand Down Expand Up @@ -661,19 +660,3 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master)
appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
render_relay_planes = list(RENDER_PLANE_MASTER)
allows_offsetting = FALSE

/atom/movable/screen/plane_master/shadowcasting
name = "Shadowcasting"
documentation = "Holds shadowcasting images so you can see fancy shadows where your vision can't reach."
plane = SHADOWCASTING_PLANE
appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
start_hidden = TRUE

/atom/movable/screen/plane_master/shadowcasting/show_to(mob/mymob)
. = ..()
alpha = 96
add_filter("wall_mask", 1, alpha_mask_filter(render_source = OFFSET_RENDER_TARGET(WALL_RENDER_TARGET, offset), flags = MASK_INVERSE))
var/blurriness = 3
add_filter("blur", 2, gauss_blur_filter(size = blurriness))

1 change: 0 additions & 1 deletion code/datums/components/chasm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
/// List of refs to falling objects -> how many levels deep we've fallen
var/static/list/falling_atoms = list()
var/static/list/forbidden_types = typecacheof(list(
/atom/movable/shadowcasting_holder,
/obj/singularity,
/obj/energy_ball,
/obj/narsie,
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/change_turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(

/turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, flags)
// Remove all atoms except observers, landmarks, docking ports
var/static/list/ignored_atoms = typecacheof(list(/atom/movable/shadowcasting_holder, /mob/dead, /obj/effect/landmark, /obj/docking_port))
var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port))
var/list/allowed_contents = typecache_filter_list_reverse(get_all_contents_ignoring(ignore_typecache), ignored_atoms)
allowed_contents -= src
for(var/i in 1 to allowed_contents.len)
Expand Down
3 changes: 0 additions & 3 deletions code/game/turfs/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ GLOBAL_LIST_EMPTY(station_turfs)
///Lazylist of movable atoms providing opacity sources.
var/list/atom/movable/opacity_sources

///Image used for shadowcasting
var/image/shadowcasting_image

///the holodeck can load onto this turf if TRUE
var/holodeck_compatible = FALSE

Expand Down
5 changes: 0 additions & 5 deletions code/modules/lighting/lighting_turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@
if(!new_area.lighting_effects && old_area.lighting_effects && space_lit)
overlays += GLOB.fullbright_overlays[GET_TURF_PLANE_OFFSET(src) + 1]

//This, is also very expensive
for(var/turf/turf in range(world.view, src))
turf.check_shadowcasting_update()


/turf/proc/generate_missing_corners()
if (!lighting_corner_NE)
lighting_corner_NE = new/datum/lighting_corner(src, NORTH|EAST)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/living/living_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,NANITE_HUD,DIAG_NANITE_FULL_HUD)
pressure_resistance = 10

shadow_caster = TRUE

hud_type = /datum/hud/living

///Badminnery resize
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/login.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@
SEND_SIGNAL(client, COMSIG_CLIENT_MOB_LOGIN, src)
client.init_verbs()

update_shadowcasting()

AddElement(/datum/element/weather_listener, /datum/weather/ash_storm, ZTRAIT_ASHSTORM, GLOB.ash_storm_sounds)

SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_LOGGED_IN, src)
Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
initialize_actionspeed()
update_movespeed(TRUE)
become_hearing_sensitive()
update_shadowcasting()
log_mob_tag("CREATED: [key_name(src)] \[[type]\]")

/**
Expand Down
15 changes: 0 additions & 15 deletions monkestation/code/modules/shadowcasting/__shadow_vars.dm

This file was deleted.

42 changes: 0 additions & 42 deletions monkestation/code/modules/shadowcasting/_shadow_controller.dm

This file was deleted.

Binary file not shown.
95 changes: 0 additions & 95 deletions monkestation/code/modules/shadowcasting/shadow_component.dm

This file was deleted.

18 changes: 0 additions & 18 deletions monkestation/code/modules/shadowcasting/shadow_holder.dm

This file was deleted.

Loading

0 comments on commit 2674e34

Please sign in to comment.