['(' [arguments] ')']
+/datum/sdql_parser/proc/call_function(i, list/node, list/arguments)
if(length(tokenl(i)))
var/procname = ""
if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc.
@@ -520,25 +538,12 @@
return i + 1
-//expression: ( unary_expression | '(' expression ')' | value ) [binary_operator expression]
-/datum/SDQL_parser/proc/expression(i, list/node)
+//expression: ( unary_expression | value ) [binary_operator expression]
+/datum/sdql_parser/proc/expression(i, list/node)
if(token(i) in unary_operators)
i = unary_expression(i, node)
- else if(token(i) == "(")
- var/list/expr = list()
-
- i = expression(i + 1, expr)
-
- if(token(i) != ")")
- parse_error("Missing ) at end of expression.")
-
- else
- i++
-
- node[++node.len] = expr
-
else
i = value(i, node)
@@ -546,7 +551,7 @@
i = binary_operator(i, node)
i = expression(i, node)
- else if(token(i) in comparitors)
+ else if(token(i) in comparators)
i = binary_operator(i, node)
var/list/rhs = list()
@@ -558,8 +563,8 @@
return i
-//unary_expression: unary_operator ( unary_expression | value | '(' expression ')' )
-/datum/SDQL_parser/proc/unary_expression(i, list/node)
+//unary_expression: unary_operator ( unary_expression | value )
+/datum/sdql_parser/proc/unary_expression(i, list/node)
if(token(i) in unary_operators)
var/list/unary_exp = list()
@@ -570,19 +575,6 @@
if(token(i) in unary_operators)
i = unary_expression(i, unary_exp)
- else if(token(i) == "(")
- var/list/expr = list()
-
- i = expression(i + 1, expr)
-
- if(token(i) != ")")
- parse_error("Missing ) at end of expression.")
-
- else
- i++
-
- unary_exp[++unary_exp.len] = expr
-
else
i = value(i, unary_exp)
@@ -595,10 +587,10 @@
return i
-//binary_operator: comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
-/datum/SDQL_parser/proc/binary_operator(i, list/node)
+//binary_operator: comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
+/datum/sdql_parser/proc/binary_operator(i, list/node)
- if(token(i) in (binary_operators + comparitors))
+ if(token(i) in (binary_operators + comparators))
node += token(i)
else
@@ -607,8 +599,8 @@
return i + 1
-//value: variable | string | number | 'null' | object_type
-/datum/SDQL_parser/proc/value(i, list/node)
+//value: variable | string | number | 'null' | object_type | array | selectors_array
+/datum/sdql_parser/proc/value(i, list/node)
if(token(i) == "null")
node += "null"
i++
@@ -626,8 +618,13 @@
else if(token(i)[1] == "\[") // Start a list.
i = array(i, node)
+
+ else if(copytext(token(i), 1, 3) == "@\[")//3 == length("@\[") + 1
+ i = selectors_array(i, node)
+
else if(token(i)[1] == "/")
i = object_type(i, node)
+
else
i = variable(i, node)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index f721bcc5fca7..8618d94d0e83 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -135,11 +135,16 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/obj/effect/statclick/ticket_list
var/current_state
-/obj/effect/statclick/ticket_list/New(loc, name, state)
+/obj/effect/statclick/ticket_list/Initialize(mapload, name, state)
+ . = ..()
current_state = state
- ..()
/obj/effect/statclick/ticket_list/Click()
+ if (!usr.client?.holder)
+ message_admins("[key_name_admin(usr)] non-holder clicked on a ticket list statclick! ([src])")
+ log_game("[key_name(usr)] non-holder clicked on a ticket list statclick! ([src])")
+ return
+
GLOB.ahelp_tickets.BrowseTickets(current_state)
//called by admin topic
diff --git a/code/modules/admin/verbs/fov.dm b/code/modules/admin/verbs/fov.dm
new file mode 100644
index 000000000000..f74ba6f80584
--- /dev/null
+++ b/code/modules/admin/verbs/fov.dm
@@ -0,0 +1,17 @@
+/client/proc/cmd_admin_toggle_fov()
+ set name = "Enable/Disable Field of View"
+ set category = "Debug"
+
+ if(!check_rights(R_ADMIN) || !check_rights(R_DEBUG))
+ return
+
+ var/on_off = CONFIG_GET(flag/native_fov)
+
+ message_admins("[key_name_admin(usr)] has [on_off ? "disabled" : "enabled"] the Native Field of View configuration..")
+ log_admin("[key_name(usr)] has [on_off ? "disabled" : "enabled"] the Native Field of View configuration.")
+ CONFIG_SET(flag/native_fov, !on_off)
+
+ SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggled Field of View", "[on_off ? "Enabled" : "Disabled"]"))
+
+ for(var/mob/living/mob in GLOB.player_list)
+ mob.update_fov()
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 596d235b0a96..06670afbdb96 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1261,6 +1261,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggled Hub Visibility", "[GLOB.hub_visibility ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/*
/client/proc/cmd_admin_toggle_fov()
set category = "Admin.Fun"
set name = "Enable/Disable Field of Vision"
@@ -1312,6 +1313,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
CHECK_TICK
busy_toggling_fov = FALSE
+*/
/client/proc/smite(mob/living/carbon/human/target as mob)
set name = "Smite"
diff --git a/code/modules/antagonists/blob/blob/blob_report.dm b/code/modules/antagonists/blob/blob/blob_report.dm
index d532121e12cb..7541ff7fac2e 100644
--- a/code/modules/antagonists/blob/blob/blob_report.dm
+++ b/code/modules/antagonists/blob/blob/blob_report.dm
@@ -29,15 +29,11 @@
floor += 1
if(iswallturf(T))
- var/turf/closed/wall/TW = T
- if(TW.intact)
- wall += 2
- else
- wall += 1
+ wall += 1
if(istype(T, /turf/closed/wall/r_wall))
var/turf/closed/wall/r_wall/TRW = T
- if(TRW.intact)
+ if(TRW.d_state == INTACT)
r_wall += 2
else
r_wall += 1
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 4dff21c36970..1332724fefa6 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/tiled/flash/static)
+ L.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/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_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
index 18211d044755..959a3da82e90 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
@@ -5,7 +5,6 @@
clockwork_desc = "A sigil of some purpose."
icon_state = "sigil"
layer = LOW_OBJ_LAYER
- plane = ABOVE_WALL_PLANE
alpha = 50
resistance_flags = NONE
var/affects_servants = FALSE
diff --git a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
index 2e2a01d386cc..a3c61e572a40 100644
--- a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
@@ -4,7 +4,6 @@
desc = "Some big guy. For you."
clockwork_desc = "One of Ratvar's generals."
alpha = 200
- layer = MASSIVE_OBJ_LAYER
/obj/effect/clockwork/general_marker/New()
..()
diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm
index 2884886e47c3..9fd2422cd4ca 100644
--- a/code/modules/antagonists/clockcult/clock_structure.dm
+++ b/code/modules/antagonists/clockcult/clock_structure.dm
@@ -125,7 +125,7 @@
/obj/structure/destructible/clockwork/massive
name = "massive construct"
desc = "A very large construction."
- layer = MASSIVE_OBJ_LAYER
+ plane = MASSIVE_OBJ_PLANE
density = FALSE
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF
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 92225990ddf9..919443ac76ad 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/tiled/flash)
+ M.current.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/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/tiled/flash)
+ M.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/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 d524a7edaee7..c379614a36f9 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/tiled/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/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/antagonists/devil/true_devil/inventory.dm b/code/modules/antagonists/devil/true_devil/inventory.dm
index e98cb5ca72f2..2b90b7281dd1 100644
--- a/code/modules/antagonists/devil/true_devil/inventory.dm
+++ b/code/modules/antagonists/devil/true_devil/inventory.dm
@@ -17,7 +17,6 @@
hands_overlays += r_hand_overlay
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
r_hand.plane = ABOVE_HUD_PLANE
r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
client.screen |= r_hand
@@ -28,7 +27,6 @@
hands_overlays += l_hand_overlay
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
l_hand.plane = ABOVE_HUD_PLANE
l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
client.screen |= l_hand
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index f05321487f28..da5c2feebf42 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -21,7 +21,7 @@
invisibility = INVISIBILITY_REVENANT
health = INFINITY //Revenants don't use health, they use essence instead
maxHealth = INFINITY
- layer = GHOST_LAYER
+ plane = GHOST_PLANE
healable = FALSE
spacewalk = TRUE
sight = SEE_SELF
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 3a173d55c75e..f56007b40e8d 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -245,7 +245,7 @@
if(!isplatingturf(T) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
- if(floor.intact && floor.floor_tile)
+ if(floor.overfloor_placed && floor.floor_tile)
new floor.floor_tile(floor)
floor.broken = 0
floor.burnt = 0
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index f60e853aed0d..c1354874aab5 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -107,7 +107,7 @@
reagents_holder.add_reagent(condensing_reagent.type, amt)
. = REACTING
for(var/atom/movable/AM in location)
- if(location.intact && AM.level == 1)
+ if(location.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
continue
reagents_holder.reaction(AM, TOUCH)
reagents_holder.reaction(location, TOUCH)
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 90407264ad3b..191da302ecde 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -67,7 +67,6 @@
desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm0"
- plane = ABOVE_WALL_PLANE
use_power = IDLE_POWER_USE
idle_power_usage = 4
active_power_usage = 8
@@ -719,7 +718,7 @@
set_light(0)
SSvis_overlays.add_vis_overlay(src, icon, overlay_state, layer, plane, dir)
- SSvis_overlays.add_vis_overlay(src, icon, overlay_state, EMISSIVE_LAYER, EMISSIVE_PLANE, dir)
+ SSvis_overlays.add_vis_overlay(src, icon, overlay_state, null, EMISSIVE_PLANE, dir)
update_light()
/obj/machinery/airalarm/process()
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 49fc0322df82..1f2725667209 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -12,32 +12,45 @@
/obj/machinery/atmospherics
anchored = TRUE
- move_resist = INFINITY //Moving a connected machine without actually doing the normal (dis)connection things will probably cause a LOT of issues.
+ move_resist = INFINITY //Moving a connected machine without actually doing the normal (dis)connection things will probably cause a LOT of issues. (this imply moving machines with something that can push turfs like a megafauna)
idle_power_usage = 0
active_power_usage = 0
power_channel = ENVIRON
layer = GAS_PIPE_HIDDEN_LAYER //under wires
- plane = ABOVE_WALL_PLANE
resistance_flags = FIRE_PROOF
max_integrity = 200
obj_flags = CAN_BE_HIT | ON_BLUEPRINTS
var/nodealert = 0
+ ///Check if the object can be unwrenched
var/can_unwrench = 0
+ ///Bitflag of the initialized directions (NORTH | SOUTH | EAST | WEST)
var/initialize_directions = 0
+ ///The color of the pipe
var/pipe_color
+ ///What layer the pipe is in (from 1 to 3, default 2)
var/piping_layer = PIPING_LAYER_DEFAULT
+ ///The flags of the pipe/component (PIPING_ALL_LAYER | PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE)
var/pipe_flags = NONE
+ ///This only works on pipes, because they have 1000 subtypes wich need to be visible and invisible under tiles, so we track this here
+ var/hide = TRUE
+
var/static/list/iconsetids = list()
var/static/list/pipeimages = list()
+ ///The image of the pipe/device used for ventcrawling
var/image/pipe_vision_img = null
+ ///The type of the device (UNARY, BINARY, TRINARY, QUATERNARY)
var/device_type = 0
+ ///The lists of nodes that a pipe/device has, depends on the device_type var (from 1 to 4)
var/list/obj/machinery/atmospherics/nodes
+ ///The path of the pipe/device that will spawn after unwrenching it (such as pipe fittings)
var/construction_type
- var/pipe_state //icon_state as a pipe item
+ ///icon_state as a pipe item
+ var/pipe_state
+ ///Check if the device should be on or off (mostly used in processing for machines)
var/on = FALSE
var/interacts_with_air = FALSE
@@ -191,11 +204,6 @@
if(!can_unwrench(user))
return ..()
- var/turf/T = get_turf(src)
- if (level==1 && isturf(T) && T.intact)
- to_chat(user, "You must remove the plating first!")
- return TRUE
-
var/datum/gas_mixture/int_air = return_air()
var/datum/gas_mixture/env_air = loc.return_air()
add_fingerprint(user)
@@ -272,8 +280,6 @@
add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
pipe_color = obj_color
setPipingLayer(set_layer)
- var/turf/T = get_turf(src)
- level = T.intact ? 2 : 1
atmosinit()
var/list/nodes = pipeline_expansion()
for(var/obj/machinery/atmospherics/A in nodes)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm
index 45ccaf1e867a..fe50cfdce73a 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm
@@ -13,9 +13,5 @@
if(EAST, WEST)
initialize_directions = EAST|WEST
-/obj/machinery/atmospherics/components/binary/hide(intact)
- update_icon()
- ..()
-
/obj/machinery/atmospherics/components/binary/getNodeConnects()
return list(turn(dir, 180), dir)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index 4dd7b672a730..b853facd15c5 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -14,7 +14,7 @@
name = "dual-port air vent"
desc = "Has a valve and pump attached to it. There are two ports."
- level = 1
+ hide = TRUE
interacts_with_air = TRUE
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index f8866877feae..37d11663a527 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -2,11 +2,15 @@
// On top of that, now people can add component-speciic procs/vars if they want!
/obj/machinery/atmospherics/components
- var/welded = FALSE //Used on pumps and scrubbers
- var/showpipe = FALSE
- var/shift_underlay_only = TRUE //Layering only shifts underlay?
-
+ hide = FALSE
+ var/welded = FALSE
+ ///Should the component should show the pipe underneath it?
+ var/showpipe = TRUE
+ ///When the component is on a non default layer should we shift everything? Or just the underlay pipe
+ var/shift_underlay_only = TRUE
+ ///Stores the component pipeline
var/list/datum/pipeline/parents
+ ///Stores the component gas mixture
var/list/datum/gas_mixture/airs
/obj/machinery/atmospherics/components/New()
@@ -18,26 +22,34 @@
var/datum/gas_mixture/A = new(200)
airs[i] = A
+/obj/machinery/atmospherics/components/Initialize(mapload)
+ . = ..()
+
+ if(hide)
+ RegisterSignal(src, COMSIG_OBJ_HIDE, .proc/hide_pipe)
+
// Iconnery
/obj/machinery/atmospherics/components/proc/update_icon_nopipes()
return
+/**
+ * Called in Initialize(), set the showpipe var to true or false depending on the situation, calls update_icon()
+ */
+/obj/machinery/atmospherics/components/proc/hide_pipe(datum/source, covered)
+ SIGNAL_HANDLER
+ showpipe = !covered
+ update_appearance()
+
/obj/machinery/atmospherics/components/update_icon()
update_icon_nopipes()
underlays.Cut()
- var/turf/T = loc
- if(level == 2 || (istype(T) && !T.intact))
- showpipe = TRUE
- plane = ABOVE_WALL_PLANE
- else
- showpipe = FALSE
- plane = FLOOR_PLANE
+ plane = showpipe ? GAME_PLANE : FLOOR_PLANE
if(!showpipe)
- return //no need to update the pipes if they aren't showing
+ return ..() //no need to update the pipes if they aren't showing
var/connected = 0 //Direction bitset
@@ -54,12 +66,13 @@
if(!shift_underlay_only)
PIPING_LAYER_SHIFT(src, piping_layer)
+ return ..()
/obj/machinery/atmospherics/components/proc/get_pipe_underlay(state, dir, color = null)
if(color)
- . = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', state, dir, color, piping_layer = shift_underlay_only ? piping_layer : 2)
+ . = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', state, dir, color, piping_layer = shift_underlay_only ? piping_layer : PIPING_LAYER_DEFAULT)
else
- . = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', state, dir, piping_layer = shift_underlay_only ? piping_layer : 2)
+ . = getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', state, dir, piping_layer = shift_underlay_only ? piping_layer : PIPING_LAYER_DEFAULT)
// Pipenet stuff; housekeeping
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index f5c10b365f39..cd765d01410e 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/scaled/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/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/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index c1990a0ffeae..f3c08a3de612 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -15,7 +15,7 @@
var/id = null
var/datum/radio_frequency/radio_connection
- level = 1
+ hide = TRUE
interacts_with_air = TRUE
layer = GAS_SCRUBBER_LAYER
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
index 7cfdb9d63c1d..a3b093ec25d9 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/passive_vent.dm
@@ -5,7 +5,7 @@
desc = "It is an open vent."
can_unwrench = TRUE
- level = 1
+ hide = TRUE
interacts_with_air = TRUE
layer = GAS_SCRUBBER_LAYER
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
index 6188c919acce..9fc5ea77cc17 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/atmospherics/components/unary_devices.dmi'
can_unwrench = TRUE
use_power = NO_POWER_USE
- level = 0
+ hide = TRUE
layer = GAS_FILTER_LAYER
pipe_flags = PIPING_ONE_PER_TURF
pipe_state = "connector"
@@ -56,7 +56,7 @@
icon_state = "connector_map-3"
/obj/machinery/atmospherics/components/unary/portables_connector/visible
- level = 2
+ hide = FALSE
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1
piping_layer = 1
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
index 40c2f0f5a8a2..e859ccda14bf 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
@@ -13,11 +13,7 @@
/obj/machinery/atmospherics/components/unary/on_construction()
..()
- update_icon()
-
-/obj/machinery/atmospherics/components/unary/hide(intact)
- update_icon()
- ..(intact)
+ update_appearance()
/obj/machinery/atmospherics/components/unary/proc/assign_uid_vents()
uid = num2text(gl_uid++)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index deafe7a9f040..9bb619bb0b6a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -12,7 +12,7 @@
use_power = IDLE_POWER_USE
can_unwrench = TRUE
welded = FALSE
- level = 1
+ hide = TRUE
layer = GAS_SCRUBBER_LAYER
interacts_with_air = TRUE
@@ -255,7 +255,7 @@
user.visible_message("[user] unwelded the vent.", "You unweld the vent.", "You hear welding.")
welded = FALSE
update_icon()
- pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
+ pipe_vision_img = image(src, loc, dir = dir)
pipe_vision_img.plane = ABOVE_HUD_PLANE
return TRUE
@@ -283,7 +283,7 @@
user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the vent", "You hear loud scraping noises.")
welded = FALSE
update_icon()
- pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
+ pipe_vision_img = image(src, loc, dir = dir)
pipe_vision_img.plane = ABOVE_HUD_PLANE
playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 4ced6c0554b4..831b89f3ba7c 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -10,7 +10,7 @@
active_power_usage = 60
can_unwrench = TRUE
welded = FALSE
- level = 1
+ hide = TRUE
layer = GAS_SCRUBBER_LAYER
interacts_with_air = TRUE
@@ -256,7 +256,7 @@
user.visible_message("[user] unwelds the scrubber.", "You unweld the scrubber.", "You hear welding.")
welded = FALSE
update_icon()
- pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
+ pipe_vision_img = image(src, loc, dir = dir)
pipe_vision_img.plane = ABOVE_HUD_PLANE
return TRUE
@@ -280,7 +280,7 @@
user.visible_message("[user] furiously claws at [src]!", "You manage to clear away the stuff blocking the scrubber.", "You hear loud scraping noises.")
welded = FALSE
update_icon()
- pipe_vision_img = image(src, loc, layer = ABOVE_HUD_LAYER, dir = dir)
+ pipe_vision_img = image(src, loc, dir = dir)
pipe_vision_img.plane = ABOVE_HUD_PLANE
playsound(loc, 'sound/weapons/bladeslice.ogg', 100, 1)
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index e7ea86851bc4..4781295dca02 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -44,8 +44,6 @@
for(var/obj/machinery/atmospherics/pipe/pipe in loc)
if(pipe.piping_layer == target_layer)
candidate = pipe
- if(pipe.level == 2)
- break
if(candidate)
target = candidate
setAttachLayer(candidate.piping_layer)
diff --git a/code/modules/atmospherics/machinery/pipes/bluespace.dm b/code/modules/atmospherics/machinery/pipes/bluespace.dm
index 2735a38106b6..a0d1e9192dfe 100644
--- a/code/modules/atmospherics/machinery/pipes/bluespace.dm
+++ b/code/modules/atmospherics/machinery/pipes/bluespace.dm
@@ -11,6 +11,7 @@ GLOBAL_LIST_EMPTY(bluespace_pipe_networks)
can_buckle = FALSE
construction_type = /obj/item/pipe/bluespace
var/bluespace_network_name
+ var/showpipe = FALSE
/obj/machinery/atmospherics/pipe/bluespace/New()
icon_state = "pipe"
@@ -46,22 +47,21 @@ GLOBAL_LIST_EMPTY(bluespace_pipe_networks)
/obj/machinery/atmospherics/pipe/bluespace/pipeline_expansion()
return ..() + GLOB.bluespace_pipe_networks[bluespace_network_name] - src
-/obj/machinery/atmospherics/pipe/bluespace/hide()
- update_icon()
+/**
+ * Called in Initialize(), set the showpipe var to true or false depending on the situation, calls update_icon()
+ */
+/obj/machinery/atmospherics/pipe/bluespace/proc/hide_pipe(datum/source, covered)
+ SIGNAL_HANDLER
+ showpipe = !covered
+ update_appearance()
-/obj/machinery/atmospherics/pipe/bluespace/update_icon(showpipe)
+/obj/machinery/atmospherics/pipe/bluespace/update_icon()
underlays.Cut()
- var/turf/T = loc
- if(level == 2 || !T.intact)
- showpipe = TRUE
- plane = GAME_PLANE
- else
- showpipe = FALSE
- plane = FLOOR_PLANE
+ plane = showpipe ? GAME_PLANE : FLOOR_PLANE
if(!showpipe)
- return //no need to update the pipes if they aren't showing
+ return ..() //no need to update the pipes if they aren't showing
var/connected = 0 //Direction bitset
@@ -76,6 +76,8 @@ GLOBAL_LIST_EMPTY(bluespace_pipe_networks)
if((initialize_directions & direction) && !(connected & direction))
underlays += get_pipe_underlay("pipe_exposed", direction)
+ return ..()
+
/obj/machinery/atmospherics/pipe/bluespace/paint()
return FALSE
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
index b71c16b2ffef..fa5ad0e86260 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
@@ -1,5 +1,4 @@
/obj/machinery/atmospherics/pipe/heat_exchanging
- level = 2
var/minimum_temperature_difference = 0.01
var/thermal_conductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
color = "#404040"
@@ -17,9 +16,6 @@
return FALSE
. = ..()
-/obj/machinery/atmospherics/pipe/heat_exchanging/hide()
- return
-
/obj/machinery/atmospherics/pipe/heat_exchanging/process_atmos()
var/environment_temperature = 0
var/datum/gas_mixture/pipe_air = return_air()
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index 8a300e23f3a2..b16d0fd92213 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -99,8 +99,6 @@
/obj/machinery/atmospherics/pipe/layer_manifold/atmosinit()
normalize_cardinal_directions()
findAllConnections()
- var/turf/T = loc // hide if turf is not intact
- hide(T.intact)
/obj/machinery/atmospherics/pipe/layer_manifold/setPipingLayer()
piping_layer = PIPING_LAYER_DEFAULT
diff --git a/code/modules/atmospherics/machinery/pipes/mapping.dm b/code/modules/atmospherics/machinery/pipes/mapping.dm
index c868d377ea40..06778dae51f8 100644
--- a/code/modules/atmospherics/machinery/pipes/mapping.dm
+++ b/code/modules/atmospherics/machinery/pipes/mapping.dm
@@ -1,48 +1,48 @@
//Colored pipes, use these for mapping
#define HELPER_PARTIAL(Fulltype, Iconbase, Color) \
- ##Fulltype { \
- pipe_color = Color; \
- color = Color; \
- } \
- ##Fulltype/visible { \
- level = PIPE_VISIBLE_LEVEL; \
- layer = GAS_PIPE_VISIBLE_LAYER; \
- } \
- ##Fulltype/visible/layer1 { \
- piping_layer = 1; \
- icon_state = Iconbase + "-1"; \
- } \
- ##Fulltype/visible/layer3 { \
- piping_layer = 3; \
- icon_state = Iconbase + "-3"; \
- } \
- ##Fulltype/hidden { \
- level = PIPE_HIDDEN_LEVEL; \
- } \
- ##Fulltype/hidden/layer1 { \
- piping_layer = 1; \
- icon_state = Iconbase + "-1"; \
- } \
- ##Fulltype/hidden/layer3 { \
- piping_layer = 3; \
- icon_state = Iconbase + "-3"; \
+ ##Fulltype { \
+ pipe_color = Color; \
+ color = Color; \
+ } \
+ ##Fulltype/visible { \
+ hide = FALSE; \
+ layer = GAS_PIPE_VISIBLE_LAYER; \
+ } \
+ ##Fulltype/visible/layer1 { \
+ piping_layer = 1; \
+ icon_state = Iconbase + "-1"; \
+ } \
+ ##Fulltype/visible/layer3 { \
+ piping_layer = 3; \
+ icon_state = Iconbase + "-3"; \
+ } \
+ ##Fulltype/hidden { \
+ hide = TRUE; \
+ } \
+ ##Fulltype/hidden/layer1 { \
+ piping_layer = 1; \
+ icon_state = Iconbase + "-1"; \
+ } \
+ ##Fulltype/hidden/layer3 { \
+ piping_layer = 3; \
+ icon_state = Iconbase + "-3"; \
}
#define HELPER_PARTIAL_NAMED(Fulltype, Iconbase, Name, Color) \
- HELPER_PARTIAL(Fulltype, Iconbase, Color) \
- ##Fulltype { \
- name = Name; \
+ HELPER_PARTIAL(Fulltype, Iconbase, Color) \
+ ##Fulltype { \
+ name = Name; \
}
#define HELPER(Type, Color) \
- HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Color) \
- HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Color) \
+ HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Color) \
+ HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Color) \
HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold4w/##Type, "manifold4w", Color)
#define HELPER_NAMED(Type, Name, Color) \
- HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Name, Color) \
- HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Name, Color) \
+ HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Name, Color) \
+ HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Name, Color) \
HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold4w/##Type, "manifold4w", Name, Color)
HELPER(general, null)
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index a514606e4d89..abf1b744218d 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -2,8 +2,6 @@
var/datum/gas_mixture/air_temporary //used when reconstructing a pipeline that broke
var/volume = 0
- level = 1
-
use_power = NO_POWER_USE
can_unwrench = 1
var/datum/pipeline/parent = null
@@ -18,6 +16,13 @@
volume = 35 * device_type
..()
+///I have no idea why there's a new and at this point I'm too afraid to ask
+/obj/machinery/atmospherics/pipe/Initialize(mapload)
+ . = ..()
+
+ if(hide)
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) //if changing this, change the subtypes RemoveElements too, because thats how bespoke works
+
/obj/machinery/atmospherics/pipe/nullifyNode(i)
var/obj/machinery/atmospherics/oldN = nodes[i]
..()
@@ -32,16 +37,6 @@
parent = new
parent.build_pipeline(src)
-/obj/machinery/atmospherics/pipe/atmosinit()
- var/turf/T = loc // hide if turf is not intact
- hide(T.intact)
- ..()
-
-/obj/machinery/atmospherics/pipe/hide(i)
- if(level == 1 && isturf(loc))
- invisibility = i ? INVISIBILITY_MAXIMUM : 0
- update_icon()
-
/obj/machinery/atmospherics/pipe/proc/releaseAirToTurf()
if(air_temporary)
var/turf/T = loc
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index 5c5c0000d1b3..e3dccea7fe82 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -2,7 +2,7 @@
icon = 'icons/misc/buildmode.dmi'
var/datum/buildmode/bd
// If we don't do this, we get occluded by item action buttons
- layer = ABOVE_HUD_LAYER
+ layer = ABOVE_HUD_PLANE
/atom/movable/screen/buildmode/New(bld)
bd = bld
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index 37f39793af8f..cbc2bed26f67 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -92,10 +92,12 @@
cam_screen.del_on_map_removal = TRUE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = list()
- for(var/plane in subtypesof(/atom/movable/screen/plane_master))
- var/atom/movable/screen/instance = new plane()
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master) - /atom/movable/screen/plane_master/blackness)
+ var/atom/movable/screen/plane_master/instance = new plane()
if (!renderLighting && instance.plane == LIGHTING_PLANE)
instance.alpha = 100
+ if(instance.blend_mode_override)
+ instance.blend_mode = instance.blend_mode_override
instance.assigned_map = map_name
instance.del_on_map_removal = TRUE
instance.screen_loc = "[map_name]:CENTER"
@@ -866,6 +868,8 @@ GLOBAL_DATUM_INIT(podlauncher, /datum/centcom_podlauncher, new)
image_icon = 'icons/obj/supplypods_32x32.dmi'
image_state = "selector"
image_layer = FLY_LAYER
+ layer = FLY_LAYER
+ plane = ABOVE_GAME_PLANE
alpha = 150
/obj/effect/hallucination/simple/dropoff_location
@@ -873,4 +877,6 @@ GLOBAL_DATUM_INIT(podlauncher, /datum/centcom_podlauncher, new)
image_icon = 'icons/obj/supplypods_32x32.dmi'
image_state = "dropoff_indicator"
image_layer = FLY_LAYER
+ layer = FLY_LAYER
+ plane = ABOVE_GAME_PLANE
alpha = 0
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 6ca963df735e..5c2319bada12 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -1041,7 +1041,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
/client/proc/show_character_previews(mutable_appearance/source)
LAZYINITLIST(char_render_holders)
if(!LAZYLEN(char_render_holders))
- for(var/plane_master_path as anything in subtypesof(/atom/movable/screen/plane_master))
+ for(var/plane_master_path as anything in subtypesof(/atom/movable/screen/plane_master) - /atom/movable/screen/plane_master/blackness)
var/atom/movable/screen/plane_master/plane_master = new plane_master_path()
char_render_holders["plane_master-[plane_master.plane]"] = plane_master
plane_master.backdrop(mob)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index dbf1bfc22cd4..793f6c4c6a56 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -186,6 +186,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/auto_fit_viewport = FALSE
///Should we be in the widescreen mode set by the config?
var/widescreenpref = TRUE
+ ///How opaque is the fov effect?
+ var/fov_darkness = 255
///Strip menu style
var/long_strip_menu = FALSE
///What size should pixels be displayed as? 0 is strech to fit
@@ -905,6 +907,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat +=""
dat += "Citadel Preferences" //Because fuck me if preferences can't be fucking modularized and expected to update in a reasonable timeframe.
dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]
"
+ dat += "Field of view darkness: [fov_darkness]
"
dat += "Long strip menu: [long_strip_menu ? "Enabled" : "Disabled"]
"
dat += "Auto stand: [autostand ? "Enabled" : "Disabled"]
"
dat += "Auto OOC: [auto_ooc ? "Enabled" : "Disabled"]
"
@@ -2760,6 +2763,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("widescreenpref")
widescreenpref = !widescreenpref
user.client.view_size.setDefault(getScreenSize(widescreenpref))
+ if("fov_darkness")
+ var/how_dark = input(user, "The density of darkness of field of vision cones you may have by wearing restrictive eye cover.", "Field of view darkness", fov_darkness) as null|num
+ if(!isnull(how_dark))
+ fov_darkness = how_dark
if("long_strip_menu")
long_strip_menu = !long_strip_menu
@@ -3081,12 +3088,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("ambientocclusion")
ambientocclusion = !ambientocclusion
if(parent && parent.screen && parent.screen.len)
- var/atom/movable/screen/plane_master/game_world/G = parent.mob.hud_used.plane_masters["[GAME_PLANE]"]
- var/atom/movable/screen/plane_master/above_wall/A = parent.mob.hud_used.plane_masters["[ABOVE_WALL_PLANE]"]
- var/atom/movable/screen/plane_master/wall/W = parent.mob.hud_used.plane_masters["[WALL_PLANE]"]
- G.backdrop(parent.mob)
- A.backdrop(parent.mob)
- W.backdrop(parent.mob)
+ var/atom/movable/screen/plane_master/game_world/plane_master = locate() in parent.screen
+ if(!plane_master)
+ return
+
+ plane_master.backdrop(parent.mob)
if("auto_fit_viewport")
auto_fit_viewport = !auto_fit_viewport
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 1f29cb451544..3360605887a4 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -453,6 +453,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["ambientocclusion"] >> ambientocclusion
S["auto_fit_viewport"] >> auto_fit_viewport
S["widescreenpref"] >> widescreenpref
+ S["fov_darkness"] >> fov_darkness
S["long_strip_menu"] >> long_strip_menu
S["pixel_size"] >> pixel_size
S["scaling_method"] >> scaling_method
@@ -518,6 +519,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
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))
+ fov_darkness = sanitize_integer(fov_darkness, 0, 255, initial(fov_darkness))
long_strip_menu = sanitize_integer(long_strip_menu, 0, 1, initial(long_strip_menu))
pixel_size = sanitize_integer(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, initial(pixel_size))
scaling_method = sanitize_text(scaling_method, initial(scaling_method))
@@ -658,6 +660,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["damagescreenshake"], damagescreenshake)
WRITE_FILE(S["arousable"], arousable)
WRITE_FILE(S["widescreenpref"], widescreenpref)
+ WRITE_FILE(S["fov_darkness"], fov_darkness)
WRITE_FILE(S["long_strip_menu"], long_strip_menu)
WRITE_FILE(S["autostand"], autostand)
WRITE_FILE(S["cit_toggles"], cit_toggles)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index f349eae02b72..2be3cc9f13cb 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -407,6 +407,7 @@ BLIND // can't see anything
/obj/item/clothing/proc/visor_toggling() //handles all the actual toggling of flags
up = !up
+ SEND_SIGNAL(src, COMSIG_CLOTHING_VISOR_TOGGLE, up)
clothing_flags ^= visor_flags
flags_inv ^= visor_flags_inv
flags_cover ^= initial(flags_cover)
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 461648c2703d..f522f1acd4c2 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -101,7 +101,6 @@
var/mutable_appearance/MA = new()
MA.maptext = "[strength]k"
MA.color = "#04e604"
- MA.layer = RAD_TEXT_LAYER
MA.plane = GAME_PLANE
pic.appearance = MA
flick_overlay(pic, list(user.client), 10)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index a2d13822f831..10015ba1ed30 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -14,6 +14,14 @@
visor_flags_inv = HIDEFACE
var/flavor_adjust = TRUE //can it do the heehoo alt click to hide/show identity
+/obj/item/clothing/mask/gas/Initialize()
+ . = ..()
+ init_fov()
+
+/// Initializes the FoV component for the gas mask
+/obj/item/clothing/mask/gas/proc/init_fov()
+ AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES)
+
/obj/item/clothing/mask/gas/examine(mob/user)
. = ..()
if(flavor_adjust)
@@ -90,6 +98,9 @@
dog_fashion = /datum/dog_fashion/head/clown
var/static/list/clownmask_designs
+/obj/item/clothing/mask/gas/clown_hat/init_fov()
+ return
+
/obj/item/clothing/mask/gas/clown_hat/Initialize(mapload)
.=..()
if(!clownmask_designs)
@@ -132,6 +143,9 @@
dog_fashion = /datum/dog_fashion/head/clown
var/list/poly_colors = list("#FF8000", "#FFFFFF", "#FF0000", "#0000FF", "#FFFF00")
+/obj/item/clothing/mask/gas/clown_hat/init_fov()
+ return
+
/obj/item/clothing/mask/gas/clown_hat_polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, poly_colors, 5, names = list("Hair", "Frame", "Mouth", "Eyes", "Markings"))
@@ -155,6 +169,9 @@
actions_types = list(/datum/action/item_action/adjust)
var/static/list/mimemask_designs
+/obj/item/clothing/mask/gas/clown_hat/init_fov()
+ return
+
/obj/item/clothing/mask/gas/mime/Initialize(mapload)
.=..()
if(!mimemask_designs)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index c946002fa292..6c7b1b606517 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -946,7 +946,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = ..()
if(!isinhands)
- var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", EMISSIVE_LAYER)
+ var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay")
energy_overlay.plane = EMISSIVE_PLANE
energy_overlay.color = energy_color
. += energy_overlay
@@ -977,7 +977,7 @@
/obj/item/clothing/suit/space/hardsuit/lavaknight/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = ..()
if(!isinhands)
- var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay", EMISSIVE_LAYER)
+ var/mutable_appearance/energy_overlay = mutable_appearance(icon_file, "knight_cydonia_overlay")
energy_overlay.plane = EMISSIVE_PLANE
energy_overlay.color = energy_color
. += energy_overlay
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 8eacf66bbe33..937f09ea8dd9 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -131,6 +131,7 @@
/obj/item/clothing/head/helmet/space/plasmaman/visor_toggling() //handles all the actual toggling of flags
up = !up
+ SEND_SIGNAL(src, COMSIG_CLOTHING_VISOR_TOGGLE, up)
clothing_flags ^= visor_flags
flags_inv ^= visor_flags_inv
if(visor_vars_to_toggle & VISOR_FLASHPROTECT)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 5920c33df1b2..da2b5deeb296 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -1007,7 +1007,6 @@ GLOBAL_LIST_INIT(hallucination_list, list(
slots_free += ui_storage2
if(slots_free.len)
target.halitem.screen_loc = pick(slots_free)
- target.halitem.layer = ABOVE_HUD_LAYER
target.halitem.plane = ABOVE_HUD_PLANE
switch(rand(1,6))
if(1) //revolver
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 08020f708d4b..1771e6ce1a31 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -43,7 +43,7 @@
/obj/machinery/smartfridge/update_icon_state()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
if(!stat)
- SSvis_overlays.add_vis_overlay(src, icon, "smartfridge-light-mask", EMISSIVE_LAYER, EMISSIVE_PLANE, dir, alpha)
+ SSvis_overlays.add_vis_overlay(src, icon, "smartfridge-light-mask", null, EMISSIVE_PLANE, dir, alpha)
if (visible_contents)
switch(contents.len)
if(0)
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 49a5c607ec1d..187a7a61d56e 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -18,6 +18,10 @@
#define HOLODECK_CD 25
#define HOLODECK_DMG_CD 500
+/// typecache for turfs that should be considered ok during floorchecks.
+/// A linked turf being anything not in this typecache will cause the holodeck to perform an emergency shutdown.
+GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf/open/floor/holofloor, /turf/closed)))
+
/obj/machinery/computer/holodeck
name = "holodeck control console"
desc = "A computer used to control a nearby holodeck."
@@ -242,10 +246,12 @@
load_program(offline_program, TRUE)
active = FALSE
+///returns TRUE if all floors of the holodeck are present, returns FALSE if any are broken or removed
/obj/machinery/computer/holodeck/proc/floorcheck()
for(var/turf/T in linked)
- if(!T.intact || isspaceturf(T))
- return FALSE
+ if (is_type_in_typecache(T, GLOB.typecache_holodeck_linked_floorcheck_ok))
+ continue
+ return FALSE
return TRUE
/obj/machinery/computer/holodeck/proc/nerf(active)
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 7340ffda61aa..fb157272d252 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -115,7 +115,7 @@
/turf/open/floor/holofloor/carpet/update_icon()
. = ..()
- if(intact)
+ if(overfloor_placed)
queue_smooth(src)
/turf/open/floor/holofloor/wood
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index 4b6f76574f30..9784ae79b978 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -875,7 +875,6 @@
pixel_x = -31
if(WEST)
pixel_x = 31
- plane = ABOVE_WALL_PLANE
/obj/item/electronic_assembly/wallmount/Moved(atom/OldLoc, Dir, Forced = FALSE) //reset the plane if moved off the wall.
. = ..()
diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm
index bd6bfdd177d2..d1ad8a9e7b44 100644
--- a/code/modules/lighting/lighting_object.dm
+++ b/code/modules/lighting/lighting_object.dm
@@ -1,16 +1,15 @@
/atom/movable/lighting_object
- name = ""
+ name = ""
- anchored = TRUE
+ anchored = TRUE
- icon = LIGHTING_ICON
- icon_state = "transparent"
- color = null //we manually set color in init instead
- plane = LIGHTING_PLANE
+ icon = LIGHTING_ICON
+ icon_state = "transparent"
+ color = null //we manually set color in init instead
+ plane = LIGHTING_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- layer = LIGHTING_LAYER
- invisibility = INVISIBILITY_LIGHTING
- vis_flags = VIS_HIDE
+ invisibility = INVISIBILITY_LIGHTING
+ vis_flags = VIS_HIDE
var/needs_update = FALSE
var/turf/myturf
diff --git a/code/modules/mapping/mapping_helpers/baseturf.dm b/code/modules/mapping/mapping_helpers/baseturf.dm
index 8bb44ae993d8..acd63d3a5a32 100644
--- a/code/modules/mapping/mapping_helpers/baseturf.dm
+++ b/code/modules/mapping/mapping_helpers/baseturf.dm
@@ -6,7 +6,7 @@
var/list/baseturf_to_replace
var/baseturf
- layer = POINT_LAYER
+ plane = POINT_PLANE
/obj/effect/baseturf_helper/Initialize(mapload)
. = ..()
diff --git a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm b/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm
index 1983bab3b6d6..18507bddf393 100644
--- a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm
+++ b/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm
@@ -77,7 +77,6 @@
built = new /obj/machinery/atmospherics/pipe/manifold4w(loc)
built.SetInitDirections()
built.on_construction(pipe_color, pipe_layer)
- built.hide(!visible_pipes)
/obj/effect/mapping_helpers/network_builder/atmos_pipe/distro
name = "distro line autobuilder"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index ec6657a9568c..c1b73cb3de9c 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -11,7 +11,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
desc = "It's a g-g-g-g-ghooooost!" //jinkies!
icon = 'icons/mob/mob.dmi'
icon_state = "ghost"
- layer = GHOST_LAYER
+ plane = GHOST_PLANE
stat = DEAD
density = FALSE
move_resist = INFINITY
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 203c578c2cf2..7f11cda584d3 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -180,7 +180,6 @@
dropItemToGround(get_item_for_held_index(hand_index), force = TRUE)
I.forceMove(src)
held_items[hand_index] = I
- I.layer = ABOVE_HUD_LAYER
I.plane = ABOVE_HUD_PLANE
I.equipped(src, ITEM_SLOT_HANDS)
if(I.pulledby)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index bf68b6767d82..a3f05a43e4ab 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -647,7 +647,7 @@
become_blind(EYES_COVERED)
else if(tinttotal >= TINT_DARKENED)
cure_blind(EYES_COVERED)
- overlay_fullscreen("tint", /atom/movable/screen/fullscreen/scaled/impaired, 2)
+ overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, 2)
else
cure_blind(EYES_COVERED)
clear_fullscreen("tint", 0)
@@ -723,10 +723,10 @@
visionseverity = 9
if(-INFINITY to -24)
visionseverity = 10
- overlay_fullscreen("critvision", /atom/movable/screen/fullscreen/scaled/crit/vision, visionseverity)
+ overlay_fullscreen("critvision", /atom/movable/screen/fullscreen/crit/vision, visionseverity)
else
clear_fullscreen("critvision")
- overlay_fullscreen("crit", /atom/movable/screen/fullscreen/scaled/crit, severity)
+ overlay_fullscreen("crit", /atom/movable/screen/fullscreen/crit, severity)
else
clear_fullscreen("crit")
clear_fullscreen("critvision")
@@ -750,7 +750,7 @@
severity = 6
if(45 to INFINITY)
severity = 7
- overlay_fullscreen("oxy", /atom/movable/screen/fullscreen/scaled/oxy, severity)
+ overlay_fullscreen("oxy", /atom/movable/screen/fullscreen/oxy, severity)
else
clear_fullscreen("oxy")
@@ -771,7 +771,7 @@
severity = 5
if(85 to INFINITY)
severity = 6
- overlay_fullscreen("brute", /atom/movable/screen/fullscreen/scaled/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/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 a12d6614fa4a..46ba9a5eb086 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/tiled/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/flash, override_protection = 0)
. = ..()
var/damage = override_protection ? intensity : intensity - get_eye_protection()
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 6723d2d4a6f2..a2c60a366b96 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -84,7 +84,7 @@
var/last_fire_update
var/hardcore_survival_score = 0
- tooltips = TRUE
+ should_tooltip = TRUE
var/additional_language //the additional language this human can speak from their preference selection
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index d8f87cf273f4..af37c010a352 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -213,7 +213,7 @@
update_tint()
if(G.vision_correction)
if(HAS_TRAIT(src, TRAIT_NEARSIGHT))
- overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/scaled/impaired, 1)
+ overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/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/human/login.dm b/code/modules/mob/living/carbon/human/login.dm
index cccee4a7ef6c..6cee254a5e8b 100644
--- a/code/modules/mob/living/carbon/human/login.dm
+++ b/code/modules/mob/living/carbon/human/login.dm
@@ -1,8 +1,5 @@
/mob/living/carbon/human/Login()
..()
- if(dna?.species?.has_field_of_vision && CONFIG_GET(flag/use_field_of_vision))
- LoadComponent(/datum/component/field_of_vision, field_of_vision_type)
-
if(!LAZYLEN(afk_thefts))
return
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index bed766519fc5..bdce511cf3c5 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -535,9 +535,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
else
H.physiology.footstep_type = null
- if(H.client && has_field_of_vision && CONFIG_GET(flag/use_field_of_vision))
- H.LoadComponent(/datum/component/field_of_vision, H.field_of_vision_type)
-
C.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/species, TRUE, multiplicative_slowdown = speedmod)
if(ROBOTIC_LIMBS in species_traits)
@@ -582,11 +579,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
C.dna.mutation_index[new_species.inert_mutation] = create_sequence(new_species.inert_mutation)
C.dna.default_mutation_genes[new_species.inert_mutation] = C.dna.mutation_index[new_species.inert_mutation]
- if(!new_species.has_field_of_vision && has_field_of_vision && ishuman(C) && CONFIG_GET(flag/use_field_of_vision))
- var/datum/component/field_of_vision/F = C.GetComponent(/datum/component/field_of_vision)
- if(F)
- qdel(F)
-
if(flying_species)
if(C.movement_type & FLYING)
ToggleFlight(C)
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index 2422528d2113..1754057257dc 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -64,7 +64,6 @@
if(observe.client)
observe.client.screen -= I
I.forceMove(src)
- I.layer = ABOVE_HUD_LAYER
I.plane = ABOVE_HUD_PLANE
I.appearance_flags |= NO_CLIENT_COLOR
var/not_handled = FALSE
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index f7cb0e07600e..5b5aa9d5c0b8 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/tiled/high)
+ overlay_fullscreen("high", /atom/movable/screen/fullscreen/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/tiled/high)
+ overlay_fullscreen("high", /atom/movable/screen/fullscreen/high)
throw_alert("high", /atom/movable/screen/alert/high)
else
clear_fullscreen("high")
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index f4f8060fb396..150404f0639b 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -169,23 +169,15 @@
if(clockcultslurring)
clockcultslurring = max(clockcultslurring-1, 0)
-/mob/living/proc/handle_traits()
+/mob/living/proc/handle_traits(delta_time, times_fired)
//Eyes
if(eye_blind) //blindness, heals slowly over time
- if(!stat && !(HAS_TRAIT(src, TRAIT_BLIND)))
- eye_blind = max(eye_blind-1,0)
- if(client && !eye_blind)
- clear_alert("blind")
- clear_fullscreen("blind")
- else
- eye_blind = max(eye_blind-1,1)
- else if(eye_blurry) //blurry eyes heal slowly
- eye_blurry = max(eye_blurry-1, 0)
- if(client)
- if(!eye_blurry)
- remove_eyeblur()
- else
- update_eyeblur()
+ if(HAS_TRAIT_FROM(src, TRAIT_BLIND, EYES_COVERED)) //covering your eyes heals blurry eyes faster
+ adjust_blindness(-1.5 * delta_time)
+ else if(!stat && !(HAS_TRAIT(src, TRAIT_BLIND)))
+ adjust_blindness(-0.5 * delta_time)
+ else if(eye_blurry) //blurry eyes heal slowly
+ adjust_blurriness(-0.5 * delta_time)
/mob/living/proc/update_damage_hud()
return
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index be6508dd966c..bfbe2babe7b0 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -11,6 +11,7 @@
stamina_buffer = INFINITY
UpdateStaminaBuffer()
GLOB.mob_living_list += src
+ update_fov()
/mob/living/prepare_huds()
..()
@@ -611,13 +612,12 @@
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/scaled/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
else
clear_fullscreen("brute")
//Proc used to resuscitate a mob, for full_heal see fully_heal()
/mob/living/proc/revive(full_heal = FALSE, admin_revive = FALSE)
- SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, full_heal, admin_revive)
if(full_heal)
fully_heal(admin_revive)
if(stat == DEAD && can_be_revived()) //in some cases you can't revive (e.g. no brain)
@@ -637,6 +637,8 @@
for(var/S in mind.spell_list)
var/obj/effect/proc_holder/spell/spell = S
spell.updateButtonIcon()
+ // The signal is called after everything else so components can properly check the updated values
+ SEND_SIGNAL(src, COMSIG_LIVING_REVIVE, full_heal, admin_revive)
//proc used to remove all immobilisation effects + reset stamina
/mob/living/proc/remove_CC(should_update_mobility = TRUE)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 0b71359a1eb1..72d5c4e9214e 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -506,7 +506,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/tiled/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/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/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 6024bfbf4c4f..d7f900d4421d 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -4,6 +4,8 @@
see_in_dark = 2
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD,NANITE_HUD,DIAG_NANITE_FULL_HUD,RAD_HUD)
pressure_resistance = 10
+ plane = GAME_PLANE_FOV_HIDDEN
+
has_field_of_vision = TRUE
typing_indicator_enabled = TRUE
@@ -174,3 +176,10 @@
var/stamina_buffer_regen_last = 0
/// Last time we used stamina buffer
var/stamina_buffer_last_use = 0
+
+ /// FOV view that is applied from either nativeness or traits
+ var/fov_view
+ /// Native FOV that will be applied if a config is enabled
+ var/native_fov = FOV_90_DEGREES
+ /// Lazy list of FOV traits that will apply a FOV view when handled.
+ var/list/fov_traits
diff --git a/code/modules/mob/living/living_fov.dm b/code/modules/mob/living/living_fov.dm
new file mode 100644
index 000000000000..a9776304d45a
--- /dev/null
+++ b/code/modules/mob/living/living_fov.dm
@@ -0,0 +1,136 @@
+/// Is `observed_atom` in a mob's field of view? This takes blindness, nearsightness and FOV into consideration
+/mob/living/proc/in_fov(atom/observed_atom, ignore_self = FALSE)
+ if(ignore_self && observed_atom == src)
+ return TRUE
+ if(is_blind())
+ return FALSE
+ . = FALSE
+ var/turf/my_turf = get_turf(src) //Because being inside contents of something will cause our x,y to not be updated
+ // If turf doesn't exist, then we wouldn't get a fov check called by `play_fov_effect` or presumably other new stuff that might check this.
+ // ^ If that case has changed and you need that check, add it.
+ var/rel_x = observed_atom.x - my_turf.x
+ var/rel_y = observed_atom.y - my_turf.y
+ if(fov_view)
+ if(rel_x >= -1 && rel_x <= 1 && rel_y >= -1 && rel_y <= 1) //Cheap way to check inside that 3x3 box around you
+ return TRUE //Also checks if both are 0 to stop division by zero
+
+ // Get the vector length so we can create a good directional vector
+ var/vector_len = sqrt(abs(rel_x) ** 2 + abs(rel_y) ** 2)
+
+ /// Getting a direction vector
+ var/dir_x
+ var/dir_y
+ switch(dir)
+ if(SOUTH)
+ dir_x = 0
+ dir_y = -vector_len
+ if(NORTH)
+ dir_x = 0
+ dir_y = vector_len
+ if(EAST)
+ dir_x = vector_len
+ dir_y = 0
+ if(WEST)
+ dir_x = -vector_len
+ dir_y = 0
+
+ ///Calculate angle
+ var/angle = arccos((dir_x * rel_x + dir_y * rel_y) / (sqrt(dir_x**2 + dir_y**2) * sqrt(rel_x**2 + rel_y**2)))
+
+ /// Calculate vision angle and compare
+ var/vision_angle = (360 - fov_view) / 2
+ if(angle < vision_angle)
+ . = TRUE
+ else
+ . = TRUE
+
+ // Handling nearsightnedness
+ if(. && HAS_TRAIT(src, TRAIT_NEARSIGHT))
+ //Checking if our dude really is suffering from nearsightness! (very nice nearsightness code)
+ if(iscarbon(src))
+ var/mob/living/carbon/carbon_me = src
+ if(carbon_me.glasses)
+ var/obj/item/clothing/glasses/glass = carbon_me.glasses
+ if(glass.vision_correction)
+ return
+ if((rel_x >= NEARSIGHTNESS_FOV_BLINDNESS || rel_x <= -NEARSIGHTNESS_FOV_BLINDNESS) || (rel_y >= NEARSIGHTNESS_FOV_BLINDNESS || rel_y <= -NEARSIGHTNESS_FOV_BLINDNESS))
+ return FALSE
+
+/// Updates the applied FOV value and applies the handler to client if able
+/mob/living/proc/update_fov()
+ var/highest_fov
+ if(CONFIG_GET(flag/native_fov))
+ highest_fov = native_fov
+ for(var/trait_type in fov_traits)
+ var/fov_type = fov_traits[trait_type]
+ if(fov_type > highest_fov)
+ highest_fov = fov_type
+ fov_view = highest_fov
+ update_fov_client()
+
+/// Updates the FOV for the client.
+/mob/living/proc/update_fov_client()
+ if(!client)
+ return
+ var/datum/component/fov_handler/fov_component = GetComponent(/datum/component/fov_handler)
+ if(fov_view)
+ if(!fov_component)
+ AddComponent(/datum/component/fov_handler, fov_view)
+ else
+ fov_component.set_fov_angle(fov_view)
+ else if(fov_component)
+ qdel(fov_component)
+
+/// Adds a trait which limits a user's FOV
+/mob/living/proc/add_fov_trait(source, type)
+ LAZYINITLIST(fov_traits)
+ fov_traits[source] = type
+ update_fov()
+
+/// Removes a trait which limits a user's FOV
+/mob/living/proc/remove_fov_trait(source, type)
+ if(!fov_traits) //Clothing equip/unequip is bad code and invokes this several times
+ return
+ fov_traits -= source
+ UNSETEMPTY(fov_traits)
+ update_fov()
+
+/// Plays a visual effect representing a sound cue for people with vision obstructed by FOV or blindness
+/proc/play_fov_effect(atom/center, range, icon_state, dir = SOUTH, ignore_self = FALSE, angle = 0)
+ var/turf/anchor_point = get_turf(center)
+ var/image/fov_image
+ for(var/mob/living/living_mob in get_hearers_in_view(range, center))
+ var/client/mob_client = living_mob.client
+ if(!mob_client)
+ continue
+ if(HAS_TRAIT(living_mob, TRAIT_DEAF)) //Deaf people can't hear sounds so no sound indicators
+ continue
+ if(living_mob.in_fov(center, ignore_self))
+ continue
+ if(!fov_image) //Make the image once we found one recipient to receive it
+ fov_image = image(icon = 'icons/effects/fov/fov_effects.dmi', icon_state = icon_state, loc = anchor_point)
+ fov_image.plane = FULLSCREEN_PLANE
+ fov_image.layer = FOV_EFFECTS_LAYER
+ fov_image.dir = dir
+ fov_image.appearance_flags = RESET_COLOR | RESET_TRANSFORM
+ if(angle)
+ var/matrix/matrix = new
+ matrix.Turn(angle)
+ fov_image.transform = matrix
+ fov_image.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ mob_client.images += fov_image
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_image_from_client, fov_image, mob_client), 30)
+
+/atom/movable/screen/fov_blocker
+ icon = 'icons/effects/fov/field_of_view.dmi'
+ icon_state = "90"
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ plane = FIELD_OF_VISION_BLOCKER_PLANE
+ screen_loc = "BOTTOM,LEFT"
+
+/atom/movable/screen/fov_shadow
+ icon = 'icons/effects/fov/field_of_view.dmi'
+ icon_state = "90_v"
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ plane = ABOVE_LIGHTING_PLANE
+ screen_loc = "BOTTOM,LEFT"
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index e9bf3c5d49c1..0986c2d4fbef 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -24,3 +24,5 @@
ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!")
if((vore_flags & VORE_INIT) && !(vore_flags & VOREPREF_INIT)) //Vore's been initialized, voreprefs haven't. If this triggers then that means that voreprefs failed to load due to the client being missing.
copy_from_prefs_vr()
+
+ update_fov_client()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 2e9030765abe..b4c6a258ce76 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -29,7 +29,7 @@
sec_hud = DATA_HUD_SECURITY_BASIC
d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
mob_size = MOB_SIZE_LARGE
- has_field_of_vision = FALSE //Vision through cameras.
+ native_fov = null
var/list/network = list("ss13")
var/obj/machinery/camera/current
var/list/connected_robots = list()
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index a3ffd460dd67..dcbabf5d8c5f 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -31,10 +31,10 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
vis_contents_transparent = new /obj/effect/overlay/camera_static/transparent()
vis_contents_objects = list(vis_contents_opaque, vis_contents_transparent)
- obscured = new('icons/effects/cameravis.dmi', vis_contents_opaque, null, CAMERA_STATIC_LAYER)
+ obscured = new('icons/effects/cameravis.dmi', vis_contents_opaque)
obscured.plane = CAMERA_STATIC_PLANE
- obscured_transparent = new('icons/effects/cameravis.dmi', vis_contents_transparent, null, CAMERA_STATIC_LAYER)
+ obscured_transparent = new('icons/effects/cameravis.dmi', vis_contents_transparent)
obscured_transparent.plane = CAMERA_STATIC_PLANE
// Checks if a chunk has been Generated in x, y, z.
@@ -197,7 +197,6 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
mouse_opacity = MOUSE_OPACITY_ICON
invisibility = INVISIBILITY_ABSTRACT
- layer = CAMERA_STATIC_LAYER
plane = CAMERA_STATIC_PLANE
/obj/effect/overlay/camera_static/transparent
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index 07cb67170628..c2bc49f9a809 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()
- wipe_fullscreens()
+ clear_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/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 559ffbbc08fa..ed3107f69159 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -78,7 +78,6 @@
held_items[module_num] = item_module
item_module.equipped(src, ITEM_SLOT_HANDS)
item_module.mouse_opacity = initial(item_module.mouse_opacity)
- item_module.layer = ABOVE_HUD_LAYER
item_module.plane = ABOVE_HUD_PLANE
item_module.forceMove(src)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 232c5b4195aa..eeb5c19e842c 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -21,7 +21,6 @@
robot_modules_background = new()
robot_modules_background.icon_state = "block"
- robot_modules_background.layer = HUD_LAYER //Objects that appear on screen are on layer ABOVE_HUD_LAYER, UI should be just below it.
robot_modules_background.plane = HUD_PLANE
inv1 = new /atom/movable/screen/robot/module1()
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index 612298e52639..1c3f661f6df8 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -128,4 +128,4 @@
var/sleeper_r
var/sleeper_nv
- tooltips = TRUE
+ should_tooltip = TRUE
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index e1a179ea525e..b8ccc240585c 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -136,6 +136,6 @@
P.on_hit(src, 0, def_zone, 0, piercing_hit)
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/tiled/flash/static)
+/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash/static)
if(affect_silicon)
return ..()
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 1320c13085c3..f2874dfbb0b8 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -967,9 +967,8 @@ Pass a positive integer as an argument to override a bot's default speed.
var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED])
if(path_hud)
path_huds_watching_me += path_hud
- for(var/V in path_huds_watching_me)
- var/datum/atom_hud/H = V
- H.remove_from_hud(src)
+ for(var/datum/atom_hud/hud as anything in path_huds_watching_me)
+ hud.remove_from_hud(src)
var/list/path_images = hud_list[DIAG_PATH_HUD]
QDEL_LIST(path_images)
@@ -978,7 +977,7 @@ Pass a positive integer as an argument to override a bot's default speed.
var/turf/T = newpath[i]
if(T == loc) //don't bother putting an image if it's where we already exist.
continue
- var/direction = NORTH
+ var/direction = get_dir(src, T)
if(i > 1)
var/turf/prevT = path[i - 1]
var/image/prevI = path[prevT]
@@ -987,7 +986,7 @@ Pass a positive integer as an argument to override a bot's default speed.
var/turf/prevprevT = path[i - 2]
var/prevDir = get_dir(prevprevT, prevT)
var/mixDir = direction|prevDir
- if(mixDir in GLOB.diagonals)
+ if(ISDIAGONALDIR(mixDir))
prevI.dir = mixDir
if(prevDir & (NORTH|SOUTH))
var/matrix/ntransform = matrix()
@@ -1001,7 +1000,7 @@ Pass a positive integer as an argument to override a bot's default speed.
MA.icon = path_image_icon
MA.icon_state = path_image_icon_state
MA.layer = ABOVE_OPEN_TURF_LAYER
- MA.plane = 0
+ MA.plane = GAME_PLANE
MA.appearance_flags = RESET_COLOR|RESET_TRANSFORM
MA.color = path_image_color
MA.dir = direction
@@ -1010,9 +1009,8 @@ Pass a positive integer as an argument to override a bot's default speed.
path[T] = I
path_images += I
- for(var/V in path_huds_watching_me)
- var/datum/atom_hud/H = V
- H.add_to_hud(src)
+ for(var/datum/atom_hud/hud as anything in path_huds_watching_me)
+ hud.add_to_hud(src)
/mob/living/simple_animal/bot/proc/increment_path()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 4c112858daa6..a1e6d1d4274b 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -59,7 +59,6 @@
I.screen_loc = null // will get moved if inventory is visible
I.forceMove(src)
- I.layer = ABOVE_HUD_LAYER
I.plane = ABOVE_HUD_PLANE
switch(slot)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
index 815c2bc0db2d..55d79577c82d 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm
@@ -35,7 +35,6 @@
hands_overlays += r_hand_overlay
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
r_hand.plane = ABOVE_HUD_PLANE
r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
client.screen |= r_hand
@@ -48,7 +47,6 @@
hands_overlays += l_hand_overlay
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
l_hand.plane = ABOVE_HUD_PLANE
l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
client.screen |= l_hand
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index f67c5dcb9725..4c0f5d59c15a 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -79,7 +79,7 @@
if(prob(chew_probability))
var/turf/open/floor/F = get_turf(src)
- if(istype(F) && !F.intact)
+ if(istype(F) && F.underfloor_accessibility >= UNDERFLOOR_INTERACTABLE)
var/obj/structure/cable/C = locate() in F
if(C && prob(15))
if(C.avail())
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 6faf8f0db528..7447c9690311 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -316,7 +316,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
I.screen_loc = null // will get moved if inventory is visible
I.forceMove(src)
I.equipped(src, slot)
- I.layer = ABOVE_HUD_LAYER
I.plane = ABOVE_HUD_PLANE
/mob/living/simple_animal/hostile/guardian/proc/apply_overlay(cache_index)
@@ -339,7 +338,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
hands_overlays += r_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE)
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- r_hand.layer = ABOVE_HUD_LAYER
r_hand.plane = ABOVE_HUD_PLANE
r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
client.screen |= r_hand
@@ -348,7 +346,6 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
hands_overlays += l_hand.build_worn_icon(default_layer = GUARDIAN_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
- l_hand.layer = ABOVE_HUD_LAYER
l_hand.plane = ABOVE_HUD_PLANE
l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
client.screen |= l_hand
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
index 2d773c67bbcd..1a7a43b377e5 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
@@ -59,7 +59,7 @@
name = "beam of solar energy"
icon_state = "solar_beam"
icon = 'icons/effects/beam.dmi'
- layer = LIGHTING_LAYER
+ plane = LIGHTING_PLANE
duration = 5
randomdir = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 9e8497f96819..d7b34e05f136 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -220,7 +220,7 @@ Difficulty: Very Hard
pixels_per_second = TILES_TO_PIXELS(5)
eyeblur = 0
damage_type = BRUTE
- pass_flags = PASSTABLE
+ pass_flags = GAME_PLANE
/obj/item/projectile/colossus/on_hit(atom/target, blocked = FALSE)
. = ..()
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 1f5cace8240b..1e751320931e 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/scaled/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
else
clear_fullscreen("brute")
diff --git a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
index 73dace85cdf5..b340de80f654 100644
--- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
@@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(plague_rats)
scavenge.Trigger()
if(prob(50))
var/turf/open/floor/F = get_turf(src)
- if(istype(F) && !F.intact)
+ if(istype(F) && F.underfloor_accessibility >= UNDERFLOOR_INTERACTABLE)
var/obj/structure/cable/C = locate() in F
if(C && C.avail())
visible_message("[src] chews through the [C]. It looks unharmed!")
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index f90fb55424da..311827494685 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -229,7 +229,7 @@
. = ..()
if(prob(40))
var/turf/open/floor/F = get_turf(src)
- if(istype(F) && !F.intact)
+ if(istype(F) && F.underfloor_accessibility >= UNDERFLOOR_INTERACTABLE)
var/obj/structure/cable/C = locate() in F
if(C && prob(15))
if(C.avail())
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index 53e4d0d64fa8..525079135d7d 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -540,7 +540,7 @@
light_range = 10
anchored = TRUE
density = FALSE
- layer = MASSIVE_OBJ_LAYER
+ plane = MASSIVE_OBJ_PLANE
/// The amount of time the rift has charged for.
var/time_charged = 0
/// The maximum charge the rift can have.
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index f226a911d818..b393409c79c7 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -575,12 +575,10 @@
var/obj/item/l_hand = get_item_for_held_index(1)
var/obj/item/r_hand = get_item_for_held_index(2)
if(r_hand)
- r_hand.layer = ABOVE_HUD_LAYER
r_hand.plane = ABOVE_HUD_PLANE
r_hand.screen_loc = ui_hand_position(get_held_index_of_item(r_hand))
client.screen |= r_hand
if(l_hand)
- l_hand.layer = ABOVE_HUD_LAYER
l_hand.plane = ABOVE_HUD_PLANE
l_hand.screen_loc = ui_hand_position(get_held_index_of_item(l_hand))
client.screen |= l_hand
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 498ca19a39a6..02e88e37412a 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/scaled/impaired, 1)
+ overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1)
ADD_TRAIT(src, TRAIT_NEARSIGHT, source)
/mob/living/proc/cure_husk(source)
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index 9ade9f097f8f..a2cefbb66dc6 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
var/obj/machinery/atmospherics/A = X //all elements in totalMembers are necessarily of this type.
if(in_view_range(client.mob, A))
if(!A.pipe_vision_img)
- A.pipe_vision_img = image(A, A.loc, layer = ABOVE_HUD_LAYER, dir = A.dir)
+ A.pipe_vision_img = image(A, A.loc, dir = A.dir)
A.pipe_vision_img.plane = ABOVE_HUD_PLANE
client.images += A.pipe_vision_img
pipes_shown += A.pipe_vision_img
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index a49df9522bc4..74b00bfb0e0b 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -87,9 +87,6 @@
SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
client.init_verbs()
- 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()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 138a3b9662aa..0053098f6f06 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -146,7 +146,11 @@
var/registered_z
- var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly
+ /// Contains [/atom/movable/screen/alert] only.
+ ///
+ /// On [/mob] so clientless mobs will throw alerts properly.
+ var/list/alerts = list()
+ var/list/screens = list()
var/list/client_colours = list()
var/hud_type = /datum/hud
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index da1919443a97..9c5dbc3d7ff0 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/scaled/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/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
@@ -66,42 +66,29 @@
/mob/proc/blur_eyes(amount)
if(amount>0)
eye_blurry = max(amount, eye_blurry)
- update_eyeblur()
+ update_eye_blur()
/**
* Adjust the current blurriness of the mobs vision by amount
*/
/mob/proc/adjust_blurriness(amount)
eye_blurry = max(eye_blurry+amount, 0)
- update_eyeblur()
+ update_eye_blur()
///Set the mobs blurriness of vision to an amount
/mob/proc/set_blurriness(amount)
eye_blurry = max(amount, 0)
- update_eyeblur()
+ update_eye_blur()
-/mob/proc/update_eyeblur()
- remove_eyeblur()
- if(eye_blurry)
- add_eyeblur()
-
-/mob/proc/add_eyeblur()
- if(!client)
- return
- var/list/screens = list(hud_used.plane_masters["[GAME_PLANE]"], hud_used.plane_masters["[FLOOR_PLANE]"],
- hud_used.plane_masters["[WALL_PLANE]"], hud_used.plane_masters["[ABOVE_WALL_PLANE]"])
- for(var/A in screens)
- var/atom/movable/screen/plane_master/P = A
- P.add_filter("blurry_eyes", 2, EYE_BLUR(clamp(eye_blurry*0.1,0.6,3)))
-
-/mob/proc/remove_eyeblur()
+///Apply the blurry overlays to a mobs clients screen
+/mob/proc/update_eye_blur()
if(!client)
return
- var/list/screens = list(hud_used.plane_masters["[GAME_PLANE]"], hud_used.plane_masters["[FLOOR_PLANE]"],
- hud_used.plane_masters["[WALL_PLANE]"], hud_used.plane_masters["[ABOVE_WALL_PLANE]"])
- for(var/A in screens)
- var/atom/movable/screen/plane_master/P = A
- P.remove_filter("blurry_eyes")
+ var/atom/movable/plane_master_controller/game_plane_master_controller = hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ if(eye_blurry)
+ game_plane_master_controller.add_filter("eye_blur", 1, gauss_blur_filter(clamp(eye_blurry * 0.1, 0.6, 3)))
+ else
+ game_plane_master_controller.remove_filter("eye_blur")
///Adjust the drugginess of a mob
/mob/proc/adjust_drugginess(amount)
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 570f01f5d91f..3a5e2cfd9225 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
icon = 'icons/mob/talk.dmi'
icon_state = "normal_typing"
appearance_flags = RESET_COLOR | TILE_BOUND | PIXEL_SCALE
- layer = ABOVE_FLY_LAYER
+ layer = ABOVE_MOB_LAYER
/obj/effect/overlay/typing_indicator/machine
icon_state = "machine_typing"
diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
index d2d7590cb18a..201945a3861e 100644
--- a/code/modules/modular_computers/file_system/programs/secureye.dm
+++ b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -43,7 +43,7 @@
cam_screen.del_on_map_removal = FALSE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = list()
- for(var/plane in subtypesof(/atom/movable/screen/plane_master))
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master) - /atom/movable/screen/plane_master/blackness)
var/atom/movable/screen/instance = new plane()
instance.assigned_map = map_name
instance.del_on_map_removal = FALSE
diff --git a/code/modules/newscaster/newscaster_machine.dm b/code/modules/newscaster/newscaster_machine.dm
index 5bc09294650d..d7a1c88a3a89 100644
--- a/code/modules/newscaster/newscaster_machine.dm
+++ b/code/modules/newscaster/newscaster_machine.dm
@@ -12,7 +12,6 @@ GLOBAL_LIST_EMPTY(allCasters)
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
icon = 'icons/obj/terminals.dmi'
icon_state = "newscaster_normal"
- plane = ABOVE_WALL_PLANE
verb_say = "beeps"
verb_ask = "beeps"
verb_exclaim = "beeps"
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 5e7872b92e32..34477b23c92b 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -110,7 +110,6 @@
/obj/machinery/power/apc
name = "area power controller"
desc = "A control terminal for the area's electrical systems."
- plane = ABOVE_WALL_PLANE
icon_state = "apc0"
use_power = NO_POWER_USE
@@ -640,7 +639,7 @@
var/turf/host_turf = get_turf(src)
if(!host_turf)
CRASH("attackby on APC when it's not on a turf")
- if (host_turf.intact)
+ if (host_turf.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
to_chat(user, "You must remove the floor plating in front of the APC first!")
return
else if (terminal)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 9e779b9c1b8d..d43c51688de1 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -38,8 +38,6 @@ By design, d1 is the smallest direction and d2 is the highest
desc = "A flexible, superconducting insulated cable for heavy-duty power transfer."
icon = 'icons/obj/power_cond/cables.dmi'
icon_state = "0-1"
- level = 1 //is underfloor
- plane = ABOVE_WALL_PLANE
layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
anchored = TRUE
obj_flags = CAN_BE_HIT | ON_BLUEPRINTS
@@ -107,9 +105,7 @@ By design, d1 is the smallest direction and d2 is the highest
d2 = d1
d1 = temp
- var/turf/T = get_turf(src) // hide if turf is not intact
- if(level==1)
- hide(T.intact)
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
GLOB.cable_list += src //add it to the global cable list
if(d1)
@@ -139,13 +135,6 @@ By design, d1 is the smallest direction and d2 is the highest
// General procedures
///////////////////////////////////
-//If underfloor, hide the cable
-/obj/structure/cable/hide(i)
-
- if(level == 1 && isturf(loc))
- invisibility = i ? INVISIBILITY_MAXIMUM : 0
- update_icon()
-
/obj/structure/cable/update_icon_state()
icon_state = "[d1]-[d2]"
color = null
@@ -153,7 +142,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/proc/handlecable(obj/item/W, mob/user, params)
var/turf/T = get_turf(src)
- if(T.intact)
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
return
if(W.tool_behaviour == TOOL_WIRECUTTER)
if (shock(user, 50))
@@ -616,7 +605,7 @@ By design, d1 is the smallest direction and d2 is the highest
if(!isturf(user.loc))
return
- if(!isturf(T) || T.intact || !T.can_have_cabling())
+ if(!isturf(T) || T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE || !T.can_have_cabling())
to_chat(user, "You can only lay cables on catwalks and plating!")
return
@@ -678,7 +667,7 @@ By design, d1 is the smallest direction and d2 is the highest
var/turf/T = C.loc
- if(!isturf(T) || T.intact) // sanity checks, also stop use interacting with T-scanner revealed cable
+ if(!isturf(T) || T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE) // sanity checks, also stop use interacting with T-scanner revealed cable
return
if(get_dist(C, user) > 1) // make sure it's close enough
@@ -698,7 +687,7 @@ By design, d1 is the smallest direction and d2 is the highest
if (showerror)
to_chat(user, "You can only lay cables on catwalks and plating!")
return
- if(U.intact) //can't place a cable if it's a plating with a tile on it
+ if(U.underfloor_accessibility < UNDERFLOOR_INTERACTABLE) //can't place a cable if it's a plating with a tile on it
to_chat(user, "You can't lay cable there unless the floor tiles are removed!")
return
else
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 081b93866eb8..f3fabcfdb957 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -315,11 +315,11 @@
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
if(on && status == LIGHT_OK)
var/overlay_alpha = clamp(light_power*250, 30, 200)
- SSvis_overlays.add_vis_overlay(src, overlayicon, base_state, EMISSIVE_UNBLOCKABLE_LAYER, EMISSIVE_UNBLOCKABLE_PLANE, dir, overlay_alpha)
+ SSvis_overlays.add_vis_overlay(src, overlayicon, base_state, null, LIGHTING_PLANE, dir, overlay_alpha)
var/mutable_appearance/M = mutable_appearance(overlayicon, base_state)
M.alpha = overlay_alpha
. += M
-
+
// update the icon_state and luminosity of the light depending on its state
/obj/machinery/light/proc/update(trigger = TRUE)
switch(status)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index c2dd77290a58..46c864d419d9 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -148,7 +148,7 @@
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
var/turf/T = user.loc
- if(T.intact || !isfloorturf(T))
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE || !isfloorturf(T))
return
if(get_dist(src, user) > 1)
return
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 29fd68d0340b..190dd092a671 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -8,7 +8,7 @@
anchored = TRUE
density = TRUE
move_resist = INFINITY
- layer = MASSIVE_OBJ_LAYER
+ layer = ABOVE_LIGHTING_PLANE
light_range = 6
appearance_flags = 0
var/current_size = 1
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index fff91df1b950..ade7cb33840b 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -113,7 +113,7 @@
return
var/turf/T = get_turf(user)
- if (T.intact) //is the floor plating removed ?
+ if (T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE) //can we get to the underfloor?
to_chat(user, "You must first remove the floor plating!")
return
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index fc6ff2985643..def9fed4226b 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -7,16 +7,14 @@
name = "terminal"
icon_state = "term"
desc = "It's an underfloor wiring terminal for power equipment."
- level = 1
layer = WIRE_TERMINAL_LAYER //a bit above wires
var/obj/machinery/power/master = null
/obj/machinery/power/terminal/Initialize(mapload)
. = ..()
- var/turf/T = get_turf(src)
- if(level == 1)
- hide(T.intact)
+
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
/obj/machinery/power/terminal/Destroy()
if(master)
@@ -24,15 +22,6 @@
master = null
return ..()
-/obj/machinery/power/terminal/hide(i)
- if(i)
- invisibility = INVISIBILITY_MAXIMUM
- icon_state = "term-f"
- else
- invisibility = 0
- icon_state = "term"
-
-
/obj/machinery/power/proc/can_terminal_dismantle()
. = 0
@@ -50,7 +39,7 @@
/obj/machinery/power/terminal/proc/dismantle(mob/living/user, obj/item/I)
if(isturf(loc))
var/turf/T = loc
- if(T.intact)
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
to_chat(user, "You must first expose the power terminal!")
return
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index 6f7099883412..fd527bde020b 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -441,8 +441,6 @@
new /obj/effect/hotspot(T)
for(var/obj/O in range(aoe_structure_range, epicenter))
if(!isitem(O))
- if(O.level == 1) //Please don't break underfloor items!
- continue
O.take_damage(aoe_structure_damage * get_damage_coeff(O), BURN, LASER, FALSE)
/obj/item/projectile/beam/beam_rifle/prehit_pierce(atom/A)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 6c6733627f46..51a8164c872f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -16,7 +16,10 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
movement_type = FLYING
generic_canpass = FALSE
- animate_movement = NO_STEPS
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
+ layer = MOB_LAYER
+ plane = GAME_PLANE_FOV_HIDDEN
+ //The sound this plays on impact.
hitsound = 'sound/weapons/pierce.ogg'
appearance_flags = PIXEL_SCALE
var/hitsound_wall = ""
@@ -85,7 +88,7 @@
var/original_angle = 0 //Angle at firing
var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
var/spread = 0 //amount (in degrees) of projectile spread
- animate_movement = 0 //Use SLIDE_STEPS in conjunction with legacy
+ animate_movement = NO_STEPS //Use SLIDE_STEPS in conjunction with legacy
/// how many times we've ricochet'd so far (instance variable, not a stat)
var/ricochets = 0
/// how many times we can ricochet max
@@ -720,6 +723,7 @@
pixel_increment_amount = SSprojectiles.global_pixel_increment_amount
trajectory = new(starting.x, starting.y, starting.z, pixel_x, pixel_y, Angle, pixel_increment_amount)
fired = TRUE
+ play_fov_effect(starting, 6, "gunfire", dir = NORTH, angle = Angle)
if(hitscan)
INVOKE_ASYNC(src, .proc/process_hitscan)
return
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 71339567d249..593848ea5eeb 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -433,28 +433,59 @@
pH = 11
value = REAGENT_VALUE_COMMON
-/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/M)
- M.slurring = max(M.slurring,50)
+/datum/reagent/drug/mushroomhallucinogen/on_mob_life(mob/living/carbon/psychonaut, delta_time, times_fired)
+ psychonaut.slurring = max(psychonaut.slurring, 50)
+
switch(current_cycle)
if(1 to 5)
- M.Dizzy(5)
- M.set_drugginess(30)
- if(prob(10))
- M.emote(pick("twitch","giggle"))
+ if(DT_PROB(5, delta_time))
+ psychonaut.emote(pick("twitch","giggle"))
if(5 to 10)
- M.Jitter(10)
- M.Dizzy(10)
- M.set_drugginess(35)
- if(prob(20))
- M.emote(pick("twitch","giggle"))
+ psychonaut.Jitter(10 * REAGENTS_EFFECT_MULTIPLIER * delta_time)
+ if(DT_PROB(10, delta_time))
+ psychonaut.emote(pick("twitch","giggle"))
if (10 to INFINITY)
- M.Jitter(20)
- M.Dizzy(20)
- M.set_drugginess(40)
- if(prob(30))
- M.emote(pick("twitch","giggle"))
+ psychonaut.Jitter(20 * REAGENTS_EFFECT_MULTIPLIER * delta_time)
+ if(DT_PROB(16, delta_time))
+ psychonaut.emote(pick("twitch","giggle"))
..()
+/datum/reagent/drug/mushroomhallucinogen/on_mob_metabolize(mob/living/psychonaut)
+ . = ..()
+
+ SEND_SIGNAL(psychonaut, COMSIG_ADD_MOOD_EVENT, "tripping", /datum/mood_event/high, name)
+ if(!psychonaut.hud_used)
+ return
+
+ var/atom/movable/plane_master_controller/game_plane_master_controller = psychonaut.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+
+ var/list/col_filter_identity = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.000,0,0,0)
+ var/list/col_filter_green = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.333,0,0,0)
+ var/list/col_filter_blue = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 0.666,0,0,0)
+ var/list/col_filter_red = list(1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1, 1.000,0,0,0) //visually this is identical to the identity
+
+ game_plane_master_controller.add_filter("rainbow", 10, color_matrix_filter(col_filter_red, FILTER_COLOR_HSL))
+
+ for(var/filter in game_plane_master_controller.get_filters("rainbow"))
+ animate(filter, color = col_filter_identity, time = 0 SECONDS, loop = -1, flags = ANIMATION_PARALLEL)
+ animate(color = col_filter_green, time = 4 SECONDS)
+ animate(color = col_filter_blue, time = 4 SECONDS)
+ animate(color = col_filter_red, time = 4 SECONDS)
+
+ game_plane_master_controller.add_filter("psilocybin_wave", 1, list("type" = "wave", "size" = 2, "x" = 32, "y" = 32))
+
+ for(var/filter in game_plane_master_controller.get_filters("psilocybin_wave"))
+ animate(filter, time = 64 SECONDS, loop = -1, easing = LINEAR_EASING, offset = 32, flags = ANIMATION_PARALLEL)
+
+/datum/reagent/drug/mushroomhallucinogen/on_mob_end_metabolize(mob/living/psychonaut)
+ . = ..()
+ SEND_SIGNAL(psychonaut, COMSIG_CLEAR_MOOD_EVENT, "tripping")
+ if(!psychonaut.hud_used)
+ return
+ var/atom/movable/plane_master_controller/game_plane_master_controller = psychonaut.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ game_plane_master_controller.remove_filter("rainbow")
+ game_plane_master_controller.remove_filter("psilocybin_wave")
+
/datum/reagent/consumable/garlic //NOTE: having garlic in your blood stops vampires from biting you.
name = "Garlic Juice"
//id = "garlic"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index af670c00dc13..aa55cd495f49 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -785,27 +785,23 @@
taste_description = "spinning"
value = REAGENT_VALUE_VERY_RARE
-/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M)
- return ..() // until fixed - the rotations never stop
-/*
+/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M, delta_time, times_fired)
if(M.hud_used)
- if(current_cycle >= 20 && current_cycle%20 == 0)
- var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"],
- M.hud_used.plane_masters["[LIGHTING_PLANE]"], M.hud_used.plane_masters["[WALL_PLANE]"],
- M.hud_used.plane_masters["[ABOVE_WALL_PLANE]"])
+ if(current_cycle >= 20 && (current_cycle % 20) == 0)
+ var/atom/movable/plane_master_controller/pm_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+
var/rotation = min(round(current_cycle/20), 89) // By this point the player is probably puking and quitting anyway
- for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
+ for(var/key in pm_controller.controlled_planes)
+ animate(pm_controller.controlled_planes[key], transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
animate(transform = matrix(-rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
return ..()
/datum/reagent/toxin/rotatium/on_mob_end_metabolize(mob/living/M)
- if(M && M.hud_used)
- var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
- for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
+ if(M?.hud_used)
+ var/atom/movable/plane_master_controller/pm_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ for(var/key in pm_controller.controlled_planes)
+ animate(pm_controller.controlled_planes[key], transform = matrix(), time = 5, easing = QUAD_EASING)
..()
-*/
/datum/reagent/toxin/skewium
name = "Skewium"
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 8e4db6f2f279..69bb4afdb682 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -199,33 +199,32 @@
return
return ..()
-///////////////////
-//Misc Dispenders//
-///////////////////
+/// Wall mounted dispeners, like pepper spray or virus food. Not a normal tank, and shouldn't be able to be turned into a plumbed stationary one.
+/obj/structure/reagent_dispensers/wall
+ anchored = TRUE
+ density = FALSE
-/obj/structure/reagent_dispensers/peppertank
+/obj/structure/reagent_dispensers/wall/peppertank
name = "pepper spray refiller"
desc = "Contains condensed capsaicin for use in law \"enforcement.\""
icon_state = "pepper"
- plane = ABOVE_WALL_PLANE
- anchored = TRUE
- density = FALSE
reagent_id = /datum/reagent/consumable/condensedcapsaicin
-/obj/structure/reagent_dispensers/peppertank/Initialize(mapload)
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/peppertank, 30)
+
+/obj/structure/reagent_dispensers/wall/peppertank/Initialize(mapload)
. = ..()
if(prob(1))
desc = "IT'S PEPPER TIME, BITCH!"
-/obj/structure/reagent_dispensers/virusfood
+/obj/structure/reagent_dispensers/wall/virusfood
name = "virus food dispenser"
desc = "A dispenser of low-potency virus mutagenic."
icon_state = "virus_food"
- plane = ABOVE_WALL_PLANE
- anchored = TRUE
- density = FALSE
reagent_id = /datum/reagent/consumable/virus_food
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/reagent_dispensers/wall/virusfood, 30)
+
/obj/structure/reagent_dispensers/cooking_oil
name = "vat of cooking oil"
desc = "A huge metal vat with a tap on the front. Filled with cooking oil for use in frying food."
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 8be744cd969f..292ce5622bc2 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/scaled/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
//Delivery Chute
diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm
index c6d015df3462..af8fed318a68 100644
--- a/code/modules/recycling/disposal/construction.dm
+++ b/code/modules/recycling/disposal/construction.dm
@@ -9,7 +9,6 @@
anchored = FALSE
density = FALSE
pressure_resistance = 5*ONE_ATMOSPHERE
- level = 2
max_integrity = 200
var/obj/pipe_type = /obj/structure/disposalpipe/segment
var/pipename
@@ -28,6 +27,8 @@
pipename = initial(pipe_type.name)
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
+
if(flip)
var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
rotcomp.BaseRot(null,ROTATION_FLIP)
@@ -41,31 +42,14 @@
..()
setDir(old_dir) //pipes changing direction when moved is just annoying and buggy
-// update iconstate and dpdir due to dir and type
-/obj/structure/disposalconstruct/update_icon()
- icon_state = initial(pipe_type.icon_state)
- if(is_pipe())
- icon_state = "con[icon_state]"
- if(anchored)
- level = initial(pipe_type.level)
- layer = initial(pipe_type.layer)
- else
- level = initial(level)
- layer = initial(layer)
-
- else if(ispath(pipe_type, /obj/machinery/disposal/bin))
+/obj/structure/disposalconstruct/update_icon_state()
+ if(ispath(pipe_type, /obj/machinery/disposal/bin))
// Disposal bins receive special icon treating
- if(anchored)
- icon_state = "disposal"
- else
- icon_state = "condisposal"
+ icon_state = "[anchored ? "con" : null]disposal"
+ return ..()
-
-// hide called by levelupdate if turf intact status changes
-// change visibility status and force update of icon
-/obj/structure/disposalconstruct/hide(var/intact)
- invisibility = (intact && level==1) ? INVISIBILITY_MAXIMUM: 0 // hide if floor is intact
- update_icon()
+ icon_state = "[is_pipe() ? "con" : null][initial(pipe_type.icon_state)]"
+ return ..()
/obj/structure/disposalconstruct/proc/get_disposal_dir()
if(!is_pipe())
@@ -120,7 +104,7 @@
var/ispipe = is_pipe() // Indicates if we should change the level of this pipe
var/turf/T = get_turf(src)
- if(T.intact && isfloorturf(T))
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE && isfloorturf(T))
to_chat(user, "You can only attach the [pipename] if the floor plating is removed!")
return TRUE
diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm
index 6c85bfc3ee61..ab4640853c2f 100644
--- a/code/modules/recycling/disposal/pipe.dm
+++ b/code/modules/recycling/disposal/pipe.dm
@@ -9,12 +9,10 @@
anchored = TRUE
density = FALSE
obj_flags = CAN_BE_HIT | ON_BLUEPRINTS
- level = 1 // underfloor only
dir = NONE // dir will contain dominant direction for junction pipes
max_integrity = 200
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30)
layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes
- plane = ABOVE_WALL_PLANE
rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
var/dpdir = NONE // bitmask of pipe directions
var/initialize_dirs = NONE // bitflags of pipe directions added on init, see \code\_DEFINES\pipe_construction.dm
@@ -45,7 +43,8 @@
dpdir |= turn(dir, -90)
if(initialize_dirs & DISP_DIR_FLIP)
dpdir |= turn(dir, 180)
- update()
+
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
// pipe is deleted
// ensure if holder is present, it is expelled
@@ -86,16 +85,6 @@
H.forceMove(get_turf(src))
return null
-// update the icon_state to reflect hidden status
-/obj/structure/disposalpipe/proc/update()
- var/turf/T = get_turf(src)
- hide(T.intact && !isspaceturf(T)) // space never hides pipes
-
-// hide called by levelupdate if turf intact status changes
-// change visibility status and force update of icon
-/obj/structure/disposalpipe/hide(var/intact)
- invisibility = intact ? INVISIBILITY_MAXIMUM: 0 // hide if floor is intact
-
// expel the held objects into a turf
// called when there is a break in the pipe
/obj/structure/disposalpipe/proc/expel(obj/structure/disposalholder/H, turf/T, direction)
@@ -103,7 +92,7 @@
var/eject_range = 5
var/turf/open/floor/floorturf
- if(isfloorturf(T)) //intact floor, pop the tile
+ if(isfloorturf(T) && T.overfloor_placed) // pop the tile if present
floorturf = T
if(floorturf.floor_tile)
new floorturf.floor_tile(T)
diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
index 79119c8448a7..3e93c4fe9bbc 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/scaled/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
PHC.Grant(user)
return TRUE
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 65fc9d3278c3..18c2e127d622 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -9,7 +9,6 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
desc = "This device is used to trigger station functions, which require more than one ID card to authenticate."
icon = 'icons/obj/monitors.dmi'
icon_state = "auth_off"
- plane = ABOVE_WALL_PLANE
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 6
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index c02405fc3f37..8af21cd5bd68 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/tiled/flash/static)
+ C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/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 ceb9b7adea68..18fe5cc67d12 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -257,33 +257,13 @@ All ShuttleMove procs go here
// atmosinit() calls update_icon(), so we don't need to call it
update_icon()
-/obj/machinery/atmospherics/pipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
- . = ..()
- var/turf/T = loc
- hide(T.intact)
-
/obj/machinery/navbeacon/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock)
. = ..()
- GLOB.navbeacons["[z]"] -= src
- GLOB.deliverybeacons -= src
+ glob_lists_deregister()
/obj/machinery/navbeacon/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
- var/turf/T = loc
- hide(T.intact)
- if(codes["patrol"])
- if(!GLOB.navbeacons["[z]"])
- GLOB.navbeacons["[z]"] = list()
- GLOB.navbeacons["[z]"] += src //Register with the patrol list!
- if(codes["delivery"])
- GLOB.deliverybeacons += src
- GLOB.deliverybeacontags += location
-
-/obj/machinery/power/terminal/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
- . = ..()
- var/turf/T = src.loc
- if(level==1)
- hide(T.intact)
+ glob_lists_register(TRUE)
/************************************Item move procs************************************/
@@ -341,16 +321,6 @@ All ShuttleMove procs go here
if(. & MOVE_AREA)
. |= MOVE_CONTENTS
-/obj/structure/disposalpipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
- . = ..()
- update()
-
-/obj/structure/cable/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
- . = ..()
- var/turf/T = loc
- if(level==1)
- hide(T.intact)
-
/obj/structure/shuttle/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock)
. = ..()
if(. & MOVE_AREA)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 1fc81e38b849..f717d20167b6 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -148,7 +148,7 @@
//Debug proc used to highlight bounding area
/obj/docking_port/proc/highlight(_color = "#f00")
invisibility = 0
- layer = GHOST_LAYER
+ plane = GHOST_PLANE
var/list/L = return_coords()
var/turf/T0 = locate(L[1],L[2],z)
var/turf/T1 = locate(L[3],L[4],z)
diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator_eye.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator_eye.dm
index 2bbe7d740745..8fe578b2f2c3 100644
--- a/code/modules/shuttle/shuttle_creation/shuttle_creator_eye.dm
+++ b/code/modules/shuttle/shuttle_creation/shuttle_creator_eye.dm
@@ -49,6 +49,6 @@
if(eye_user?.client)
eye_user.client.images -= user_image
var/image/I = image(icon, loc, icon_state, FLY_LAYER, dir)
- I.plane = MASSIVE_OBJ_LAYER
+ I.plane = MASSIVE_OBJ_PLANE
user_image = I
eye_user.client.images += user_image
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 526285f60d3b..23c2a763706d 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/scaled/impaired, eye_damaged)
+ owner.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/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/scaled/impaired, eye_damaged)
+ owner.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/impaired, eye_damaged)
else
owner.clear_fullscreen("eye_damage")
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index 82ce04654096..7ed8b1a62053 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -128,14 +128,14 @@ Notes:
* If set, will return a list for the tooltip (that will also be put together in a `Join()`)
* However, if returning `null`, the tooltip will not be shown as #14942 changed it.
*
- * Though no tooltips will be created for atoms that have `tooltips = FALSE`
+ * Though no tooltips will be created for atoms that have `should_tooltip = FALSE`
*/
/atom/movable/proc/get_tooltip_data()
return list()
/atom/movable/MouseEntered(location, control, params)
. = ..()
- if(tooltips)
+ if(should_tooltip)
if((get(src, /mob) == usr && !QDELETED(src)) && usr?.client.prefs.enable_tips)
var/list/tooltip_data = get_tooltip_data()
if(length(tooltip_data))
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index a968d42073b9..3c6bb5387476 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -5,6 +5,7 @@
icon_state = "fuckyou"
max_integrity = 300
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 60, ACID = 60)
+ plane = GAME_PLANE_FOV_HIDDEN
density = TRUE
anchored = FALSE
COOLDOWN_DECLARE(cooldown_vehicle_move)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index de5628dc0508..5e5b2bdfa5ef 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -675,12 +675,12 @@
var/mob/driver = D
if(driver.client?.keys_held["Alt"])
no_strafe = TRUE
- setDir(direction)
+ set_dir_mecha(direction)
if(turnsound)
playsound(src,turnsound,40,TRUE)
return TRUE
else
- setDir(direction)
+ set_dir_mecha(direction)
if(turnsound)
playsound(src,turnsound,40,TRUE)
return TRUE
@@ -691,7 +691,7 @@
. = step(src,direction, dir)
if(strafe && !no_strafe)
- setDir(olddir)
+ set_dir_mecha(olddir)
/obj/vehicle/sealed/mecha/Bump(atom/obstacle)
@@ -979,7 +979,7 @@
add_occupant(H)
add_fingerprint(H)
log_message("[H] moved in as pilot.", LOG_MECHA)
- setDir(dir_in)
+ set_dir_mecha(dir_in)
playsound(src, 'sound/machines/windowdoor.ogg', 50, TRUE)
if(!internal_damage)
SEND_SOUND(H, sound('sound/mecha/nominal.ogg',volume=50))
@@ -1031,7 +1031,7 @@
B.reset_perspective(src)
B.remote_control = src
B.update_mobility()
- setDir(dir_in)
+ set_dir_mecha(dir_in)
log_message("[M] moved in as pilot.", LOG_MECHA)
if(!internal_damage)
SEND_SOUND(M, sound('sound/mecha/nominal.ogg',volume=50))
@@ -1104,7 +1104,7 @@
mmi.mecha = null
mmi.update_icon()
L.mobility_flags = NONE
- setDir(dir_in)
+ set_dir_mecha(dir_in)
return ..()
@@ -1225,3 +1225,9 @@
else
to_chat(user, "None of the equipment on this exosuit can use this ammo!")
return FALSE
+
+/// Sets the direction of the mecha and all of its occcupents, required for FOV. Alternatively one could make a recursive contents registration and register topmost direction changes in the fov component
+/obj/vehicle/sealed/mecha/proc/set_dir_mecha(new_dir)
+ setDir(new_dir)
+ for(var/mob/living/occupant as anything in occupants)
+ occupant.setDir(new_dir)
diff --git a/config/entries/general.txt b/config/entries/general.txt
index ad8792c10a36..efc77c77bb52 100644
--- a/config/entries/general.txt
+++ b/config/entries/general.txt
@@ -479,10 +479,8 @@ BOX_RANDOM_ENGINE Box RBMK,3
## Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones.
ALLOW_CUSTOM_SKINTONES
-## Enables the FoV component, which hides objects and mobs behind the parent from their sight, unless they turn around, duh.
-## Camera mobs, AIs, ghosts and some other are of course exempt from this. This also doesn't influence simplemob AI, for the best.
-#USE_FIELD_OF_VISION
-
+## Whether native FoV is enabled for all people.
+#NATIVE_FOV
## Allows pAI custom holoforms
PAI_CUSTOM_HOLOFORMS
diff --git a/icons/effects/fov/field_of_view.dmi b/icons/effects/fov/field_of_view.dmi
new file mode 100644
index 000000000000..8086773d1407
Binary files /dev/null and b/icons/effects/fov/field_of_view.dmi differ
diff --git a/icons/effects/fov/fov_effects.dmi b/icons/effects/fov/fov_effects.dmi
new file mode 100644
index 000000000000..d5b7de38a457
Binary files /dev/null and b/icons/effects/fov/fov_effects.dmi differ
diff --git a/icons/hud/radial.dmi b/icons/hud/radial.dmi
new file mode 100644
index 000000000000..97add6732585
Binary files /dev/null and b/icons/hud/radial.dmi differ
diff --git a/icons/hud/screen_full.dmi b/icons/hud/screen_full.dmi
new file mode 100644
index 000000000000..f54a0bd94448
Binary files /dev/null and b/icons/hud/screen_full.dmi differ
diff --git a/icons/hud/screen_gen.dmi b/icons/hud/screen_gen.dmi
new file mode 100644
index 000000000000..725b3074b6dd
Binary files /dev/null and b/icons/hud/screen_gen.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 757208cd9ba2..ff7fd00e0c05 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi
index c9ad36653bbd..b49c46564de5 100644
Binary files a/icons/turf/floors/catwalk_plating.dmi and b/icons/turf/floors/catwalk_plating.dmi differ
diff --git a/icons/turf/floors/glass.dmi b/icons/turf/floors/glass.dmi
index adf6f57aaa34..73f452877f78 100644
Binary files a/icons/turf/floors/glass.dmi and b/icons/turf/floors/glass.dmi differ
diff --git a/icons/turf/floors/reinf_glass.dmi b/icons/turf/floors/reinf_glass.dmi
index dda99cd07f83..622d02ab141c 100644
Binary files a/icons/turf/floors/reinf_glass.dmi and b/icons/turf/floors/reinf_glass.dmi differ
diff --git a/modular_citadel/code/modules/festive/turfs.dm b/modular_citadel/code/modules/festive/turfs.dm
index dd119a25e7fa..c52b0def4ff9 100644
--- a/modular_citadel/code/modules/festive/turfs.dm
+++ b/modular_citadel/code/modules/festive/turfs.dm
@@ -18,10 +18,9 @@
.=..()
if(istype(C, /obj/item/stack/tile))
for(var/obj/O in src)
- if(O.level == 1) //ex. pipes laid underneath a tile
- for(var/M in O.buckled_mobs)
- to_chat(user, "Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.")
- return
+ for(var/M in O.buckled_mobs)
+ to_chat(user, "Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.")
+ return
var/obj/item/stack/tile/W = C
if(!W.use(1))
return
diff --git a/tgstation.dme b/tgstation.dme
index a1206ea64c85..34b66202a247 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -43,6 +43,7 @@
#include "code\__DEFINES\contracts.dm"
#include "code\__DEFINES\cooldowns.dm"
#include "code\__DEFINES\cult.dm"
+#include "code\__DEFINES\directional.dm"
#include "code\__DEFINES\diseases.dm"
#include "code\__DEFINES\DNA.dm"
#include "code\__DEFINES\donator_groupings.dm"
@@ -56,6 +57,7 @@
#include "code\__DEFINES\fantasy_affixes.dm"
#include "code\__DEFINES\food.dm"
#include "code\__DEFINES\footsteps.dm"
+#include "code\__DEFINES\fov.dm"
#include "code\__DEFINES\gun.dm"
#include "code\__DEFINES\hud.dm"
#include "code\__DEFINES\instruments.dm"
@@ -65,7 +67,7 @@
#include "code\__DEFINES\is_helpers.dm"
#include "code\__DEFINES\jobs.dm"
#include "code\__DEFINES\language.dm"
-#include "code\__DEFINES\layers_planes.dm"
+#include "code\__DEFINES\layers.dm"
#include "code\__DEFINES\lighting.dm"
#include "code\__DEFINES\loadout.dm"
#include "code\__DEFINES\logging.dm"
@@ -130,6 +132,7 @@
#include "code\__DEFINES\tools.dm"
#include "code\__DEFINES\traits.dm"
#include "code\__DEFINES\turf_flags.dm"
+#include "code\__DEFINES\turfs.dm"
#include "code\__DEFINES\typeids.dm"
#include "code\__DEFINES\uplink.dm"
#include "code\__DEFINES\vehicles.dm"
@@ -157,6 +160,8 @@
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals.dm"
+#include "code\__DEFINES\dcs\signals\signals_clothing.dm"
+#include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_main.dm"
#include "code\__DEFINES\dcs\signals\signals_painting.dm"
#include "code\__DEFINES\dcs\signals\signals_screentips.dm"
#include "code\__DEFINES\dcs\signals\signals_subsystem.dm"
@@ -286,6 +291,7 @@
#include "code\_onclick\hud\devil.dm"
#include "code\_onclick\hud\drones.dm"
#include "code\_onclick\hud\families.dm"
+#include "code\_onclick\hud\fullscreen.dm"
#include "code\_onclick\hud\generic_dextrous.dm"
#include "code\_onclick\hud\ghost.dm"
#include "code\_onclick\hud\guardian.dm"
@@ -297,7 +303,6 @@
#include "code\_onclick\hud\movable_screen_objects.dm"
#include "code\_onclick\hud\new_player.dm"
#include "code\_onclick\hud\picture_in_picture.dm"
-#include "code\_onclick\hud\plane_master.dm"
#include "code\_onclick\hud\radial.dm"
#include "code\_onclick\hud\radial_persistent.dm"
#include "code\_onclick\hud\revenanthud.dm"
@@ -306,6 +311,9 @@
#include "code\_onclick\hud\screentip.dm"
#include "code\_onclick\hud\simple_animal.dm"
#include "code\_onclick\hud\swarmer.dm"
+#include "code\_onclick\hud\rendering\plane_master.dm"
+#include "code\_onclick\hud\rendering\plane_master_controller.dm"
+#include "code\_onclick\hud\rendering\render_plate.dm"
#include "code\_onclick\hud\screen_objects\clickdelay.dm"
#include "code\_onclick\hud\screen_objects\sprint.dm"
#include "code\_onclick\hud\screen_objects\stamina.dm"
@@ -316,7 +324,6 @@
#include "code\_rendering\atom_huds\atom_hud.dm"
#include "code\_rendering\atom_huds\data_huds.dm"
#include "code\_rendering\clickcatcher\clickcatcher.dm"
-#include "code\_rendering\fullscreen\fullscreen.dm"
#include "code\_rendering\parallax\parallax.dm"
#include "code\_rendering\parallax\parallax_holder.dm"
#include "code\_rendering\parallax\parallax_object.dm"
@@ -532,6 +539,7 @@
#include "code\datums\components\butchering.dm"
#include "code\datums\components\caltrop.dm"
#include "code\datums\components\chasm.dm"
+#include "code\datums\components\clothing_fov_visor.dm"
#include "code\datums\components\combat_mode.dm"
#include "code\datums\components\construction.dm"
#include "code\datums\components\dejavu.dm"
@@ -541,8 +549,8 @@
#include "code\datums\components\edit_complainer.dm"
#include "code\datums\components\embedded.dm"
#include "code\datums\components\explodable.dm"
-#include "code\datums\components\field_of_vision.dm"
#include "code\datums\components\footstep.dm"
+#include "code\datums\components\fov_handler.dm"
#include "code\datums\components\fried.dm"
#include "code\datums\components\fullauto.dm"
#include "code\datums\components\gps.dm"
@@ -700,6 +708,7 @@
#include "code\datums\elements\flavor_text.dm"
#include "code\datums\elements\forced_gravity.dm"
#include "code\datums\elements\ghost_role_eligibility.dm"
+#include "code\datums\elements\item_fov.dm"
#include "code\datums\elements\mob_holder.dm"
#include "code\datums\elements\object_reskinning.dm"
#include "code\datums\elements\photosynthesis.dm"
@@ -714,6 +723,7 @@
#include "code\datums\elements\tactical.dm"
#include "code\datums\elements\trash.dm"
#include "code\datums\elements\turf_transparency.dm"
+#include "code\datums\elements\undertile.dm"
#include "code\datums\elements\update_icon_blocker.dm"
#include "code\datums\elements\update_icon_updates_onmob.dm"
#include "code\datums\elements\ventcrawling.dm"
@@ -1510,6 +1520,7 @@
#include "code\modules\admin\verbs\debug.dm"
#include "code\modules\admin\verbs\diagnostics.dm"
#include "code\modules\admin\verbs\dice.dm"
+#include "code\modules\admin\verbs\fov.dm"
#include "code\modules\admin\verbs\fps.dm"
#include "code\modules\admin\verbs\getlogs.dm"
#include "code\modules\admin\verbs\individual_logging.dm"
@@ -2630,6 +2641,7 @@
#include "code\modules\mob\living\living_blocking_parrying.dm"
#include "code\modules\mob\living\living_defense.dm"
#include "code\modules\mob\living\living_defines.dm"
+#include "code\modules\mob\living\living_fov.dm"
#include "code\modules\mob\living\living_mobility.dm"
#include "code\modules\mob\living\living_movement.dm"
#include "code\modules\mob\living\living_signals.dm"
|