From af6e43c5955c242a21a43777a166799efd26f1d2 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:17:24 -0800
Subject: [PATCH] refactors clickcatchers/parallax/fullsceren (#15460)
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
---
code/__DEFINES/color/color_priority.dm | 6 +
code/__DEFINES/{ => color}/colors.dm | 0
code/__DEFINES/color/lum.dm | 4 +
code/__DEFINES/layers_planes.dm | 5 +-
code/__DEFINES/misc.dm | 17 +-
code/__DEFINES/preferences.dm | 10 -
code/__DEFINES/{ => rendering}/atom_hud.dm | 5 -
code/__DEFINES/rendering/parallax.dm | 13 +
code/__DEFINES/shuttles.dm | 1 -
.../{matrices.dm => matrices/color_matrix.dm} | 160 +++++----
code/__HELPERS/matrices/transform_matrix.dm | 86 +++++
code/__HELPERS/priority_announce.dm | 2 +-
code/_onclick/click.dm | 45 ---
code/_onclick/hud/fullscreen.dm | 192 -----------
code/_onclick/hud/hud.dm | 6 +-
code/_onclick/hud/human.dm | 2 +-
code/_onclick/hud/parallax.dm | 322 ------------------
code/_onclick/hud/plane_master.dm | 9 +-
code/_onclick/observer.dm | 1 -
.../atom_huds}/alternate_appearance.dm | 0
.../atom_huds/atom_hud.dm} | 6 -
.../atom_huds}/data_huds.dm | 0
code/_rendering/clickcatcher/clickcatcher.dm | 74 ++++
code/_rendering/fullscreen/fullscreen.dm | 234 +++++++++++++
code/_rendering/mob.dm | 21 ++
code/_rendering/parallax/parallax.dm | 28 ++
code/_rendering/parallax/parallax_holder.dm | 311 +++++++++++++++++
code/_rendering/parallax/parallax_object.dm | 137 ++++++++
code/_rendering/parallax/types/space.dm | 66 ++++
code/controllers/subsystem/parallax.dm | 109 ++++--
code/controllers/subsystem/shuttle.dm | 4 +-
code/datums/cinematic.dm | 2 +-
code/datums/components/tackle.dm | 6 +-
code/datums/status_effects/debuffs.dm | 2 +-
code/game/area/areas.dm | 7 +-
code/game/atoms_movable.dm | 3 -
code/game/atoms_movement.dm | 4 -
code/game/machinery/camera/camera.dm | 2 +-
.../machinery/computer/camera_advanced.dm | 2 +-
.../structures/crates_lockers/closets.dm | 2 +-
code/game/objects/structures/morgue.dm | 2 +-
code/modules/admin/callproc/callproc.dm | 6 +-
.../admin/verbs/SDQL2/SDQL_2_wrappers.dm | 18 +-
.../clock_effects/city_of_cogs_rift.dm | 2 +-
.../ark_of_the_clockwork_justicar.dm | 4 +-
.../devil/true_devil/_true_devil.dm | 2 +-
.../components/unary_devices/cryo.dm | 2 +-
code/modules/client/client_defines.dm | 24 +-
code/modules/client/client_procs.dm | 20 +-
code/modules/client/preferences.dm | 12 +-
code/modules/client/preferences_savefile.dm | 7 +-
code/modules/mob/dead/dead.dm | 2 +-
.../modules/mob/dead/new_player/new_player.dm | 2 -
code/modules/mob/dead/observer/observer.dm | 6 -
code/modules/mob/dead/observer/respawn.dm | 5 +-
code/modules/mob/living/carbon/carbon.dm | 10 +-
.../mob/living/carbon/carbon_defense.dm | 2 +-
.../mob/living/carbon/human/inventory.dm | 2 +-
.../modules/mob/living/carbon/status_procs.dm | 4 +-
code/modules/mob/living/living.dm | 2 +-
code/modules/mob/living/living_defense.dm | 2 +-
.../mob/living/silicon/ai/freelook/eye.dm | 1 -
code/modules/mob/living/silicon/pai/death.dm | 2 +-
.../mob/living/silicon/silicon_defense.dm | 2 +-
.../hostile/mining_mobs/elites/elite.dm | 2 +-
code/modules/mob/living/status_procs.dm | 2 +-
code/modules/mob/login.dm | 7 +-
code/modules/mob/mob.dm | 46 +--
code/modules/mob/mob_defines.dm | 5 +-
code/modules/mob/mob_movement.dm | 10 +
code/modules/mob/status_procs.dm | 2 +-
code/modules/recycling/disposal/bin.dm | 2 +-
.../ruins/spaceruin_code/hilbertshotel.dm | 2 +-
code/modules/shuttle/docking.dm | 2 +-
code/modules/shuttle/emergency.dm | 4 +-
code/modules/shuttle/navigation_computer.dm | 2 +-
code/modules/shuttle/on_move.dm | 16 +-
code/modules/shuttle/shuttle.dm | 34 +-
code/modules/surgery/organs/eyes.dm | 4 +-
icons/screen/clickcatcher.dmi | Bin 0 -> 226 bytes
icons/screen/fullscreen_15x15.dmi | Bin 0 -> 4340565 bytes
icons/screen/fullscreen_tiled.dmi | Bin 0 -> 106868 bytes
icons/screen/parallax.dmi | Bin 0 -> 571010 bytes
tgstation.dme | 25 +-
84 files changed, 1323 insertions(+), 889 deletions(-)
create mode 100644 code/__DEFINES/color/color_priority.dm
rename code/__DEFINES/{ => color}/colors.dm (100%)
create mode 100644 code/__DEFINES/color/lum.dm
rename code/__DEFINES/{ => rendering}/atom_hud.dm (95%)
create mode 100644 code/__DEFINES/rendering/parallax.dm
rename code/__HELPERS/{matrices.dm => matrices/color_matrix.dm} (59%)
create mode 100644 code/__HELPERS/matrices/transform_matrix.dm
delete mode 100644 code/_onclick/hud/fullscreen.dm
delete mode 100755 code/_onclick/hud/parallax.dm
rename code/{game => _rendering/atom_huds}/alternate_appearance.dm (100%)
rename code/{datums/hud.dm => _rendering/atom_huds/atom_hud.dm} (97%)
rename code/{game => _rendering/atom_huds}/data_huds.dm (100%)
create mode 100644 code/_rendering/clickcatcher/clickcatcher.dm
create mode 100644 code/_rendering/fullscreen/fullscreen.dm
create mode 100644 code/_rendering/mob.dm
create mode 100644 code/_rendering/parallax/parallax.dm
create mode 100644 code/_rendering/parallax/parallax_holder.dm
create mode 100644 code/_rendering/parallax/parallax_object.dm
create mode 100644 code/_rendering/parallax/types/space.dm
create mode 100644 icons/screen/clickcatcher.dmi
create mode 100644 icons/screen/fullscreen_15x15.dmi
create mode 100644 icons/screen/fullscreen_tiled.dmi
create mode 100644 icons/screen/parallax.dmi
diff --git a/code/__DEFINES/color/color_priority.dm b/code/__DEFINES/color/color_priority.dm
new file mode 100644
index 0000000000..040ff5003a
--- /dev/null
+++ b/code/__DEFINES/color/color_priority.dm
@@ -0,0 +1,6 @@
+//different types of atom colorations
+#define ADMIN_COLOUR_PRIORITY 1 //only used by rare effects like greentext coloring mobs and when admins varedit color
+#define TEMPORARY_COLOUR_PRIORITY 2 //e.g. purple effect of the revenant on a mob, black effect when mob electrocuted
+#define WASHABLE_COLOUR_PRIORITY 3 //color splashed onto an atom (e.g. paint on turf)
+#define FIXED_COLOUR_PRIORITY 4 //color inherent to the atom (e.g. blob color)
+#define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are.
diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/color/colors.dm
similarity index 100%
rename from code/__DEFINES/colors.dm
rename to code/__DEFINES/color/colors.dm
diff --git a/code/__DEFINES/color/lum.dm b/code/__DEFINES/color/lum.dm
new file mode 100644
index 0000000000..942462b573
--- /dev/null
+++ b/code/__DEFINES/color/lum.dm
@@ -0,0 +1,4 @@
+//Luma coefficients suggested for HDTVs. If you change these, make sure they add up to 1.
+#define LUMA_R 0.213
+#define LUMA_G 0.715
+#define LUMA_B 0.072
diff --git a/code/__DEFINES/layers_planes.dm b/code/__DEFINES/layers_planes.dm
index 531629c7cd..2550084207 100644
--- a/code/__DEFINES/layers_planes.dm
+++ b/code/__DEFINES/layers_planes.dm
@@ -5,9 +5,10 @@
#define CLICKCATCHER_PLANE -99
-#define PLANE_SPACE -95
+#define PLANE_SPACE -98
#define PLANE_SPACE_RENDER_TARGET "PLANE_SPACE"
-#define PLANE_SPACE_PARALLAX -90
+
+#define PLANE_SPACE_PARALLAX -95
#define PLANE_SPACE_PARALLAX_RENDER_TARGET "PLANE_SPACE_PARALLAX"
#define OPENSPACE_LAYER 17 //Openspace layer over all
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 1410a5d99a..0b5c277a3a 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -345,18 +345,6 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
//TODO Move to a pref
#define STATION_GOAL_BUDGET 1
-//Luma coefficients suggested for HDTVs. If you change these, make sure they add up to 1.
-#define LUMA_R 0.213
-#define LUMA_G 0.715
-#define LUMA_B 0.072
-
-//different types of atom colorations
-#define ADMIN_COLOUR_PRIORITY 1 //only used by rare effects like greentext coloring mobs and when admins varedit color
-#define TEMPORARY_COLOUR_PRIORITY 2 //e.g. purple effect of the revenant on a mob, black effect when mob electrocuted
-#define WASHABLE_COLOUR_PRIORITY 3 //color splashed onto an atom (e.g. paint on turf)
-#define FIXED_COLOUR_PRIORITY 4 //color inherent to the atom (e.g. blob color)
-#define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are.
-
//Endgame Results
#define NUKE_NEAR_MISS 1
#define NUKE_MISS_STATION 2
@@ -568,3 +556,8 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
#define SHOES_KNOTTED 2
#define WANTED_FILE "wanted_message.json"
+
+// Notification action types
+#define NOTIFY_JUMP "jump"
+#define NOTIFY_ATTACK "attack"
+#define NOTIFY_ORBIT "orbit"
diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index cd13510366..cb95aab8c0 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -34,12 +34,6 @@
#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC|CHAT_BANKCARD)
-#define PARALLAX_INSANE -1 //for show offs
-#define PARALLAX_HIGH 0 //default.
-#define PARALLAX_MED 1
-#define PARALLAX_LOW 2
-#define PARALLAX_DISABLE 3 //this option must be the highest number
-
#define PIXEL_SCALING_AUTO 0
#define PIXEL_SCALING_1X 1
#define PIXEL_SCALING_1_2X 1.5
@@ -50,10 +44,6 @@
#define SCALING_METHOD_DISTORT "distort"
#define SCALING_METHOD_BLUR "blur"
-#define PARALLAX_DELAY_DEFAULT world.tick_lag
-#define PARALLAX_DELAY_MED 1
-#define PARALLAX_DELAY_LOW 2
-
#define SEC_DEPT_NONE "None"
#define SEC_DEPT_RANDOM "Random"
#define SEC_DEPT_ENGINEERING "Engineering"
diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/rendering/atom_hud.dm
similarity index 95%
rename from code/__DEFINES/atom_hud.dm
rename to code/__DEFINES/rendering/atom_hud.dm
index 386473a3ae..f62a7f6103 100644
--- a/code/__DEFINES/atom_hud.dm
+++ b/code/__DEFINES/rendering/atom_hud.dm
@@ -62,9 +62,4 @@
#define ANTAG_HUD_FUGITIVE 25
#define ANTAG_HUD_HERETIC 26
-// Notification action types
-#define NOTIFY_JUMP "jump"
-#define NOTIFY_ATTACK "attack"
-#define NOTIFY_ORBIT "orbit"
-
#define ADD_HUD_TO_COOLDOWN 20 //cooldown for being shown the images for any particular data hud
diff --git a/code/__DEFINES/rendering/parallax.dm b/code/__DEFINES/rendering/parallax.dm
new file mode 100644
index 0000000000..8170b4190d
--- /dev/null
+++ b/code/__DEFINES/rendering/parallax.dm
@@ -0,0 +1,13 @@
+#define PARALLAX_DELAY_DEFAULT world.tick_lag
+#define PARALLAX_DELAY_MED 1
+#define PARALLAX_DELAY_LOW 2
+
+// WARNING - client.prefs uses this, if you change these make sure to update the code in preferences!
+#define PARALLAX_DISABLE 0
+#define PARALLAX_LOW 1
+#define PARALLAX_MED 2
+#define PARALLAX_HIGH 3
+#define PARALLAX_INSANE 4 // default
+
+// keep this false until we can fix it being a seizure hazard/ugly as sin
+#define PARALLAX_ROTATION_ANIMATIONS FALSE
diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
index a188bf8363..862cc27f04 100644
--- a/code/__DEFINES/shuttles.dm
+++ b/code/__DEFINES/shuttles.dm
@@ -44,7 +44,6 @@
#define SHUTTLE_TRANSIT_BORDER 10
-#define PARALLAX_LOOP_TIME 25
#define HYPERSPACE_END_TIME 5
#define HYPERSPACE_WARMUP 1
diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices/color_matrix.dm
similarity index 59%
rename from code/__HELPERS/matrices.dm
rename to code/__HELPERS/matrices/color_matrix.dm
index 59fbb4ffc0..e4a4a9bb48 100644
--- a/code/__HELPERS/matrices.dm
+++ b/code/__HELPERS/matrices/color_matrix.dm
@@ -1,85 +1,3 @@
-/matrix/proc/TurnTo(old_angle, new_angle)
- . = new_angle - old_angle
- Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
-
-/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
- if(!segments)
- return
- var/segment = 360/segments
- if(!clockwise)
- segment = -segment
- var/list/matrices = list()
- for(var/i in 1 to segments-1)
- var/matrix/M = matrix(transform)
- M.Turn(segment*i)
- matrices += M
- var/matrix/last = matrix(transform)
- matrices += last
-
- speed /= segments
-
- if(parallel)
- animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL)
- else
- animate(src, transform = matrices[1], time = speed, loops)
-
- for(var/i in 2 to segments) //2 because 1 is covered above
- animate(transform = matrices[i], time = speed)
- //doesn't have an object argument because this is "Stacking" with the animate call above
- //3 billion% intentional
-
-//Dumps the matrix data in format a-f
-/matrix/proc/tolist()
- . = list()
- . += a
- . += b
- . += c
- . += d
- . += e
- . += f
-
-//Dumps the matrix data in a matrix-grid format
-/*
- a d 0
- b e 0
- c f 1
-*/
-/matrix/proc/togrid()
- . = list()
- . += a
- . += d
- . += 0
- . += b
- . += e
- . += 0
- . += c
- . += f
- . += 1
-
-//The X pixel offset of this matrix
-/matrix/proc/get_x_shift()
- . = c
-
-//The Y pixel offset of this matrix
-/matrix/proc/get_y_shift()
- . = f
-
-/matrix/proc/get_x_skew()
- . = b
-
-/matrix/proc/get_y_skew()
- . = d
-
-//Skews a matrix in a particular direction
-//Missing arguments are treated as no skew in that direction
-
-//As Rotation is defined as a scale+skew, these procs will break any existing rotation
-//Unless the result is multiplied against the current matrix
-/matrix/proc/set_skew(x = 0, y = 0)
- b = x
- d = y
-
-
/////////////////////
// COLOUR MATRICES //
/////////////////////
@@ -114,12 +32,64 @@ list(0.393,0.349,0.272,0, 0.769,0.686,0.534,0, 0.189,0.168,0.131,0, 0,0,0,1, 0,0
return list(R + value,R,R,0, G,G + value,G,0, B,B,B + value,0, 0,0,0,1, 0,0,0,0)
+/**
+ * Exxagerates or removes colors
+ */
+/proc/color_matrix_saturation_percent(percent)
+ if(percent == 0)
+ return color_matrix_identity()
+ percent = clamp(percent, -100, 100)
+ if(percent > 0)
+ percent *= 3
+ var/x = 1 + percent / 100
+ var/inv = 1 - x
+ var/R = LUMA_R * inv
+ var/G = LUMA_G * inv
+ var/B = LUMA_B * inv
+
+ return list(R + x,R,R, G,G + x,G, B,B,B + x)
+
//Changes distance colors have from rgb(127,127,127) grey
//1 is identity. 0 makes everything grey >1 blows out colors and greys
/proc/color_matrix_contrast(value)
var/add = (1 - value) / 2
return list(value,0,0,0, 0,value,0,0, 0,0,value,0, 0,0,0,1, add,add,add,0)
+/**
+ * Exxagerates or removes brightness
+ */
+/proc/color_matrix_contrast_percent(percent)
+ var/static/list/delta_index = list(
+ 0, 0.01, 0.02, 0.04, 0.05, 0.06, 0.07, 0.08, 0.1, 0.11,
+ 0.12, 0.14, 0.15, 0.16, 0.17, 0.18, 0.20, 0.21, 0.22, 0.24,
+ 0.25, 0.27, 0.28, 0.30, 0.32, 0.34, 0.36, 0.38, 0.40, 0.42,
+ 0.44, 0.46, 0.48, 0.5, 0.53, 0.56, 0.59, 0.62, 0.65, 0.68,
+ 0.71, 0.74, 0.77, 0.80, 0.83, 0.86, 0.89, 0.92, 0.95, 0.98,
+ 1.0, 1.06, 1.12, 1.18, 1.24, 1.30, 1.36, 1.42, 1.48, 1.54,
+ 1.60, 1.66, 1.72, 1.78, 1.84, 1.90, 1.96, 2.0, 2.12, 2.25,
+ 2.37, 2.50, 2.62, 2.75, 2.87, 3.0, 3.2, 3.4, 3.6, 3.8,
+ 4.0, 4.3, 4.7, 4.9, 5.0, 5.5, 6.0, 6.5, 6.8, 7.0,
+ 7.3, 7.5, 7.8, 8.0, 8.4, 8.7, 9.0, 9.4, 9.6, 9.8,
+ 10.0)
+ percent = clamp(percent, -100, 100)
+ if(percent == 0)
+ return color_matrix_identity()
+
+ var/x = 0
+ if (percent < 0)
+ x = 127 + percent / 100 * 127;
+ else
+ x = percent % 1
+ if(x == 0)
+ x = delta_index[percent]
+ else
+ x = delta_index[percent] * (1-x) + delta_index[percent+1] * x//use linear interpolation for more granularity.
+ x = x * 127 + 127
+
+ var/mult = x / 127
+ var/add = 0.5 * (127-x) / 255
+ return list(mult,0,0, 0,mult,0, 0,0,mult, add,add,add)
+
//Moves all colors angle degrees around the color wheel while maintaining intensity of the color and not affecting greys
//0 is identity, 120 moves reds to greens, 240 moves reds to blues
/proc/color_matrix_rotate_hue(angle)
@@ -134,6 +104,26 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro
0,0,0,1,
0,0,0,0)
+/**
+ * Moves all colors angle degrees around the color wheel while maintaining intensity of the color and not affecting whites
+ * TODO: Need a version that only affects one color (ie shift red to blue but leave greens and blues alone)
+ */
+/proc/color_matrix_rotation(angle)
+ if(angle == 0)
+ return color_matrix_identity()
+ angle = clamp(angle, -180, 180)
+ var/cos = cos(angle)
+ var/sin = sin(angle)
+
+ var/constA = 0.143
+ var/constB = 0.140
+ var/constC = -0.283
+ return list(
+ LUMA_R + cos * (1-LUMA_R) + sin * -LUMA_R, LUMA_R + cos * -LUMA_R + sin * constA, LUMA_R + cos * -LUMA_R + sin * -(1-LUMA_R),
+ LUMA_G + cos * -LUMA_G + sin * -LUMA_G, LUMA_G + cos * (1-LUMA_G) + sin * constB, LUMA_G + cos * -LUMA_G + sin * LUMA_G,
+ LUMA_B + cos * -LUMA_B + sin * (1-LUMA_B), LUMA_B + cos * -LUMA_B + sin * constC, LUMA_B + cos * (1-LUMA_B) + sin * LUMA_B
+ )
+
//These next three rotate values about one axis only
//x is the red axis, y is the green axis, z is the blue axis.
/proc/color_matrix_rotate_x(angle)
@@ -183,3 +173,9 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro
*/
/proc/rgb_construct_color_matrix(rr = 1, rg, rb, gr, gg = 1, gb, br, bg, bb = 1, cr, cg, cb)
return list(rr, rg, rb, gr, gg, gb, br, bg, bb, cr, cg, cb)
+
+/**
+ * Assembles a color matrix, defaulting to identity
+ */
+/proc/rgba_construct_color_matrix(rr = 1, rg, rb, ra, gr, gg = 1, gb, ga, br, bg, bb = 1, ba, ar, ag, ab, aa = 1, cr, cg, cb, ca)
+ return list(rr, rg, rb, ra, gr, gg, gb, ga, br, bg, bb, ba, ar, ag, ab, aa, cr, cg, cb, ca)
diff --git a/code/__HELPERS/matrices/transform_matrix.dm b/code/__HELPERS/matrices/transform_matrix.dm
new file mode 100644
index 0000000000..251ef8151f
--- /dev/null
+++ b/code/__HELPERS/matrices/transform_matrix.dm
@@ -0,0 +1,86 @@
+/matrix/proc/TurnTo(old_angle, new_angle)
+ . = new_angle - old_angle
+ Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
+
+/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
+ if(!segments)
+ return
+ var/segment = 360/segments
+ if(!clockwise)
+ segment = -segment
+ var/list/matrices = list()
+ for(var/i in 1 to segments-1)
+ var/matrix/M = matrix(transform)
+ M.Turn(segment*i)
+ matrices += M
+ var/matrix/last = matrix(transform)
+ matrices += last
+
+ speed /= segments
+
+ if(parallel)
+ animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL)
+ else
+ animate(src, transform = matrices[1], time = speed, loops)
+
+ for(var/i in 2 to segments) //2 because 1 is covered above
+ animate(transform = matrices[i], time = speed)
+ //doesn't have an object argument because this is "Stacking" with the animate call above
+ //3 billion% intentional
+
+//Dumps the matrix data in format a-f
+/matrix/proc/tolist()
+ . = list()
+ . += a
+ . += b
+ . += c
+ . += d
+ . += e
+ . += f
+
+//Dumps the matrix data in a matrix-grid format
+/*
+ a d 0
+ b e 0
+ c f 1
+*/
+/matrix/proc/togrid()
+ . = list()
+ . += a
+ . += d
+ . += 0
+ . += b
+ . += e
+ . += 0
+ . += c
+ . += f
+ . += 1
+
+//The X pixel offset of this matrix
+/matrix/proc/get_x_shift()
+ . = c
+
+//The Y pixel offset of this matrix
+/matrix/proc/get_y_shift()
+ . = f
+
+/matrix/proc/get_x_skew()
+ . = b
+
+/matrix/proc/get_y_skew()
+ . = d
+
+//Skews a matrix in a particular direction
+//Missing arguments are treated as no skew in that direction
+
+//As Rotation is defined as a scale+skew, these procs will break any existing rotation
+//Unless the result is multiplied against the current matrix
+/matrix/proc/set_skew(x = 0, y = 0)
+ b = x
+ d = y
+
+/**
+ * constructs a transform matrix, defaulting to identity
+ */
+/proc/transform_matrix_construct(a = 1, b, c, d = 1, e, f)
+ return matrix(a, b, c, d, e, f)
diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm
index 1aaebc5f32..1609c5f208 100644
--- a/code/__HELPERS/priority_announce.dm
+++ b/code/__HELPERS/priority_announce.dm
@@ -152,7 +152,7 @@
continue
to_chat(mob_to_teleport, announcement)
SEND_SOUND(mob_to_teleport, meeting_sound) //no preferences here, you must hear the funny sound
- mob_to_teleport.overlay_fullscreen("emergency_meeting", /atom/movable/screen/fullscreen/emergency_meeting, 1)
+ mob_to_teleport.overlay_fullscreen("emergency_meeting", /atom/movable/screen/fullscreen/scaled/emergency_meeting, 1)
addtimer(CALLBACK(mob_to_teleport, /mob/.proc/clear_fullscreen, "emergency_meeting"), 3 SECONDS)
if (is_station_level(mob_to_teleport.z)) //teleport the mob to the crew meeting
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 1b72cc71b1..773adc061f 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -470,51 +470,6 @@
else
setDir(WEST, ismousemovement)
-//debug
-/atom/movable/screen/proc/scale_to(x1,y1)
- if(!y1)
- y1 = x1
- var/matrix/M = new
- M.Scale(x1,y1)
- transform = M
-
-/atom/movable/screen/click_catcher
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "catcher"
- plane = CLICKCATCHER_PLANE
- mouse_opacity = MOUSE_OPACITY_OPAQUE
- screen_loc = "CENTER"
-
-#define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size)
-#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose.
-
-/atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
- var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher")
- var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
- var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
- var/px = view_size_x * world.icon_size
- var/py = view_size_y * world.icon_size
- var/sx = min(MAX_SAFE_BYOND_ICON_SCALE_PX, px)
- var/sy = min(MAX_SAFE_BYOND_ICON_SCALE_PX, py)
- newicon.Scale(sx, sy)
- icon = newicon
- screen_loc = "CENTER-[(ox-1)*0.5],CENTER-[(oy-1)*0.5]"
- var/matrix/M = new
- M.Scale(px/sx, py/sy)
- transform = M
-
-/atom/movable/screen/click_catcher/Click(location, control, params)
- var/list/modifiers = params2list(params)
- if(modifiers["middle"] && iscarbon(usr))
- var/mob/living/carbon/C = usr
- C.swap_hand()
- else
- var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr.client ? usr.client.eye : usr), usr.client)
- params += "&catcher=1"
- if(T)
- T.Click(location, control, params)
- . = 1
-
/* MouseWheelOn */
/mob/proc/MouseWheelOn(atom/A, delta_x, delta_y, params)
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
deleted file mode 100644
index 81442b602f..0000000000
--- a/code/_onclick/hud/fullscreen.dm
+++ /dev/null
@@ -1,192 +0,0 @@
-/mob/proc/overlay_fullscreen(category, type, severity)
- var/atom/movable/screen/fullscreen/screen = screens[category]
- if (!screen || screen.type != type)
- // needs to be recreated
- clear_fullscreen(category, FALSE)
- screens[category] = screen = new type()
- else if ((!severity || severity == screen.severity) && (!client || screen.screen_loc != "CENTER-7,CENTER-7" || screen.view == client.view))
- // doesn't need to be updated
- return screen
-
- screen.icon_state = "[initial(screen.icon_state)][severity]"
- screen.severity = severity
- if (client && screen.should_show_to(src))
- screen.update_for_view(client.view)
- client.screen += screen
-
- return screen
-
-/mob/proc/clear_fullscreen(category, animated = 10)
- var/atom/movable/screen/fullscreen/screen = screens[category]
- if(!screen)
- return
-
- screens -= category
-
- if(animated)
- animate(screen, alpha = 0, time = animated)
- addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME)
- else
- if(client)
- client.screen -= screen
- qdel(screen)
-
-/mob/proc/clear_fullscreen_after_animate(atom/movable/screen/fullscreen/screen)
- if(client)
- client.screen -= screen
- qdel(screen)
-
-/mob/proc/clear_fullscreens()
- for(var/category in screens)
- clear_fullscreen(category)
-
-/mob/proc/hide_fullscreens()
- if(client)
- for(var/category in screens)
- client.screen -= screens[category]
-
-/mob/proc/reload_fullscreen()
- if(client)
- var/atom/movable/screen/fullscreen/screen
- for(var/category in screens)
- screen = screens[category]
- if(screen.should_show_to(src))
- screen.update_for_view(client.view)
- client.screen |= screen
- else
- client.screen -= screen
-
-/atom/movable/screen/fullscreen
- icon = 'icons/mob/screen_full.dmi'
- icon_state = "default"
- screen_loc = "CENTER-7,CENTER-7"
- layer = FULLSCREEN_LAYER
- plane = FULLSCREEN_PLANE
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- var/view = 7
- var/severity = 0
- var/show_when_dead = FALSE
-
-/atom/movable/screen/fullscreen/proc/update_for_view(client_view)
- if (screen_loc == "CENTER-7,CENTER-7" && view != client_view)
- var/list/actualview = getviewsize(client_view)
- view = client_view
- transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0)
-
-/atom/movable/screen/fullscreen/proc/should_show_to(mob/mymob)
- if(!show_when_dead && mymob.stat == DEAD)
- return FALSE
- return TRUE
-
-/atom/movable/screen/fullscreen/Destroy()
- severity = 0
- . = ..()
-
-/atom/movable/screen/fullscreen/emergency_meeting
- icon_state = "emergency_meeting"
- show_when_dead = TRUE
- layer = CURSE_LAYER
- plane = SPLASHSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/brute
- icon_state = "brutedamageoverlay"
- layer = UI_DAMAGE_LAYER
- plane = FULLSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/oxy
- icon_state = "oxydamageoverlay"
- layer = UI_DAMAGE_LAYER
- plane = FULLSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/crit
- icon_state = "passage"
- layer = CRIT_LAYER
- plane = FULLSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/crit/vision
- icon_state = "oxydamageoverlay"
- layer = BLIND_LAYER
-
-/atom/movable/screen/fullscreen/blind
- icon_state = "blackimageoverlay"
- layer = BLIND_LAYER
- plane = FULLSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/curse
- icon_state = "curse"
- layer = CURSE_LAYER
- plane = FULLSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/impaired
- icon_state = "impairedoverlay"
-
-/atom/movable/screen/fullscreen/blurry
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
- icon_state = "blurry"
-
-/atom/movable/screen/fullscreen/flash
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
- icon_state = "flash"
-
-/atom/movable/screen/fullscreen/flash/static
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
- icon_state = "noise"
-
-/atom/movable/screen/fullscreen/high
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
- icon_state = "druggy"
-
-/atom/movable/screen/fullscreen/color_vision
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
- icon_state = "flash"
- alpha = 80
-
-/atom/movable/screen/fullscreen/color_vision/green
- color = "#00ff00"
-
-/atom/movable/screen/fullscreen/color_vision/red
- color = "#ff0000"
-
-/atom/movable/screen/fullscreen/color_vision/blue
- color = "#0000ff"
-
-/atom/movable/screen/fullscreen/cinematic_backdrop
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
- icon_state = "flash"
- plane = SPLASHSCREEN_PLANE
- layer = SPLASHSCREEN_LAYER - 1
- color = "#000000"
- show_when_dead = TRUE
-
-/atom/movable/screen/fullscreen/lighting_backdrop
- icon = 'icons/mob/screen_gen.dmi'
- icon_state = "flash"
- transform = matrix(200, 0, 0, 0, 200, 0)
- plane = LIGHTING_PLANE
- blend_mode = BLEND_OVERLAY
- show_when_dead = TRUE
-
-//Provides darkness to the back of the lighting plane
-/atom/movable/screen/fullscreen/lighting_backdrop/lit
- invisibility = INVISIBILITY_LIGHTING
- layer = BACKGROUND_LAYER+21
- color = "#000"
- show_when_dead = TRUE
-
-//Provides whiteness in case you don't see lights so everything is still visible
-/atom/movable/screen/fullscreen/lighting_backdrop/unlit
- layer = BACKGROUND_LAYER+20
- show_when_dead = TRUE
-
-/atom/movable/screen/fullscreen/see_through_darkness
- icon_state = "nightvision"
- plane = LIGHTING_PLANE
- layer = LIGHTING_LAYER
- blend_mode = BLEND_ADD
- show_when_dead = TRUE
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 144a38e728..c5f57d9b78 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
return FALSE
screenmob.client.screen = list()
- screenmob.client.apply_clickcatcher()
+ screenmob.client.update_clickcatcher()
var/display_hud_version = version
if(!display_hud_version) //If 0 or blank, display the next hud version
@@ -193,8 +193,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
persistent_inventory_update(screenmob)
screenmob.update_action_buttons(1)
reorganize_alerts()
- screenmob.reload_fullscreen()
- update_parallax_pref(screenmob)
// ensure observers get an accurate and up-to-date view
if (!viewmob)
@@ -204,6 +202,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
else if (viewmob.hud_used)
viewmob.hud_used.plane_masters_update()
+ screenmob.reload_rendering()
+
return TRUE
/datum/hud/proc/plane_masters_update()
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 83b8d7be48..4fa2dd538a 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -174,7 +174,7 @@
/datum/hud/human/New(mob/living/carbon/human/owner)
..()
- owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness)
+ owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/special/see_through_darkness)
var/widescreenlayout = FALSE //CIT CHANGE - adds support for different hud layouts depending on widescreen pref
if(owner.client && owner.client.prefs && owner.client.prefs.widescreenpref) //CIT CHANGE - ditto
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
deleted file mode 100755
index a98fec03c4..0000000000
--- a/code/_onclick/hud/parallax.dm
+++ /dev/null
@@ -1,322 +0,0 @@
-
-/datum/hud/proc/create_parallax(mob/viewmob)
- var/mob/screenmob = viewmob || mymob
- var/client/C = screenmob.client
- if (!apply_parallax_pref(viewmob)) //don't want shit computers to crash when specing someone with insane parallax, so use the viewer's pref
- return
-
- if(!length(C.parallax_layers_cached))
- C.parallax_layers_cached = list()
- C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, C.view)
- C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, C.view)
- C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, C.view)
- if(SSparallax.random_layer)
- C.parallax_layers_cached += new SSparallax.random_layer
- C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_3(null, C.view)
-
- C.parallax_layers = C.parallax_layers_cached.Copy()
-
- if (length(C.parallax_layers) > C.parallax_layers_max)
- C.parallax_layers.len = C.parallax_layers_max
-
- C.screen |= (C.parallax_layers)
- var/atom/movable/screen/plane_master/PM = screenmob.hud_used.plane_masters["[PLANE_SPACE]"]
- if(screenmob != mymob)
- C.screen -= locate(/atom/movable/screen/plane_master/parallax_white) in C.screen
- C.screen += PM
- PM.color = list(
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 1, 1, 1, 1,
- 0, 0, 0, 0
- )
-
-
-/datum/hud/proc/remove_parallax(mob/viewmob)
- var/mob/screenmob = viewmob || mymob
- var/client/C = screenmob.client
- C.screen -= (C.parallax_layers_cached)
- var/atom/movable/screen/plane_master/PM = screenmob.hud_used.plane_masters["[PLANE_SPACE]"]
- if(screenmob != mymob)
- C.screen -= locate(/atom/movable/screen/plane_master/parallax_white) in C.screen
- C.screen += PM
- PM.color = initial(PM.color)
- C.parallax_layers = null
-
-/datum/hud/proc/apply_parallax_pref(mob/viewmob)
- var/mob/screenmob = viewmob || mymob
- var/client/C = screenmob.client
- if(C.prefs)
- var/pref = C.prefs.parallax
- if (isnull(pref))
- pref = PARALLAX_HIGH
- switch(C.prefs.parallax)
- if (PARALLAX_INSANE)
- C.parallax_throttle = FALSE
- C.parallax_layers_max = 5
- return TRUE
-
- if (PARALLAX_MED)
- C.parallax_throttle = PARALLAX_DELAY_MED
- C.parallax_layers_max = 3
- return TRUE
-
- if (PARALLAX_LOW)
- C.parallax_throttle = PARALLAX_DELAY_LOW
- C.parallax_layers_max = 1
- return TRUE
-
- if (PARALLAX_DISABLE)
- return FALSE
-
- //This is high parallax.
- C.parallax_throttle = PARALLAX_DELAY_DEFAULT
- C.parallax_layers_max = 4
- return TRUE
-
-/datum/hud/proc/update_parallax_pref(mob/viewmob)
- remove_parallax(viewmob)
- create_parallax(viewmob)
- update_parallax()
-
-// This sets which way the current shuttle is moving (returns true if the shuttle has stopped moving so the caller can append their animation)
-/datum/hud/proc/set_parallax_movedir(new_parallax_movedir, skip_windups)
- . = FALSE
- var/client/C = mymob.client
- if(new_parallax_movedir == C.parallax_movedir)
- return
- var/animatedir = new_parallax_movedir
- if(new_parallax_movedir == FALSE)
- var/animate_time = 0
- for(var/thing in C.parallax_layers)
- var/atom/movable/screen/parallax_layer/L = thing
- L.icon_state = initial(L.icon_state)
- L.update_o(C.view)
- var/T = PARALLAX_LOOP_TIME / L.speed
- if (T > animate_time)
- animate_time = T
- C.dont_animate_parallax = world.time + min(animate_time, PARALLAX_LOOP_TIME)
- animatedir = C.parallax_movedir
-
- var/matrix/newtransform
- switch(animatedir)
- if(NORTH)
- newtransform = matrix(1, 0, 0, 0, 1, 480)
- if(SOUTH)
- newtransform = matrix(1, 0, 0, 0, 1,-480)
- if(EAST)
- newtransform = matrix(1, 0, 480, 0, 1, 0)
- if(WEST)
- newtransform = matrix(1, 0,-480, 0, 1, 0)
-
- var/shortesttimer
- if(!skip_windups)
- for(var/thing in C.parallax_layers)
- var/atom/movable/screen/parallax_layer/L = thing
-
- var/T = PARALLAX_LOOP_TIME / L.speed
- if (isnull(shortesttimer))
- shortesttimer = T
- if (T < shortesttimer)
- shortesttimer = T
- L.transform = newtransform
- animate(L, transform = matrix(), time = T, easing = QUAD_EASING | (new_parallax_movedir ? EASE_IN : EASE_OUT), flags = ANIMATION_END_NOW)
- if (new_parallax_movedir)
- L.transform = newtransform
- animate(transform = matrix(), time = T) //queue up another animate so lag doesn't create a shutter
-
- C.parallax_movedir = new_parallax_movedir
- if (C.parallax_animate_timer)
- deltimer(C.parallax_animate_timer)
- var/datum/callback/CB = CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform)
- if(skip_windups)
- CB.InvokeAsync()
- else
- C.parallax_animate_timer = addtimer(CB, min(shortesttimer, PARALLAX_LOOP_TIME), TIMER_CLIENT_TIME|TIMER_STOPPABLE)
-
-
-/datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform)
- if(!C)
- return
- C.parallax_animate_timer = FALSE
- for(var/thing in C.parallax_layers)
- var/atom/movable/screen/parallax_layer/L = thing
- if (!new_parallax_movedir)
- animate(L)
- continue
-
- var/newstate = initial(L.icon_state)
- var/T = PARALLAX_LOOP_TIME / L.speed
-
- if (newstate in icon_states(L.icon))
- L.icon_state = newstate
- L.update_o(C.view)
-
- L.transform = newtransform
-
- animate(L, transform = matrix(), time = T, loop = -1, flags = ANIMATION_END_NOW)
-
-/datum/hud/proc/update_parallax()
- var/client/C = mymob.client
- var/turf/posobj = get_turf(C.eye)
- if(!posobj)
- return
- var/area/areaobj = posobj.loc
-
- // Update the movement direction of the parallax if necessary (for shuttles)
- set_parallax_movedir(areaobj.parallax_movedir, FALSE)
-
- var/force
- if(!C.previous_turf || (C.previous_turf.z != posobj.z))
- C.previous_turf = posobj
- force = TRUE
-
- if (!force && world.time < C.last_parallax_shift+C.parallax_throttle)
- return
-
- //Doing it this way prevents parallax layers from "jumping" when you change Z-Levels.
- var/offset_x = posobj.x - C.previous_turf.x
- var/offset_y = posobj.y - C.previous_turf.y
-
- if(!offset_x && !offset_y && !force)
- return
-
- var/last_delay = world.time - C.last_parallax_shift
- last_delay = min(last_delay, C.parallax_throttle)
- C.previous_turf = posobj
- C.last_parallax_shift = world.time
-
- for(var/thing in C.parallax_layers)
- var/atom/movable/screen/parallax_layer/L = thing
- L.update_status(mymob)
- if (L.view_sized != C.view)
- L.update_o(C.view)
-
- var/change_x
- var/change_y
-
- if(L.absolute)
- L.offset_x = -(posobj.x - SSparallax.planet_x_offset) * L.speed
- L.offset_y = -(posobj.y - SSparallax.planet_y_offset) * L.speed
- else
- change_x = offset_x * L.speed
- L.offset_x -= change_x
- change_y = offset_y * L.speed
- L.offset_y -= change_y
-
- if(L.offset_x > 240)
- L.offset_x -= 480
- if(L.offset_x < -240)
- L.offset_x += 480
- if(L.offset_y > 240)
- L.offset_y -= 480
- if(L.offset_y < -240)
- L.offset_y += 480
-
-
- if(!areaobj.parallax_movedir && C.dont_animate_parallax <= world.time && (offset_x || offset_y) && abs(offset_x) <= max(C.parallax_throttle/world.tick_lag+1,1) && abs(offset_y) <= max(C.parallax_throttle/world.tick_lag+1,1) && (round(abs(change_x)) > 1 || round(abs(change_y)) > 1))
- L.transform = matrix(1, 0, offset_x*L.speed, 0, 1, offset_y*L.speed)
- animate(L, transform=matrix(), time = last_delay)
-
- L.screen_loc = "CENTER-7:[round(L.offset_x,1)],CENTER-7:[round(L.offset_y,1)]"
-
-/atom/movable/proc/update_parallax_contents()
- if(length(client_mobs_in_contents))
- for(var/thing in client_mobs_in_contents)
- var/mob/M = thing
- if(M?.client && M.hud_used && length(M.client.parallax_layers))
- M.hud_used.update_parallax()
-
-/mob/proc/update_parallax_teleport() //used for arrivals shuttle
- if(client?.eye && hud_used && length(client.parallax_layers))
- var/area/areaobj = get_area(client.eye)
- hud_used.set_parallax_movedir(areaobj.parallax_movedir, TRUE)
-
-/atom/movable/screen/parallax_layer
- icon = 'icons/effects/parallax.dmi'
- var/speed = 1
- var/offset_x = 0
- var/offset_y = 0
- var/view_sized
- var/absolute = FALSE
- blend_mode = BLEND_ADD
- plane = PLANE_SPACE_PARALLAX
- screen_loc = "CENTER-7,CENTER-7"
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
-
-/atom/movable/screen/parallax_layer/Initialize(mapload, view)
- . = ..()
- if (!view)
- view = world.view
- update_o(view)
-
-/atom/movable/screen/parallax_layer/proc/update_o(view)
- if (!view)
- view = world.view
-
- var/list/viewscales = getviewsize(view)
- var/countx = CEILING((viewscales[1]/2)/(480/world.icon_size), 1)+1
- var/county = CEILING((viewscales[2]/2)/(480/world.icon_size), 1)+1
- var/list/new_overlays = new
- for(var/x in -countx to countx)
- for(var/y in -county to county)
- if(x == 0 && y == 0)
- continue
- var/mutable_appearance/texture_overlay = mutable_appearance(icon, icon_state)
- texture_overlay.transform = matrix(1, 0, x*480, 0, 1, y*480)
- new_overlays += texture_overlay
- cut_overlays()
- add_overlay(new_overlays)
- view_sized = view
-
-/atom/movable/screen/parallax_layer/proc/update_status(mob/M)
- return
-
-/atom/movable/screen/parallax_layer/layer_1
- icon_state = "layer1"
- speed = 0.6
- layer = 1
-
-/atom/movable/screen/parallax_layer/layer_2
- icon_state = "layer2"
- speed = 1
- layer = 2
-
-/atom/movable/screen/parallax_layer/layer_3
- icon_state = "layer3"
- speed = 1.4
- layer = 3
-
-/atom/movable/screen/parallax_layer/random
- blend_mode = BLEND_OVERLAY
- speed = 3
- layer = 3
-
-/atom/movable/screen/parallax_layer/random/space_gas
- icon_state = "space_gas"
-
-/atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
- . = ..()
- src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
-
-/atom/movable/screen/parallax_layer/random/asteroids
- icon_state = "asteroids"
-
-/atom/movable/screen/parallax_layer/planet
- icon_state = "planet"
- blend_mode = BLEND_OVERLAY
- absolute = TRUE //Status of seperation
- speed = 3
- layer = 30
-
-/atom/movable/screen/parallax_layer/planet/update_status(mob/M)
- var/client/C = M.client
- var/turf/posobj = get_turf(C.eye)
- if(!posobj)
- return
- invisibility = is_station_level(posobj.z) ? 0 : INVISIBILITY_ABSTRACT
-
-/atom/movable/screen/parallax_layer/planet/update_o()
- return //Shit won't move
diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm
index bb6a9cd925..d83a81fa45 100644
--- a/code/_onclick/hud/plane_master.dm
+++ b/code/_onclick/hud/plane_master.dm
@@ -124,8 +124,8 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/atom/movable/screen/plane_master/lighting/backdrop(mob/mymob)
- mymob.overlay_fullscreen("lighting_backdrop_lit", /atom/movable/screen/fullscreen/lighting_backdrop/lit)
- mymob.overlay_fullscreen("lighting_backdrop_unlit", /atom/movable/screen/fullscreen/lighting_backdrop/unlit)
+ mymob.overlay_fullscreen("lighting_backdrop_lit", /atom/movable/screen/fullscreen/special/lighting_backdrop/lit)
+ mymob.overlay_fullscreen("lighting_backdrop_unlit", /atom/movable/screen/fullscreen/special/lighting_backdrop/unlit)
/*!
* This system works by exploiting BYONDs color matrix filter to use layers to handle emissive blockers.
@@ -143,7 +143,6 @@
add_filter("emissives", 1, alpha_mask_filter(render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE))
add_filter("object_lighting", 2, alpha_mask_filter(render_source = O_LIGHTING_VISUAL_RENDER_TARGET, flags = MASK_INVERSE))
-
/**
* Handles emissive overlays and emissive blockers.
*/
@@ -163,9 +162,10 @@
plane = PLANE_SPACE_PARALLAX
blend_mode = BLEND_MULTIPLY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ render_target = PLANE_SPACE_PARALLAX_RENDER_TARGET
/atom/movable/screen/plane_master/parallax_white
- name = "parallax whitifier plane master"
+ name = "parallax backdrop/space turf plane master"
plane = PLANE_SPACE
/atom/movable/screen/plane_master/camera_static
@@ -174,7 +174,6 @@
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
-
//Reserved to chat messages, so they are still displayed above the field of vision masking.
/atom/movable/screen/plane_master/chat_messages
name = "runechat plane master"
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index d431e6d3cd..78fc32480f 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -11,7 +11,6 @@
// Otherwise jump
else if(A.loc)
forceMove(get_turf(A))
- update_parallax_contents()
/mob/dead/observer/ClickOn(var/atom/A, var/params)
if(check_click_intercept(params,A))
diff --git a/code/game/alternate_appearance.dm b/code/_rendering/atom_huds/alternate_appearance.dm
similarity index 100%
rename from code/game/alternate_appearance.dm
rename to code/_rendering/atom_huds/alternate_appearance.dm
diff --git a/code/datums/hud.dm b/code/_rendering/atom_huds/atom_hud.dm
similarity index 97%
rename from code/datums/hud.dm
rename to code/_rendering/atom_huds/atom_hud.dm
index 1c23d5f2a0..07b403284b 100644
--- a/code/datums/hud.dm
+++ b/code/_rendering/atom_huds/atom_hud.dm
@@ -124,9 +124,3 @@ GLOBAL_LIST_INIT(huds, list(
/mob/dead/new_player/reload_huds()
return
-
-/mob/proc/add_click_catcher()
- client.screen += client.void
-
-/mob/dead/new_player/add_click_catcher()
- return
diff --git a/code/game/data_huds.dm b/code/_rendering/atom_huds/data_huds.dm
similarity index 100%
rename from code/game/data_huds.dm
rename to code/_rendering/atom_huds/data_huds.dm
diff --git a/code/_rendering/clickcatcher/clickcatcher.dm b/code/_rendering/clickcatcher/clickcatcher.dm
new file mode 100644
index 0000000000..524f753e98
--- /dev/null
+++ b/code/_rendering/clickcatcher/clickcatcher.dm
@@ -0,0 +1,74 @@
+/atom/movable/screen/click_catcher
+ icon = 'icons/screen/clickcatcher.dmi'
+ icon_state = "catcher"
+ appearance_flags = TILE_BOUND | NO_CLIENT_COLOR | RESET_TRANSFORM | RESET_COLOR | RESET_ALPHA
+ plane = CLICKCATCHER_PLANE
+ plane = CLICKCATCHER_PLANE
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
+ screen_loc = "CENTER"
+
+/*
+#define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size)
+#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose.
+
+/atom/movable/screen/click_catcher/proc/UpdateFill(view_size_x = 15, view_size_y = 15)
+ var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher")
+ var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
+ var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
+ var/px = view_size_x * world.icon_size
+ var/py = view_size_y * world.icon_size
+ var/sx = min(MAX_SAFE_BYOND_ICON_SCALE_PX, px)
+ var/sy = min(MAX_SAFE_BYOND_ICON_SCALE_PX, py)
+ newicon.Scale(sx, sy)
+ icon = newicon
+ screen_loc = "CENTER-[(ox-1)*0.5],CENTER-[(oy-1)*0.5]"
+ var/matrix/M = new
+ M.Scale(px/sx, py/sy)
+ transform = M
+
+#undef MAX_SAFE_BYOND_ICON_SCALE_TILES
+#undef MAX_SAFE_BYOND_ICON_SCALE_PX
+*/
+
+/atom/movable/screen/click_catcher/proc/UpdateFill(view_size_x, view_size_y)
+ screen_loc = "1,1 to [view_size_x],[view_size_y]"
+
+/atom/movable/screen/click_catcher/Click(location, control, params)
+ var/list/modifiers = params2list(params)
+ if(modifiers["middle"] && iscarbon(usr))
+ var/mob/living/carbon/C = usr
+ C.swap_hand()
+ else
+ var/turf/T = Parse(modifiers["screen-loc"], get_turf(usr.client?.eye || usr), usr.client)
+ params += "&catcher=1"
+ if(T)
+ T.Click(location, control, params)
+ return TRUE
+
+/atom/movable/screen/click_catcher/proc/Parse(scr_loc, turf/origin, client/C)
+ // screen-loc: Pixel coordinates in screen_loc format ("[tile_x]:[pixel_x],[tile_y]:[pixel_y]")
+ if(!scr_loc)
+ return null
+ var/tX = splittext(scr_loc, ",")
+ var/tY = splittext(tX[2], ":")
+ var/tZ = origin.z
+ tY = tY[1]
+ tX = splittext(tX[1], ":")
+ tX = tX[1]
+ var/list/actual_view = getviewsize(C ? C.view : world.view)
+ tX = clamp(origin.x + text2num(tX) - round(actual_view[1] / 2) - 1, 1, world.maxx)
+ tY = clamp(origin.y + text2num(tY) - round(actual_view[2] / 2) - 1, 1, world.maxy)
+ return locate(tX, tY, tZ)
+
+/**
+ * Makes a clickcatcher if necessary, and ensures it's fit to our size.
+ */
+/client/proc/update_clickcatcher(list/view_override)
+ if(!click_catcher)
+ click_catcher = new
+ screen |= click_catcher
+ if(view_override)
+ click_catcher.UpdateFill(view_override[1], view_override[2])
+ else
+ var/list/view_list = getviewsize(view)
+ click_catcher.UpdateFill(view_list[1], view_list[2])
diff --git a/code/_rendering/fullscreen/fullscreen.dm b/code/_rendering/fullscreen/fullscreen.dm
new file mode 100644
index 0000000000..dd8f697891
--- /dev/null
+++ b/code/_rendering/fullscreen/fullscreen.dm
@@ -0,0 +1,234 @@
+/**
+ * Adds a fullscreen overlay
+ *
+ * @params
+ * - category - string - must exist. will overwrite any other screen in this category. defaults to type.
+ * - type - the typepath of the screen
+ * - severity - severity - different screen objects have differing severities
+ */
+/mob/proc/overlay_fullscreen(category, type, severity)
+ ASSERT(type)
+ if(!category)
+ category = type
+ var/atom/movable/screen/fullscreen/screen = fullscreens[category]
+ if (!screen || screen.type != type)
+ // needs to be recreated
+ clear_fullscreen(category, 0)
+ fullscreens[category] = screen = new type
+ screen.SetSeverity(severity)
+ if(client && screen.ShouldShow(src))
+ screen.SetView(client.view)
+ client.screen += screen
+ return screen
+
+/**
+ * Wipes a fullscreen of a certain category
+ *
+ * Second argument is for animation delay.
+ */
+/mob/proc/clear_fullscreen(category, animated = 10)
+ if(!fullscreens)
+ return
+ var/atom/movable/screen/fullscreen/screen = fullscreens[category]
+ fullscreens -= category
+ if(!screen)
+ return
+ if(animated > 0)
+ animate(screen, alpha = 0, time = animated)
+ addtimer(CALLBACK(src, .proc/_remove_fullscreen_direct, screen), animated, TIMER_CLIENT_TIME)
+ else
+ if(client)
+ client.screen -= screen
+ qdel(screen)
+
+/mob/proc/_remove_fullscreen_direct(atom/movable/screen/fullscreen/screen)
+ if(client)
+ client.screen -= screen
+ qdel(screen)
+
+/**
+ * Wipes all fullscreens
+ */
+/mob/proc/wipe_fullscreens()
+ for(var/category in fullscreens)
+ clear_fullscreen(category)
+
+/**
+ * Removes fullscreens from client but not the mob
+ */
+/mob/proc/hide_fullscreens()
+ if(client)
+ for(var/category in fullscreens)
+ client.screen -= fullscreens[category]
+
+/**
+ * Ensures all fullscreens are on client.
+ */
+/mob/proc/reload_fullscreen()
+ if(client)
+ var/atom/movable/screen/fullscreen/screen
+ for(var/category in fullscreens)
+ screen = fullscreens[category]
+ if(screen.ShouldShow(src))
+ screen.SetView(client.view)
+ client.screen |= screen
+ else
+ client.screen -= screen
+
+/atom/movable/screen/fullscreen
+ icon = 'icons/screen/fullscreen_15x15.dmi'
+ icon_state = "default"
+ screen_loc = "CENTER-7,CENTER-7"
+ layer = FULLSCREEN_LAYER
+ plane = FULLSCREEN_PLANE
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ /// current view we're adapted to
+ var/view_current
+ /// min severity
+ var/severity_min = 0
+ /// max severity
+ var/severity_max = INFINITY
+ /// current severity
+ var/severity = 0
+ /// show this while dead
+ var/show_when_dead = FALSE
+
+/atom/movable/screen/fullscreen/proc/SetSeverity(severity)
+ src.severity = clamp(severity, severity_min, severity_max)
+ icon_state = "[initial(icon_state)][severity]"
+
+/atom/movable/screen/fullscreen/proc/SetView(client_view)
+ view_current = client_view
+
+/atom/movable/screen/fullscreen/proc/ShouldShow(mob/M)
+ if(!show_when_dead && M.stat == DEAD)
+ return FALSE
+ return TRUE
+
+/atom/movable/screen/fullscreen/Destroy()
+ SetSeverity(0)
+ return ..()
+
+/atom/movable/screen/fullscreen/scaled
+ icon = 'icons/screen/fullscreen_15x15.dmi'
+ screen_loc = "CENTER-7,CENTER-7"
+ /// size of sprite in tiles
+ var/size_x = 15
+ /// size of sprite in tiles
+ var/size_y = 15
+
+/atom/movable/screen/fullscreen/scaled/SetView(client_view)
+ if(view_current != client_view)
+ var/list/actualview = getviewsize(client_view)
+ view_current = client_view
+ transform = matrix(actualview[1] / size_x, 0, 0, 0, actualview[2] / size_y, 0)
+ return ..()
+
+/atom/movable/screen/fullscreen/scaled/brute
+ icon_state = "brutedamageoverlay"
+ layer = UI_DAMAGE_LAYER
+ plane = FULLSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/scaled/oxy
+ icon_state = "oxydamageoverlay"
+ layer = UI_DAMAGE_LAYER
+ plane = FULLSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/scaled/crit
+ icon_state = "passage"
+ layer = CRIT_LAYER
+ plane = FULLSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/scaled/crit/vision
+ icon_state = "oxydamageoverlay"
+ layer = BLIND_LAYER
+
+/atom/movable/screen/fullscreen/scaled/blind
+ icon_state = "blackimageoverlay"
+ layer = BLIND_LAYER
+ plane = FULLSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/scaled/curse
+ icon_state = "curse"
+ layer = CURSE_LAYER
+ plane = FULLSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/scaled/impaired
+ icon_state = "impairedoverlay"
+
+/atom/movable/screen/fullscreen/scaled/emergency_meeting
+ icon_state = "emergency_meeting"
+ show_when_dead = TRUE
+ layer = CURSE_LAYER
+ plane = SPLASHSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/tiled/blurry
+ icon = 'icons/mob/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "cloudy"
+
+/atom/movable/screen/fullscreen/tiled/flash
+ icon = 'icons/mob/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "flash"
+
+/atom/movable/screen/fullscreen/tiled/flash/static
+ icon = 'icons/mob/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "noise"
+
+/atom/movable/screen/fullscreen/tiled/high
+ icon = 'icons/mob/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "druggy"
+
+/atom/movable/screen/fullscreen/tiled/color_vision
+ icon = 'icons/mob/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "flash"
+ alpha = 80
+
+/atom/movable/screen/fullscreen/tiled/color_vision/green
+ color = "#00ff00"
+
+/atom/movable/screen/fullscreen/tiled/color_vision/red
+ color = "#ff0000"
+
+/atom/movable/screen/fullscreen/tiled/color_vision/blue
+ color = "#0000ff"
+
+/atom/movable/screen/fullscreen/tiled/cinematic_backdrop
+ icon = 'icons/mob/screen_gen.dmi'
+ screen_loc = "WEST,SOUTH to EAST,NORTH"
+ icon_state = "flash"
+ plane = SPLASHSCREEN_PLANE
+ layer = SPLASHSCREEN_LAYER - 1
+ color = "#000000"
+ show_when_dead = TRUE
+
+/atom/movable/screen/fullscreen/special/lighting_backdrop
+ icon = 'icons/mob/screen_gen.dmi'
+ icon_state = "flash"
+ transform = matrix(200, 0, 0, 0, 200, 0)
+ plane = LIGHTING_PLANE
+ blend_mode = BLEND_OVERLAY
+ show_when_dead = TRUE
+
+//Provides darkness to the back of the lighting plane
+/atom/movable/screen/fullscreen/special/lighting_backdrop/lit
+ invisibility = INVISIBILITY_LIGHTING
+ layer = BACKGROUND_LAYER+21
+ color = "#000"
+ show_when_dead = TRUE
+
+//Provides whiteness in case you don't see lights so everything is still visible
+/atom/movable/screen/fullscreen/special/lighting_backdrop/unlit
+ layer = BACKGROUND_LAYER+20
+ show_when_dead = TRUE
+
+/atom/movable/screen/fullscreen/special/see_through_darkness
+ icon_state = "nightvision"
+ plane = LIGHTING_PLANE
+ layer = LIGHTING_LAYER
+ blend_mode = BLEND_ADD
+ show_when_dead = TRUE
diff --git a/code/_rendering/mob.dm b/code/_rendering/mob.dm
new file mode 100644
index 0000000000..49095d0910
--- /dev/null
+++ b/code/_rendering/mob.dm
@@ -0,0 +1,21 @@
+/**
+ * initializes screen rendering. call on mob new
+ */
+/mob/proc/init_rendering()
+
+/**
+ * loads screen rendering. call on mob login
+ */
+/mob/proc/reload_rendering()
+ if(!client.parallax_holder)
+ client.CreateParallax()
+ else
+ client.parallax_holder.Reset(force = TRUE)
+ client.update_clickcatcher()
+ reload_fullscreen()
+
+/**
+ * destroys screen rendering. call on mob del
+ */
+/mob/proc/dispose_rendering()
+ wipe_fullscreens()
diff --git a/code/_rendering/parallax/parallax.dm b/code/_rendering/parallax/parallax.dm
new file mode 100644
index 0000000000..dbd27ae762
--- /dev/null
+++ b/code/_rendering/parallax/parallax.dm
@@ -0,0 +1,28 @@
+/**
+ * Holds parallax information.
+ */
+/datum/parallax
+ /// List of parallax objects - these are cloned to a parallax holder using Clone on each.
+ var/list/atom/movable/screen/parallax_layer/objects
+ /// Parallax layers
+ var/layers = 0
+
+/datum/parallax/New(create_objects = TRUE)
+ if(create_objects)
+ objects = CreateObjects()
+ layers = objects.len
+
+/datum/parallax/Destroy()
+ QDEL_LIST(objects)
+ return ..()
+
+/**
+ * Gets a new version of the objects inside - used when applying to a holder.
+ */
+/datum/parallax/proc/GetObjects()
+ . = list()
+ for(var/atom/movable/screen/parallax_layer/layer in objects)
+ . += layer.Clone()
+
+/datum/parallax/proc/CreateObjects()
+ . = objects = list()
diff --git a/code/_rendering/parallax/parallax_holder.dm b/code/_rendering/parallax/parallax_holder.dm
new file mode 100644
index 0000000000..8a9e4b71a9
--- /dev/null
+++ b/code/_rendering/parallax/parallax_holder.dm
@@ -0,0 +1,311 @@
+/**
+ * # Parallax holders
+ *
+ * Holds all the information about a client's parallax
+ *
+ * Not on mob because parallax is area based, not mob based.
+ *
+ * How parallax works:
+ * - Layers - normal layers, scroll with movement to relative position, can scroll
+ * - Absolute - absolute layers, scroll with movement to absolute position, cannot scroll
+ * - Vis - vis_contents-like model - things in this are directly applied and get no processing whatsoever. Things like overmap ships can use this.
+ */
+/datum/parallax_holder
+ /// Client that owns us
+ var/client/owner
+ /// The parallax object we're currently rendering
+ var/datum/parallax/parallax
+ /// Eye we were last anchored to - used to detect eye changes
+ var/atom/cached_eye
+ /// force this eye as the "real" eye - useful for secondary maps
+ var/atom/forced_eye
+ /// last turf loc
+ var/turf/last
+ /// last area - for parallax scrolling/loop animations
+ var/area/last_area
+ /// Holder object for vis
+ var/atom/movable/screen/parallax_vis/vis_holder
+ /// are we not on the main map? if so, put map id here
+ var/secondary_map
+ /// all layers
+ var/list/atom/movable/screen/parallax_layer/layers
+ /// vis contents
+ var/list/atom/movable/vis
+ /// currently scrolling?
+ var/scrolling = FALSE
+ /// current scroll speed in DS per scroll
+ var/scroll_speed
+ /// current scroll turn - applied after angle. if angle is 0 (picture moving north) and turn is 90, it would be like if you turned your viewport 90 deg clockwise.
+ var/scroll_turn
+ /// override planemaster we manipulate for turning and other effects
+ var/atom/movable/screen/plane_master/parallax/planemaster_override
+
+/datum/parallax_holder/New(client/C, secondary_map, forced_eye, planemaster_override)
+ owner = C
+ if(!owner)
+ CRASH("No client")
+ src.secondary_map = secondary_map
+ src.forced_eye = forced_eye
+ src.planemaster_override = planemaster_override
+ Reset()
+
+/datum/parallax_holder/Destroy()
+ if(owner)
+ if(owner.parallax_holder == src)
+ owner.parallax_holder = null
+ Remove()
+ HardResetAnimations()
+ QDEL_NULL(vis_holder)
+ QDEL_NULL(parallax)
+ layers = null
+ vis = null
+ last = null
+ forced_eye = cached_eye = null
+ owner = null
+ return ..()
+
+/datum/parallax_holder/proc/Reset(auto_z_change, force)
+ if(!(cached_eye = Eye()))
+ // if no eye, tear down
+ last = cached_eye = last_area = null
+ SetParallax(null, null, auto_z_change)
+ return
+ // first, check loc
+ var/turf/T = get_turf(cached_eye)
+ if(!T)
+ // if in nullspace, tear down
+ last = cached_eye = last_area = null
+ SetParallax(null, null, auto_z_change)
+ return
+ // set last loc and eye
+ last = T
+ last_area = T.loc
+ // rebuild parallax
+ SetParallax(SSparallax.get_parallax_datum(T.z), null, auto_z_change, force)
+ // hard reset positions to correct positions
+ for(var/atom/movable/screen/parallax_layer/L in layers)
+ L.ResetPosition(T.x, T.y)
+
+// better updates via client_mobs_in_contents can be created again when important recursive contents is ported!
+/datum/parallax_holder/proc/Update(full)
+ if(!full && !cached_eye || (get_turf(cached_eye) == last))
+ return
+ if(!owner) // why are we here
+ if(!QDELETED(src))
+ qdel(src)
+ return
+ if(cached_eye != Eye())
+ // eye mismatch, reset
+ Reset()
+ return
+ var/turf/T = get_turf(cached_eye)
+ if(!last || T.z != last.z)
+ // z mismatch, reset
+ Reset()
+ return
+ // get rel offsets
+ var/rel_x = T.x - last.x
+ var/rel_y = T.y - last.y
+ // set last
+ last = T
+ // move
+ for(var/atom/movable/screen/parallax_layer/L in layers)
+ L.RelativePosition(T.x, T.y, rel_x, rel_y)
+ // process scrolling/movedir
+ if(last_area != T.loc)
+ last_area = T.loc
+ UpdateMotion()
+
+/**
+ * Gets the eye we should be centered on
+ */
+/datum/parallax_holder/proc/Eye()
+ return forced_eye || owner?.eye
+
+/**
+ * Gets the base parallax planemaster for things like turning
+ */
+/datum/parallax_holder/proc/GetPlaneMaster()
+ return planemaster_override || (owner && (locate(/atom/movable/screen/plane_master/parallax) in owner?.screen))
+
+/**
+ * Syncs us to our parallax objects. Does NOT check if we should have those objects, that's Reset()'s job.
+ *
+ * Doesn't move/update positions/screen locs either.
+ *
+ * Also ensures movedirs are correct for the eye's pos.
+ */
+/datum/parallax_holder/proc/Sync(auto_z_change, force)
+ layers = list()
+ for(var/atom/movable/screen/parallax_layer/L in parallax.objects)
+ layers += L
+ L.map_id = secondary_map
+ if(!istype(vis_holder))
+ vis_holder = new /atom/movable/screen/parallax_vis
+ var/turf/T = get_turf(cached_eye)
+ vis_holder.vis_contents = vis = T? SSparallax.get_parallax_vis_contents(T.z) : list()
+ UpdateMotion(auto_z_change, force)
+
+/**
+ * Updates motion if needed
+ */
+/datum/parallax_holder/proc/UpdateMotion(auto_z_change, force)
+ var/turf/T = get_turf(cached_eye)
+ if(!T)
+ if(scroll_speed || scroll_turn)
+ HardResetAnimations()
+ return
+ var/list/ret = SSparallax.get_parallax_motion(T.z)
+ if(ret)
+ Animation(ret[1], ret[2], auto_z_change? 0 : ret[3], auto_z_change? 0 : ret[4], force)
+ else
+ var/area/A = T.loc
+ Animation(A.parallax_move_speed, A.parallax_move_angle, auto_z_change? 0 : null, auto_z_change? 0 : null, force)
+
+/datum/parallax_holder/proc/Apply(client/C = owner)
+ if(QDELETED(C))
+ return
+ . = list()
+ for(var/atom/movable/screen/parallax_layer/L in layers)
+ if(L.parallax_intensity > owner.prefs.parallax)
+ continue
+ if(!L.ShouldSee(C, last))
+ continue
+ L.SetView(C.view, TRUE)
+ . |= L
+ C.screen |= .
+ if(!secondary_map)
+ var/atom/movable/screen/plane_master/parallax_white/PM = locate() in C.screen
+ if(PM)
+ PM.color = list(
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 1, 1, 1, 1,
+ 0, 0, 0, 0
+ )
+
+/datum/parallax_holder/proc/Remove(client/C = owner)
+ if(QDELETED(C))
+ return
+ C.screen -= layers
+ if(!secondary_map)
+ var/atom/movable/screen/plane_master/parallax_white/PM = locate() in C.screen
+ if(PM)
+ PM.color = initial(PM.color)
+
+/datum/parallax_holder/proc/SetParallaxType(path)
+ if(!ispath(path, /datum/parallax))
+ CRASH("Invalid path")
+ SetParallax(new path)
+
+/datum/parallax_holder/proc/SetParallax(datum/parallax/P, delete_old = TRUE, auto_z_change, force)
+ if(P == parallax)
+ return
+ Remove()
+ if(delete_old && istype(parallax) && !QDELETED(parallax))
+ qdel(parallax)
+ HardResetAnimations()
+ parallax = P
+ if(!parallax)
+ return
+ Sync(auto_z_change, force)
+ Apply()
+
+/**
+ * Runs a modifier to parallax as an animation.
+ *
+ * @params
+ * speed - ds per loop
+ * turn - angle clockwise from north to turn the motion to
+ * windup - ds to spend on windups. 0 for immediate.
+ * turn_speed - ds to spend on turning. 0 for immediate.
+ */
+/datum/parallax_holder/proc/Animation(speed = 25, turn = 0, windup = speed, turn_speed = speed, force)
+ // Parallax doesn't currently use this method of rotating.
+
+ // #if !PARALLAX_ROTATION_ANIMATIONS
+ // turn_speed = 0
+ // #endif
+
+ if(speed == 0)
+ StopScrolling(turn = turn, time = windup)
+ return
+ // if(turn != scroll_turn && GetPlaneMaster())
+ // // first handle turn. we turn the planemaster
+ // var/matrix/turn_transform = matrix()
+ // turn_transform.Turn(turn)
+ // scroll_turn = turn
+ // animate(GetPlaneMaster(), transform = turn_transform, time = turn_speed, easing = QUAD_EASING | EASE_IN, flags = ANIMATION_END_NOW | ANIMATION_LINEAR_TRANSFORM)
+ if(scroll_speed == speed && !force)
+ // we're done
+ return
+ // speed diff?
+ scroll_speed = speed
+ scrolling = TRUE
+ // always scroll from north; turn handles everything
+ for(var/atom/movable/screen/parallax_layer/P in layers)
+ if(P.absolute)
+ continue
+ var/matrix/translate_matrix = matrix()
+ translate_matrix.Translate(cos(turn) * 480, sin(turn) * 480)
+ var/matrix/target_matrix = matrix()
+ var/move_speed = speed * P.speed
+ // do the first segment by shifting down one screen
+ P.transform = translate_matrix
+ animate(P, transform = target_matrix, time = move_speed, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_END_NOW)
+ // queue up another incase lag makes QueueLoop not fire on time, this time by shifting up
+ animate(transform = translate_matrix, time = 0)
+ animate(transform = target_matrix, time = move_speed)
+ P.QueueLoop(move_speed, speed * P.speed, translate_matrix, target_matrix)
+
+/**
+ * Smoothly stops the animation, turning to a certain angle as needed.
+ */
+/datum/parallax_holder/proc/StopScrolling(turn = 0, time = 30)
+ // reset turn
+ if(turn != scroll_turn && GetPlaneMaster())
+ var/matrix/turn_transform = matrix()
+ turn_transform.Turn(turn)
+ scroll_turn = turn
+ animate(GetPlaneMaster(), transform = turn_transform, time = time, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_END_NOW | ANIMATION_LINEAR_TRANSFORM)
+ if(scroll_speed == 0)
+ // we're done
+ scrolling = FALSE
+ scroll_speed = 0
+ return
+ scrolling = FALSE
+ scroll_speed = 0
+ // someone can do the math for "stop after a smooth iteration" later.
+ for(var/atom/movable/screen/parallax_layer/P in layers)
+ if(P.absolute)
+ continue
+ P.CancelAnimation()
+ var/matrix/translate_matrix = matrix()
+ translate_matrix.Translate(cos(turn) * 480, sin(turn) * 480)
+ P.transform = translate_matrix
+ animate(P, transform = matrix(), time = time, easing = QUAD_EASING | EASE_OUT)
+
+/**
+ * fully resets animation state
+ */
+/datum/parallax_holder/proc/HardResetAnimations()
+ // reset vars
+ scroll_turn = 0
+ scroll_speed = 0
+ scrolling = FALSE
+ // reset turn
+ if(GetPlaneMaster())
+ animate(GetPlaneMaster(), transform = matrix(), time = 0, flags = ANIMATION_END_NOW)
+ // reset objects
+ for(var/atom/movable/screen/parallax_layer/P in layers)
+ if(P.absolute)
+ continue
+ P.CancelAnimation()
+ animate(P, transform = matrix(), time = 0, flags = ANIMATION_END_NOW)
+
+/client/proc/CreateParallax()
+ if(!parallax_holder)
+ parallax_holder = new(src)
+/atom/movable/screen/parallax_vis
+ screen_loc = "CENTER,CENTER"
diff --git a/code/_rendering/parallax/parallax_object.dm b/code/_rendering/parallax/parallax_object.dm
new file mode 100644
index 0000000000..8307fc5f08
--- /dev/null
+++ b/code/_rendering/parallax/parallax_object.dm
@@ -0,0 +1,137 @@
+
+/atom/movable/screen/parallax_layer
+ icon = 'icons/screen/parallax.dmi'
+ blend_mode = BLEND_ADD
+ plane = PLANE_SPACE_PARALLAX
+ screen_loc = "CENTER-7,CENTER-7"
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ appearance_flags = PIXEL_SCALE | KEEP_TOGETHER
+
+ // notice - all parallax layers are 15x15 tiles. They roll over every 240 pixels.
+ /// pixel x/y shift per real x/y
+ var/speed = 1
+ /// current cached offset x
+ var/offset_x = 0
+ /// current cached offset y
+ var/offset_y = 0
+ /// normal centered x
+ var/center_x = 0
+ /// normal centered y
+ var/center_y = 0
+ /// absolute - always determine shift x/y as a function of real x/y instead of allowing for relative scroll.
+ var/absolute = FALSE
+ /// parallax level required to see this
+ var/parallax_intensity = PARALLAX_INSANE
+ /// current view we're adapted to
+ var/view_current
+ /// dynamic self tile - tile to our view size. set this to false for static parallax layers.
+ var/dynamic_self_tile = TRUE
+ /// map id
+ var/map_id
+ /// queued animation timerid
+ var/queued_animation
+
+/atom/movable/screen/parallax_layer/proc/ResetPosition(x, y)
+ // remember that our offsets/directiosn are relative to the player's viewport
+ // this means we need to scroll reverse to them.
+ offset_x = -(center_x + speed * x)
+ offset_y = -(center_y + speed * y)
+ if(!absolute)
+ if(offset_x > 240)
+ offset_x -= 480
+ if(offset_x < -240)
+ offset_x += 480
+ if(offset_y > 240)
+ offset_y -= 480
+ if(offset_y < -240)
+ offset_y += 480
+ screen_loc = "[map_id && "[map_id]:"]CENTER-7:[round(offset_x,1)],CENTER-7:[round(offset_y,1)]"
+
+/atom/movable/screen/parallax_layer/proc/RelativePosition(x, y, rel_x, rel_y)
+ if(absolute)
+ return ResetPosition(x, y)
+ offset_x -= rel_x * speed
+ offset_y -= rel_y * speed
+ if(offset_x > 240)
+ offset_x -= 480
+ if(offset_x < -240)
+ offset_x += 480
+ if(offset_y > 240)
+ offset_y -= 480
+ if(offset_y < -240)
+ offset_y += 480
+ screen_loc = "[map_id && "[map_id]:"]CENTER-7:[round(offset_x,1)],CENTER-7:[round(offset_y,1)]"
+
+/atom/movable/screen/parallax_layer/proc/SetView(client_view = world.view, force_update = FALSE)
+ if(view_current == client_view && !force_update)
+ return
+ view_current = client_view
+ if(!dynamic_self_tile)
+ return
+ var/list/real_view = getviewsize(client_view)
+ var/count_x = CEILING((real_view[1] / 2) / 15, 1) + 1
+ var/count_y = CEILING((real_view[2] / 2) / 15, 1) + 1
+ var/list/new_overlays = GetOverlays()
+ for(var/x in -count_x to count_x)
+ for(var/y in -count_y to count_y)
+ if(!x && !y)
+ continue
+ var/mutable_appearance/clone = new
+ // appearance clone
+ clone.icon = icon
+ clone.icon_state = icon_state
+ clone.overlays = GetOverlays()
+ // do NOT inherit our overlays! parallax layers should never have overlays,
+ // because if it inherited us it'll result in exponentially increasing overlays
+ // due to cut_overlays() above over there being a queue operation and not instant!
+ // clone.overlays = list()
+ // currently instantly using overlays =.
+ // clone.blend_mode = blend_mode
+ // clone.mouse_opacity = mouse_opacity
+ // clone.plane = plane
+ // clone.layer = layer
+ // shift to position
+ clone.transform = matrix(1, 0, x * 480, 0, 1, y * 480)
+ new_overlays += clone
+ overlays = new_overlays
+
+/atom/movable/screen/parallax_layer/proc/ShouldSee(client/C, atom/location)
+ return TRUE
+
+/**
+ * Return "natural" overlays, as we're goin to do some fuckery to overlays above.
+ */
+/atom/movable/screen/parallax_layer/proc/GetOverlays()
+ return list()
+
+/atom/movable/screen/parallax_layer/proc/Clone()
+ var/atom/movable/screen/parallax_layer/layer = new type
+ layer.speed = speed
+ layer.offset_x = offset_x
+ layer.offset_y = offset_y
+ layer.absolute = absolute
+ layer.parallax_intensity = parallax_intensity
+ layer.view_current = view_current
+ layer.appearance = appearance
+
+/atom/movable/screen/parallax_layer/proc/default_x()
+ return center_x
+
+/atom/movable/screen/parallax_layer/proc/default_y()
+ return center_y
+
+/atom/movable/screen/parallax_layer/proc/QueueLoop(delay, speed, matrix/translate_matrix, matrix/target_matrix)
+ if(queued_animation)
+ CancelAnimation()
+ queued_animation = addtimer(CALLBACK(src, .proc/_loop, speed, translate_matrix, target_matrix), delay, TIMER_STOPPABLE)
+
+/atom/movable/screen/parallax_layer/proc/_loop(speed, matrix/translate_matrix = matrix(1, 0, 0, 0, 1, 480), matrix/target_matrix = matrix())
+ transform = translate_matrix
+ animate(src, transform = target_matrix, time = speed, loop = -1)
+ animate(transform = translate_matrix, time = 0)
+ queued_animation = null
+
+/atom/movable/screen/parallax_layer/proc/CancelAnimation()
+ if(queued_animation)
+ deltimer(queued_animation)
+ queued_animation = null
diff --git a/code/_rendering/parallax/types/space.dm b/code/_rendering/parallax/types/space.dm
new file mode 100644
index 0000000000..38ad62aede
--- /dev/null
+++ b/code/_rendering/parallax/types/space.dm
@@ -0,0 +1,66 @@
+/datum/parallax/space
+ var/static/planet_offset_x = rand(100, 160)
+ var/static/planet_offset_y = rand(100, 160)
+ var/static/random_layer = pickweightAllowZero(list(
+ /atom/movable/screen/parallax_layer/space/random/asteroids = 35,
+ /atom/movable/screen/parallax_layer/space/random/space_gas = 35,
+ null = 30
+ ))
+ var/static/random_gas_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)
+
+/datum/parallax/space/CreateObjects()
+ . = ..()
+ . += new /atom/movable/screen/parallax_layer/space/layer_1
+ . += new /atom/movable/screen/parallax_layer/space/layer_2
+ . += new /atom/movable/screen/parallax_layer/space/layer_3
+ var/atom/movable/screen/parallax_layer/space/planet/P = new
+ P.pixel_x = planet_offset_x
+ P.pixel_y = planet_offset_y
+ . += P
+ if(random_layer)
+ . += new random_layer
+ if(ispath(random_layer, /atom/movable/screen/parallax_layer/space/random/space_gas))
+ var/atom/movable/screen/parallax_layer/space/random/space_gas/SG = locate(random_layer) in objects
+ SG.add_atom_colour(random_gas_color, ADMIN_COLOUR_PRIORITY)
+
+/atom/movable/screen/parallax_layer/space/layer_1
+ icon_state = "layer1"
+ speed = 0.6
+ layer = 1
+ parallax_intensity = PARALLAX_LOW
+
+/atom/movable/screen/parallax_layer/space/layer_2
+ icon_state = "layer2"
+ speed = 1
+ layer = 2
+ parallax_intensity = PARALLAX_MED
+
+/atom/movable/screen/parallax_layer/space/layer_3
+ icon_state = "layer3"
+ speed = 1.4
+ layer = 3
+ parallax_intensity = PARALLAX_HIGH
+
+/atom/movable/screen/parallax_layer/space/random
+ blend_mode = BLEND_OVERLAY
+ speed = 3
+ layer = 3
+ parallax_intensity = PARALLAX_INSANE
+
+/atom/movable/screen/parallax_layer/space/random/space_gas
+ icon_state = "space_gas"
+
+/atom/movable/screen/parallax_layer/space/random/asteroids
+ icon_state = "asteroids"
+
+/atom/movable/screen/parallax_layer/space/planet
+ icon_state = "planet"
+ blend_mode = BLEND_OVERLAY
+ absolute = TRUE //Status of seperation
+ speed = 3
+ layer = 30
+ dynamic_self_tile = FALSE
+
+/atom/movable/screen/parallax_layer/space/planet/ShouldSee(client/C, atom/location)
+ var/turf/T = get_turf(location)
+ return ..() && T && is_station_level(T.z)
diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
index 86bd517602..248b33d86d 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -5,21 +5,6 @@ SUBSYSTEM_DEF(parallax)
priority = FIRE_PRIORITY_PARALLAX
runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
var/list/currentrun
- var/planet_x_offset = 128
- var/planet_y_offset = 128
- var/random_layer
- var/random_parallax_color
-
-
-//These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
-/datum/controller/subsystem/parallax/PreInit()
- . = ..()
- if(prob(70)) //70% chance to pick a special extra layer
- random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
- random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color. [COLOR_SILVER]
- planet_y_offset = rand(100, 160)
- planet_x_offset = rand(100, 160)
-
/datum/controller/subsystem/parallax/fire(resumed = FALSE)
if (!resumed)
@@ -28,28 +13,82 @@ SUBSYSTEM_DEF(parallax)
//cache for sanic speed (lists are references anyways)
var/list/currentrun = src.currentrun
- while(length(currentrun))
- var/client/processing_client = currentrun[currentrun.len]
- currentrun.len--
- if (QDELETED(processing_client) || !processing_client.eye)
+ if(times_fired % 5) // lazy tick
+ while(length(currentrun))
+ var/client/processing_client = currentrun[currentrun.len]
+ currentrun.len--
+ if (QDELETED(processing_client) || !processing_client.eye)
+ if (MC_TICK_CHECK)
+ return
+ continue
+ processing_client.parallax_holder?.Update()
if (MC_TICK_CHECK)
return
- continue
-
- var/atom/movable/movable_eye = processing_client.eye
- if(!istype(movable_eye))
- continue
-
- for (movable_eye; isloc(movable_eye.loc) && !isturf(movable_eye.loc); movable_eye = movable_eye.loc);
-
- if(movable_eye == processing_client.movingmob)
+ else // full tick
+ while(length(currentrun))
+ var/client/processing_client = currentrun[currentrun.len]
+ currentrun.len--
+ if (QDELETED(processing_client) || !processing_client.eye)
+ if (MC_TICK_CHECK)
+ return
+ continue
+ processing_client.parallax_holder?.Update(TRUE)
if (MC_TICK_CHECK)
return
- continue
- if(!isnull(processing_client.movingmob))
- LAZYREMOVE(processing_client.movingmob.client_mobs_in_contents, processing_client.mob)
- LAZYADD(movable_eye.client_mobs_in_contents, processing_client.mob)
- processing_client.movingmob = movable_eye
- if (MC_TICK_CHECK)
- return
+
currentrun = null
+
+/**
+ * Gets parallax type for zlevel.
+ */
+/datum/controller/subsystem/parallax/proc/get_parallax_type(z)
+ return /datum/parallax/space
+
+/**
+ * Gets parallax for zlevel.
+ */
+/datum/controller/subsystem/parallax/proc/get_parallax_datum(z)
+ var/datum_type = get_parallax_type(z)
+ return new datum_type
+
+/**
+ * Gets parallax added vis contents for zlevel
+ */
+/datum/controller/subsystem/parallax/proc/get_parallax_vis_contents(z)
+ return list()
+
+/**
+ * Gets parallax motion for a zlevel
+ *
+ * Returns null or list(speed, dir deg clockwise from north, windup, turnrate)
+ * THE RETURNED LIST MUST BE A 4-TUPLE, OR PARALLAX WILL CRASH.
+ * DO NOT SCREW WITH THIS UNLESS YOU KNOW WHAT YOU ARE DOING.
+ *
+ * This will override area motion
+ */
+/datum/controller/subsystem/parallax/proc/get_parallax_motion(z)
+ return null
+
+/**
+ * updates all parallax for clients on a z
+ */
+/datum/controller/subsystem/parallax/proc/update_clients_on_z(z)
+ for(var/client/C in GLOB.clients)
+ if(C.mob.z == z)
+ C.parallax_holder?.Update()
+
+/**
+ * resets all parallax for clients on a z
+ */
+/datum/controller/subsystem/parallax/proc/reset_clients_on_z(z)
+ for(var/client/C in GLOB.clients)
+ if(C.mob.z == z)
+ C.parallax_holder?.Reset()
+
+/**
+ * updates motion of all clients on z
+ */
+/datum/controller/subsystem/parallax/proc/update_z_motion(z)
+ for(var/client/C in GLOB.clients)
+ if(C.mob.z == z)
+ C.parallax_holder?.UpdateMotion()
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 6af79d4d14..da295d70e2 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -513,7 +513,9 @@ SUBSYSTEM_DEF(shuttle)
if(!midpoint)
return FALSE
var/area/shuttle/transit/A = new()
- A.parallax_movedir = travel_dir
+ A.parallax_moving = TRUE
+ A.parallax_move_angle = dir2angle(travel_dir)
+ A.parallax_move_speed = M.parallax_speed
A.contents = proposal.reserved_turfs
var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint)
new_transit_dock.reserved_area = proposal
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index 2a8a0ea98a..6052b84364 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -101,7 +101,7 @@
if(!C)
return
watching += C
- M.overlay_fullscreen("cinematic",/atom/movable/screen/fullscreen/cinematic_backdrop)
+ M.overlay_fullscreen("cinematic",/atom/movable/screen/fullscreen/tiled/cinematic_backdrop)
C.screen += screen
//Sound helper
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 911ca7ecbe..c336213388 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -370,7 +370,7 @@
user.emote("scream")
user.gain_trauma(/datum/brain_trauma/severe/paralysis/spinesnapped) // oopsie indeed!
shake_camera(user, 7, 7)
- user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash)
user.clear_fullscreen("flash", 4.5)
if(94 to 98)
@@ -381,7 +381,7 @@
user.gain_trauma_type(BRAIN_TRAUMA_MILD)
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
shake_camera(user, 6, 6)
- user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash)
user.clear_fullscreen("flash", 3.5)
if(84 to 93)
@@ -394,7 +394,7 @@
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9)
user.DefaultCombatKnockdown(40)
shake_camera(user, 5, 5)
- user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash)
user.clear_fullscreen("flash", 2.5)
if(64 to 83)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 2e0df8917d..a6562f2710 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -771,7 +771,7 @@
/datum/status_effect/necropolis_curse/proc/apply_curse(set_curse)
curse_flags |= set_curse
if(curse_flags & CURSE_BLINDING)
- owner.overlay_fullscreen("curse", /atom/movable/screen/fullscreen/curse, 1)
+ owner.overlay_fullscreen("curse", /atom/movable/screen/fullscreen/scaled/curse, 1)
/datum/status_effect/necropolis_curse/proc/remove_curse(remove_curse)
if(remove_curse & CURSE_BLINDING)
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 6ad95c8b56..b922f52315 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -50,7 +50,12 @@
var/has_gravity = FALSE
- var/parallax_movedir = 0
+ /// Parallax moving?
+ var/parallax_moving = FALSE
+ /// Parallax move speed - 0 to disable
+ var/parallax_move_speed = 0
+ /// Parallax move dir - degrees clockwise from north
+ var/parallax_move_angle = 0
var/list/ambientsounds = GENERIC
flags_1 = CAN_BE_DIRTY_1
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 391d3b467d..5da389fbb8 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -28,7 +28,6 @@
var/pass_flags = 0
var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
var/atom/movable/moving_from_pull //attempt to resume grab after moving instead of before.
- var/list/client_mobs_in_contents // This contains all the client mobs within this container
var/list/acted_explosions //for explosion dodging
var/datum/forced_movement/force_moving = null //handled soley by forced_movement.dm
@@ -108,8 +107,6 @@
for(var/movable_content in contents)
qdel(movable_content)
- LAZYCLEARLIST(client_mobs_in_contents)
-
moveToNullspace()
/atom/movable/proc/update_emissive_block()
diff --git a/code/game/atoms_movement.dm b/code/game/atoms_movement.dm
index 43a22c9df0..9fd007e9ee 100644
--- a/code/game/atoms_movement.dm
+++ b/code/game/atoms_movement.dm
@@ -176,12 +176,8 @@
if (!inertia_moving)
inertia_next_move = world.time + inertia_move_delay
newtonian_move(Dir)
- if (length(client_mobs_in_contents))
- update_parallax_contents()
-
return TRUE
-
// Make sure you know what you're doing if you call this, this is intended to only be called by byond directly.
// You probably want CanPass()
/atom/movable/Cross(atom/movable/AM)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 4d4ddf2f52..b680377d0a 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -407,7 +407,7 @@
/obj/machinery/camera/get_remote_view_fullscreens(mob/user)
if(view_range == short_range) //unfocused
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 2)
/obj/machinery/camera/update_remote_sight(mob/living/user)
user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 9d675bc5dd..992807bed7 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -275,7 +275,7 @@
if(final)
playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
remote_eye.setLoc(get_turf(final))
- C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
+ C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash/static)
C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console!
else
playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, 0)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index f01342a903..af4d098157 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -531,7 +531,7 @@
/obj/structure/closet/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 1)
/obj/structure/closet/emp_act(severity)
. = ..()
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 6a588a61cd..73268009ce 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
/obj/structure/bodycontainer/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 2)
/*
* Morgue
*/
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 21bf732493..a9c0984bbc 100644
--- a/code/modules/admin/callproc/callproc.dm
+++ b/code/modules/admin/callproc/callproc.dm
@@ -115,9 +115,9 @@ GLOBAL_PROTECT(LastAdminCalledProc)
//adv proc call this, ya nerds
/world/proc/WrapAdminProcCall(datum/target, procname, list/arguments)
if(target == GLOBAL_PROC)
- return call("/proc/[procname]")(arglist(arguments))
- else if(target != world)
- return call(target, procname)(arglist(arguments))
+ return text2path("/proc/[procname]")? call("/proc/[procname]")(arglist(arguments)) : null
+ else if(target != world && istype(target, /datum)) // isdatum check incase someone manages to call WrapAdminProcCall(global) which would otherwise crash the process entirely
+ return hascall(target, procname)? call(target, procname)(arglist(arguments)) : null
else
log_admin("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]")
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index ca07f9a50b..79fd63adcc 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -3,11 +3,19 @@
/proc/_abs(A)
return abs(A)
-/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
- var/mutable_appearance/MA = new()
- for(var/v in set_vars)
- MA.vars[v] = set_vars[v]
- animate(A, appearance = MA, time, loop, easing, flags)
+/proc/_animate(atom/A, list/data, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
+ if(!istype(A))
+ return
+ animate(A, appearance = data, time = time, loop = loop, easing = easing, flags = flags)
+
+/proc/_animate_adv(atom/A, list/data, loop = 1, easing = LINEAR_EASING, flags = NONE)
+ if(!A || !islist(data) || data.len < 1)
+ return
+ animate(A, appearance = (data[1] - "time"), time = data[1]["time"], loop = loop, easing = easing, flags = flags)
+ if(data.len < 2)
+ return
+ for(var/i in 2 to data.len)
+ animate(appearance = (data[i] - "time"), time = data[i]["time"])
/proc/_acrccos(A)
return arccos(A)
diff --git a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
index 3609037f58..562d6a0c94 100644
--- a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm
@@ -69,7 +69,7 @@
do_sparks(5, TRUE, AM)
if(isliving(AM))
var/mob/living/L = AM
- L.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
+ L.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash/static)
L.clear_fullscreen("flash", 5)
var/obj/item/transfer_valve/TTV = locate() in L.GetAllContents()
if(TTV)
diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
index 2391658613..44c57b77ad 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -141,7 +141,7 @@
if(isliving(M.current) && M.current.stat != DEAD)
var/turf/t_turf = isAI(M.current) ? get_step(get_step(src, NORTH),NORTH) : get_turf(src) // AI too fat, must make sure it always ends up a 2 tiles north instead of on the ark.
do_teleport(M.current, t_turf, channel = TELEPORT_CHANNEL_CULT, forced = TRUE)
- M.current.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
+ M.current.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash)
M.current.clear_fullscreen("flash", 5)
playsound(src, 'sound/magic/clockwork/invoke_general.ogg', 50, FALSE)
recalls_remaining--
@@ -311,7 +311,7 @@
var/turf/T = get_turf(M)
if(is_servant_of_ratvar(M) && (!T || T.z != z))
M.forceMove(get_step(src, SOUTH))
- M.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
+ M.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash)
M.clear_fullscreen("flash", 5)
progress_in_seconds += GATEWAY_SUMMON_RATE
switch(progress_in_seconds)
diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm
index fd7e6fb98d..619129f679 100644
--- a/code/modules/antagonists/devil/true_devil/_true_devil.dm
+++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm
@@ -104,7 +104,7 @@
/mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
return 666
-/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash, override_protection = 0)
+/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/tiled/flash, override_protection = 0)
if(mind && has_bane(BANE_LIGHT))
mind.disrupt_spells(-500)
return ..() //flashes don't stop devils UNLESS it's their bane.
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 6c9ce28bc7..c652a7f791 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -439,7 +439,7 @@
return // we don't see the pipe network while inside cryo.
/obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user)
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 1)
/obj/machinery/atmospherics/components/unary/cryo_cell/can_crawl_through()
return // can't ventcrawl in or out of cryo.
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 70aab57e0a..41c4480c74 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -4,6 +4,16 @@
//BLACK MAGIC THINGS//
//////////////////////
parent_type = /datum
+
+ ///////////////
+ // Rendering //
+ ///////////////
+
+ /// Click catcher
+ var/atom/movable/screen/click_catcher/click_catcher
+ /// Parallax holder
+ var/datum/parallax_holder/parallax_holder
+
////////////////
//ADMIN THINGS//
////////////////
@@ -153,20 +163,6 @@
///When was the last time we warned them about not cryoing without an ahelp, set to -5 minutes so that rounstart cryo still warns
var/cryo_warned = -5 MINUTES
- var/list/parallax_layers
- var/list/parallax_layers_cached
- var/atom/movable/movingmob
- var/turf/previous_turf
- ///world.time of when we can state animate()ing parallax again
- var/dont_animate_parallax
- ///world.time of last parallax update
- var/last_parallax_shift
- ///ds between parallax updates
- var/parallax_throttle = 0
- var/parallax_movedir = 0
- var/parallax_layers_max = 3
- var/parallax_animate_timer
-
/**
* Assoc list with all the active maps - when a screen obj is added to
* a map, it's put in here as well.
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index ccca7c93cb..9948802bc9 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -444,8 +444,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
send_resources()
- generate_clickcatcher()
- apply_clickcatcher()
+ update_clickcatcher()
if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates.
to_chat(src, "You have unread updates in the changelog.")
@@ -535,9 +534,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
send2adminchat("Server", "[cheesy_message] (No admins online)")
QDEL_LIST_ASSOC_VAL(char_render_holders)
- if(movingmob != null)
- movingmob.client_mobs_in_contents -= mob
- UNSETEMPTY(movingmob.client_mobs_in_contents)
// seen_messages = null
Master.UpdateTickRate()
. = ..() //Even though we're going to be hard deleted there are still some things that want to know the destroy is happening
@@ -1014,7 +1010,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/list/old_view = getviewsize(view)
view = new_size
var/list/actualview = getviewsize(view)
- apply_clickcatcher(actualview)
+ update_clickcatcher()
+ parallax_holder.Reset()
mob.reload_fullscreen()
if (isliving(mob))
var/mob/living/M = mob
@@ -1023,17 +1020,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
addtimer(CALLBACK(src,.verb/fit_viewport,10)) //Delayed to avoid wingets from Login calls.
SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_CHANGE_VIEW, src, old_view, actualview)
-/client/proc/generate_clickcatcher()
- if(!void)
- void = new()
- screen += void
-
-/client/proc/apply_clickcatcher(list/actualview)
- generate_clickcatcher()
- if(!actualview)
- actualview = getviewsize(view)
- void.UpdateGreed(actualview[1],actualview[2])
-
/client/proc/AnnouncePR(announcement)
if(prefs && prefs.chat_toggles & CHAT_PULLR)
to_chat(src, announcement)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 952a11338a..3272060835 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/clientfps = 0
- var/parallax
+ var/parallax = PARALLAX_INSANE
var/ambientocclusion = TRUE
///Should we automatically fit the viewport?
@@ -2816,14 +2816,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
toggles ^= MIDROUND_ANTAG
if("parallaxup")
- parallax = WRAP(parallax + 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
- if (parent && parent.mob && parent.mob.hud_used)
- parent.mob.hud_used.update_parallax_pref(parent.mob)
+ parallax = WRAP(parallax + 1, PARALLAX_DISABLE, PARALLAX_INSANE + 1)
+ parent?.parallax_holder?.Reset()
if("parallaxdown")
- parallax = WRAP(parallax - 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
- if (parent && parent.mob && parent.mob.hud_used)
- parent.mob.hud_used.update_parallax_pref(parent.mob)
+ parallax = WRAP(parallax - 1, PARALLAX_DISABLE, PARALLAX_INSANE + 1)
+ parent?.parallax_holder?.Reset()
// Citadel edit - Prefs don't work outside of this. :c
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index f683ba0ee3..72b2f5d949 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -5,7 +5,7 @@
// You do not need to raise this if you are adding new values that have sane defaults.
// Only raise this value when changing the meaning/format/name/layout of an existing value
// where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX 52
+#define SAVEFILE_VERSION_MAX 53
/*
SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -343,6 +343,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
marking_list += list(list(part, old_marking_value, copied_color_list))
features["mam_body_markings"] = marking_list
+ if(current_version < 53)
+ parallax = PARALLAX_INSANE
+
/datum/preferences/proc/load_path(ckey,filename="preferences.sav")
if(!ckey)
return
@@ -469,7 +472,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot))
toggles = sanitize_integer(toggles, 0, 16777215, initial(toggles))
clientfps = sanitize_integer(clientfps, 0, 1000, 0)
- parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null)
+ parallax = sanitize_integer(parallax, PARALLAX_DISABLE, PARALLAX_INSANE, null)
ambientocclusion = sanitize_integer(ambientocclusion, 0, 1, initial(ambientocclusion))
auto_fit_viewport = sanitize_integer(auto_fit_viewport, 0, 1, initial(auto_fit_viewport))
widescreenpref = sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index ce767ae00d..90b6da26fa 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -126,5 +126,5 @@ INITIALIZE_IMMEDIATE(/mob/dead)
return ..()
/mob/dead/onTransitZ(old_z,new_z)
- ..()
+ . = ..()
update_z(new_z)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 2068ed47e8..48244a91be 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -578,8 +578,6 @@
Spl.Fade(TRUE)
character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
- character.update_parallax_teleport()
-
job.standard_assign_skills(character.mind)
SSticker.minds += character.mind
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 0f30fe20fc..624db8caf5 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -377,8 +377,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
ghostize(0, penalize = TRUE)
-
-
/mob/dead/observer/Move(NewLoc, direct)
if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, NewLoc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
return
@@ -388,7 +386,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(NewLoc)
forceMove(NewLoc)
- update_parallax_contents()
else
forceMove(get_turf(src)) //Get out of closets and such as a ghost
if((direct & NORTH) && y < world.maxy)
@@ -487,9 +484,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!L || !L.len)
to_chat(usr, "No area available.")
return
-
usr.forceMove(pick(L))
- update_parallax_contents()
/mob/dead/observer/proc/view_gas()
set category = "Ghost"
@@ -568,7 +563,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination.
A.forceMove(T)
- A.update_parallax_contents()
else
to_chat(A, "This mob is not located in the game world.")
diff --git a/code/modules/mob/dead/observer/respawn.dm b/code/modules/mob/dead/observer/respawn.dm
index 94ebf42a2a..32f775ed46 100644
--- a/code/modules/mob/dead/observer/respawn.dm
+++ b/code/modules/mob/dead/observer/respawn.dm
@@ -165,7 +165,7 @@
/**
* Actual proc that removes us and puts us back on lobby
- *
+ *
* Returns the new mob.
*/
/mob/dead/observer/proc/transfer_to_lobby()
@@ -174,8 +174,7 @@
return
client.screen.Cut()
client.view_size.resetToDefault()
- client.generate_clickcatcher()
- client.apply_clickcatcher()
+ client.update_clickcatcher()
client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))
client.view_size.resetToDefault()
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 6acd604ca5..61839ce123 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -646,7 +646,7 @@
become_blind(EYES_COVERED)
else if(tinttotal >= TINT_DARKENED)
cure_blind(EYES_COVERED)
- overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, 2)
+ overlay_fullscreen("tint", /atom/movable/screen/fullscreen/scaled/impaired, 2)
else
cure_blind(EYES_COVERED)
clear_fullscreen("tint", 0)
@@ -722,10 +722,10 @@
visionseverity = 9
if(-INFINITY to -24)
visionseverity = 10
- overlay_fullscreen("critvision", /atom/movable/screen/fullscreen/crit/vision, visionseverity)
+ overlay_fullscreen("critvision", /atom/movable/screen/fullscreen/scaled/crit/vision, visionseverity)
else
clear_fullscreen("critvision")
- overlay_fullscreen("crit", /atom/movable/screen/fullscreen/crit, severity)
+ overlay_fullscreen("crit", /atom/movable/screen/fullscreen/scaled/crit, severity)
else
clear_fullscreen("crit")
clear_fullscreen("critvision")
@@ -749,7 +749,7 @@
severity = 6
if(45 to INFINITY)
severity = 7
- overlay_fullscreen("oxy", /atom/movable/screen/fullscreen/oxy, severity)
+ overlay_fullscreen("oxy", /atom/movable/screen/fullscreen/scaled/oxy, severity)
else
clear_fullscreen("oxy")
@@ -770,7 +770,7 @@
severity = 5
if(85 to INFINITY)
severity = 6
- overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/scaled/brute, severity)
else
clear_fullscreen("brute")
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 46ba9a5eb0..a12d6614fa 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -361,7 +361,7 @@
return embeds
-/mob/living/carbon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash, override_protection = 0)
+/mob/living/carbon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/tiled/flash, override_protection = 0)
. = ..()
var/damage = override_protection ? intensity : intensity - get_eye_protection()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index c75654e10b..199a6b44be 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -209,7 +209,7 @@
update_tint()
if(G.vision_correction)
if(HAS_TRAIT(src, TRAIT_NEARSIGHT))
- overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1)
+ overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/scaled/impaired, 1)
if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
update_sight()
if(!QDELETED(src))
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index 5b5aa9d5c0..f7cb0e0760 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -5,7 +5,7 @@
/mob/living/carbon/adjust_drugginess(amount)
druggy = max(druggy+amount, 0)
if(druggy)
- overlay_fullscreen("high", /atom/movable/screen/fullscreen/high)
+ overlay_fullscreen("high", /atom/movable/screen/fullscreen/tiled/high)
throw_alert("high", /atom/movable/screen/alert/high)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "high", /datum/mood_event/high)
sound_environment_override = SOUND_ENVIRONMENT_DRUGGED
@@ -18,7 +18,7 @@
/mob/living/carbon/set_drugginess(amount)
druggy = max(amount, 0)
if(druggy)
- overlay_fullscreen("high", /atom/movable/screen/fullscreen/high)
+ overlay_fullscreen("high", /atom/movable/screen/fullscreen/tiled/high)
throw_alert("high", /atom/movable/screen/alert/high)
else
clear_fullscreen("high")
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 28fd4e0451..2070d07e14 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -579,7 +579,7 @@
UNLINT(livingdoll.filters += filter(type="alpha", icon = mob_mask))
livingdoll.filters += filter(type="drop_shadow", size = -1)
if(severity > 0)
- overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/scaled/brute, severity)
else
clear_fullscreen("brute")
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 7423a164a4..5ce80c5575 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -539,7 +539,7 @@
//called when the mob receives a bright flash
-/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash, override_protection = 0)
+/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/tiled/flash, override_protection = 0)
if((override_protection || get_eye_protection() < intensity) && (override_blindness_check || !(HAS_TRAIT(src, TRAIT_BLIND))))
overlay_fullscreen("flash", type)
addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index dcaa28b39c..3fad48e584 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -84,7 +84,6 @@
if(ai.client && !ai.multicam_on)
ai.client.eye = src
update_ai_detect_hud()
- update_parallax_contents()
//Holopad
if(istype(ai.current, /obj/machinery/holopad))
var/obj/machinery/holopad/H = ai.current
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index c2bc49f9a8..07cb671706 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -4,7 +4,7 @@
stat = DEAD
update_mobility()
update_sight()
- clear_fullscreens()
+ wipe_fullscreens()
//New pAI's get a brand new mind to prevent meta stuff from their previous life. This new mind causes problems down the line if it's not deleted here.
remove_from_alive_mob_list()
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 6c9d508fd8..55d0336671 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -144,6 +144,6 @@
P.on_hit(src, 0, def_zone)
return BULLET_ACT_HIT
-/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash/static)
+/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/tiled/flash/static)
if(affect_silicon)
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index de6b858f79..be596b0292 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -113,7 +113,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
severity = 7
hud_used.healths.icon_state = "elite_health[severity]"
if(severity > 0)
- overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/scaled/brute, severity)
else
clear_fullscreen("brute")
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 02e88e3741..498ca19a39 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -599,7 +599,7 @@
/mob/living/proc/become_nearsighted(source)
if(!HAS_TRAIT(src, TRAIT_NEARSIGHT))
- overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1)
+ overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/scaled/impaired, 1)
ADD_TRAIT(src, TRAIT_NEARSIGHT, source)
/mob/living/proc/cure_husk(source)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 7d2daac326..aac55c614b 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -58,10 +58,6 @@
//readd this mob's HUDs (antag, med, etc)
reload_huds()
- reload_fullscreen() // Reload any fullscreen overlays this mob has.
-
- add_click_catcher()
-
sync_mind()
//Reload alternate appearances
@@ -93,6 +89,9 @@
if(has_field_of_vision && CONFIG_GET(flag/use_field_of_vision))
LoadComponent(/datum/component/field_of_vision, field_of_vision_type)
+ // load rendering
+ reload_rendering()
+
AddElement(/datum/element/weather_listener, /datum/weather/ash_storm, ZTRAIT_ASHSTORM, GLOB.ash_storm_sounds)
// optimized area sound effects. Enable during events (compile flag when 😳)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index d240f97a23..03c5e76e87 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1,25 +1,3 @@
-/mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
- remove_from_mob_list()
- remove_from_dead_mob_list()
- remove_from_alive_mob_list()
- GLOB.all_clockwork_mobs -= src
- focus = null
- LAssailant = null
- movespeed_modification = null
- for (var/alert in alerts)
- clear_alert(alert, TRUE)
- if(observers && observers.len)
- for(var/M in observers)
- var/mob/dead/observe = M
- observe.reset_perspective(null)
- qdel(hud_used)
- for(var/cc in client_colours)
- qdel(cc)
- client_colours = null
- ghostize()
- ..()
- return QDEL_HINT_HARDDEL
-
/mob/Initialize()
add_to_mob_list()
if(stat == DEAD)
@@ -38,8 +16,32 @@
update_config_movespeed()
update_movespeed(TRUE)
initialize_actionspeed()
+ init_rendering()
hook_vr("mob_new",list(src))
+/mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
+ remove_from_mob_list()
+ remove_from_dead_mob_list()
+ remove_from_alive_mob_list()
+ GLOB.all_clockwork_mobs -= src
+ focus = null
+ LAssailant = null
+ movespeed_modification = null
+ for (var/alert in alerts)
+ clear_alert(alert, TRUE)
+ if(observers && observers.len)
+ for(var/M in observers)
+ var/mob/dead/observe = M
+ observe.reset_perspective(null)
+ dispose_rendering()
+ qdel(hud_used)
+ for(var/cc in client_colours)
+ qdel(cc)
+ client_colours = null
+ ghostize()
+ ..()
+ return QDEL_HINT_HARDDEL
+
/mob/GenerateTag()
tag = "mob_[next_mob_id++]"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 8e6226069c..527b0c0917 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -16,6 +16,10 @@
attack_hand_unwieldlyness = CLICK_CD_MELEE
attack_hand_speed = 0
+ // Rendering
+ /// Fullscreen objects
+ var/list/fullscreens = list()
+
/// What receives our keyboard input. src by default.
var/datum/focus
@@ -143,7 +147,6 @@
var/registered_z
var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly
- var/list/screens = list()
var/list/client_colours = list()
var/hud_type = /datum/hud
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index bfd4cfcd29..1da355a419 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -110,6 +110,11 @@
SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVE, src, direction, n, oldloc, add_delay)
+/mob/Moved(atom/OldLoc, Dir)
+ . = ..()
+ if(client)
+ client.parallax_holder.Update()
+
/// Process_Grab(): checks for grab, attempts to break if so. Return TRUE to prevent movement.
/client/proc/Process_Grab()
if(mob.pulledby)
@@ -398,3 +403,8 @@
/mob/proc/canZMove(direction, turf/target)
return FALSE
+
+/mob/onTransitZ(old_z, new_z)
+ . = ..()
+ if(old_z != new_z)
+ client?.parallax_holder?.Reset()
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 089484ea9f..da1919443a 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -53,7 +53,7 @@
if(eye_blind) // UNCONSCIOUS or has blind trait, or has temporary blindness
if(stat == CONSCIOUS || stat == SOFT_CRIT)
throw_alert("blind", /atom/movable/screen/alert/blind)
- overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/scaled/blind)
// You are blind why should you be able to make out details like color, only shapes near you
// add_client_colour(/datum/client_colour/monochrome/blind)
else // CONSCIOUS no blind trait, no blindness
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 7fc57ee3a7..85b5cdac51 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -465,7 +465,7 @@
/obj/machinery/disposal/bin/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 2)
//Delivery Chute
diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
index 7109c87999..4a03844a33 100644
--- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
@@ -302,7 +302,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
user.reset_perspective(parentSphere)
user.set_machine(src)
var/datum/action/peepholeCancel/PHC = new
- user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/scaled/impaired, 1)
PHC.Grant(user)
return TRUE
diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm
index 5c96bca07c..103e331039 100644
--- a/code/modules/shuttle/docking.dm
+++ b/code/modules/shuttle/docking.dm
@@ -162,7 +162,7 @@
for(var/i in 1 to areas_to_move.len)
CHECK_TICK
var/area/internal_area = areas_to_move[i]
- internal_area.afterShuttleMove(new_parallax_dir) //areas
+ internal_area.afterShuttleMove(new_parallax_dir, parallax_speed) //areas
for(var/i in 1 to old_turfs.len)
CHECK_TICK
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index cc37fbbcc4..2a15558e64 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -461,11 +461,11 @@
for(var/area/shuttle/escape/E in GLOB.sortedAreas)
areas += E
hyperspace_sound(HYPERSPACE_END, areas)
- if(time_left <= PARALLAX_LOOP_TIME)
+ if(time_left <= parallax_speed)
var/area_parallax = FALSE
for(var/place in shuttle_areas)
var/area/shuttle/shuttle_area = place
- if(shuttle_area.parallax_movedir)
+ if(shuttle_area.parallax_moving)
area_parallax = TRUE
break
if(area_parallax)
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index a215b58b55..029d50585a 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -356,7 +356,7 @@
playsound(console, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
remote_eye.setLoc(T)
to_chat(target, "Jumped to [selected]")
- C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
+ C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/tiled/flash/static)
C.clear_fullscreen("flash", 3)
else
playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, 0)
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 8c1b3fa955..ceb9b7adea 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -117,8 +117,6 @@ All ShuttleMove procs go here
if(rotation)
shuttleRotate(rotation)
- update_parallax_contents()
-
return TRUE
/atom/movable/proc/lateShuttleMove(turf/oldT, list/movement_force, move_dir)
@@ -153,16 +151,21 @@ All ShuttleMove procs go here
//The old turf has now been given back to the area that turf originaly belonged to
var/area/old_dest_area = newT.loc
- parallax_movedir = old_dest_area.parallax_movedir
-
+ parallax_moving = old_dest_area.parallax_moving
+ parallax_move_angle = old_dest_area.parallax_move_angle
+ parallax_move_speed = old_dest_area.parallax_move_speed
old_dest_area.contents -= newT
contents += newT
newT.change_area(old_dest_area, src)
return TRUE
// Called on areas after everything has been moved
-/area/proc/afterShuttleMove(new_parallax_dir)
- parallax_movedir = new_parallax_dir
+/area/proc/afterShuttleMove(new_parallax_dir, speed)
+ if(!new_parallax_dir)
+ parallax_moving = FALSE
+ return
+ parallax_move_angle = dir2angle(new_parallax_dir)
+ parallax_move_speed = speed
return TRUE
/area/proc/lateShuttleMove()
@@ -309,6 +312,7 @@ All ShuttleMove procs go here
if(buckled)
shake_force *= 0.25
shake_camera(src, shake_force, 1)
+ client?.parallax_holder?.Reset(auto_z_change = FALSE, force = TRUE)
/mob/living/lateShuttleMove(turf/oldT, list/movement_force, move_dir)
if(buckled)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 0eb7f6ee20..d3e52410d6 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -367,6 +367,9 @@
var/can_move_docking_ports = FALSE
var/list/hidden_turfs = list()
+ /// parallax speed in seconds per loop
+ var/parallax_speed = 25
+
/obj/docking_port/mobile/register(replace = FALSE)
. = ..()
if(!id)
@@ -709,27 +712,24 @@
create_ripples(destination, tl)
var/obj/docking_port/stationary/S0 = get_docked()
- if(istype(S0, /obj/docking_port/stationary/transit) && timeLeft(1) <= PARALLAX_LOOP_TIME)
+ if(istype(S0, /obj/docking_port/stationary/transit) && timeLeft(1) <= parallax_speed)
+ var/parallax_ongoing = FALSE
for(var/place in shuttle_areas)
var/area/shuttle/shuttle_area = place
- if(shuttle_area.parallax_movedir)
- parallax_slowdown()
+ if(shuttle_area.parallax_moving)
+ parallax_ongoing = TRUE
+ if(parallax_ongoing)
+ parallax_slowdown()
/obj/docking_port/mobile/proc/parallax_slowdown()
- for(var/place in shuttle_areas)
- var/area/shuttle/shuttle_area = place
- shuttle_area.parallax_movedir = FALSE
- if(assigned_transit?.assigned_area)
- assigned_transit.assigned_area.parallax_movedir = FALSE
- var/list/L0 = return_ordered_turfs(x, y, z, dir)
- for (var/thing in L0)
- var/turf/T = thing
- if(!T || !istype(T.loc, area_type))
- continue
- for (var/thing2 in T)
- var/atom/movable/AM = thing2
- if (length(AM.client_mobs_in_contents))
- AM.update_parallax_contents()
+ for(var/mob/M in GLOB.player_list)
+ var/area/A = get_area(M)
+ if(A in shuttle_areas)
+ M.client?.parallax_holder?.StopScrolling(A.parallax_move_angle, parallax_speed)
+ for(var/area/shuttle_area in shuttle_areas + assigned_transit?.assigned_area)
+ shuttle_area.parallax_moving = FALSE
+ shuttle_area.parallax_move_speed = 0
+ shuttle_area.parallax_move_angle = 0
/obj/docking_port/mobile/proc/check_transit_zone()
if(assigned_transit)
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 9861a1b639..06865a0f39 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -41,7 +41,7 @@
return
switch(eye_damaged)
if(BLURRY_VISION_ONE, BLURRY_VISION_TWO)
- owner.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/impaired, eye_damaged)
+ owner.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/scaled/impaired, eye_damaged)
if(BLIND_VISION_THREE)
owner.become_blind(EYE_DAMAGE)
if(ishuman(owner))
@@ -106,7 +106,7 @@
else if(eye_damaged == BLIND_VISION_THREE)
owner.become_blind(EYE_DAMAGE)
if(eye_damaged && eye_damaged != BLIND_VISION_THREE)
- owner.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/impaired, eye_damaged)
+ owner.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/scaled/impaired, eye_damaged)
else
owner.clear_fullscreen("eye_damage")
diff --git a/icons/screen/clickcatcher.dmi b/icons/screen/clickcatcher.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..50a36169914508076abe6f451b36a431e79629a1
GIT binary patch
literal 226
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