"
- if(infestation <= sanitization && flesh_damage <= flesh_healing)
+ if(infection <= sanitization && flesh_damage <= flesh_healing)
. += "No further treatment required: Burns will heal shortly."
else
- switch(infestation)
+ switch(infection)
if(WOUND_INFECTION_MODERATE to WOUND_INFECTION_SEVERE)
. += "Infection Level: Moderate\n"
if(WOUND_INFECTION_SEVERE to WOUND_INFECTION_CRITICAL)
@@ -216,7 +216,7 @@
. += "Infection Level: [span_deadsay("CRITICAL")]\n"
if(WOUND_INFECTION_SEPTIC to INFINITY)
. += "Infection Level: [span_deadsay("LOSS IMMINENT")]\n"
- if(infestation > sanitization)
+ if(infection > sanitization)
. += "\tSurgical debridement, antibiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n"
if(flesh_damage > 0)
@@ -229,7 +229,7 @@
/// Checks if the wound is in a state that ointment or flesh will help
/datum/wound/burn/flesh/proc/can_be_ointmented_or_meshed()
- if(infestation > 0 && sanitization < infestation)
+ if(infection > 0 && sanitization < infection)
return TRUE
if(flesh_damage > 0 && flesh_healing <= flesh_damage)
return TRUE
@@ -240,7 +240,7 @@
if(!COOLDOWN_FINISHED(I, uv_cooldown))
to_chat(user, span_notice("[I] is still recharging!"))
return TRUE
- if(infestation <= 0 || infestation < sanitization)
+ if(infection <= 0 || infection < sanitization)
to_chat(user, span_notice("There's no infection to treat on [victim]'s [limb.plaintext_zone]!"))
return TRUE
@@ -262,12 +262,12 @@
return
if(flesh_healing > 0)
flesh_damage = max(flesh_damage - (0.1 * seconds_per_tick), 0)
- if((flesh_damage <= 0) && (infestation <= 1))
+ if((flesh_damage <= 0) && (infection <= 1))
to_chat(victim, span_green("The burns on your [limb.plaintext_zone] have cleared up!"))
qdel(src)
return
if(sanitization > 0)
- infestation = max(infestation - (0.1 * WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0)
+ infection = max(infection - (0.1 * WOUND_BURN_SANITIZATION_RATE * seconds_per_tick), 0)
/datum/wound/burn/flesh/on_synthflesh(reac_volume)
flesh_healing += reac_volume * 0.5 // 20u patch will heal 10 flesh standard
@@ -324,7 +324,7 @@
series_threshold_penalty = 40
status_effect_type = /datum/status_effect/wound/burn/flesh/severe
treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
- infestation_rate = 0.07 // appx 9 minutes to reach sepsis without any treatment
+ infection_rate = 0.07 // appx 9 minutes to reach sepsis without any treatment
flesh_damage = 12.5
scar_keyword = "burnsevere"
@@ -355,7 +355,7 @@
threshold_penalty = 25
status_effect_type = /datum/status_effect/wound/burn/flesh/critical
treatable_by = list(/obj/item/flashlight/pen/paramedic, /obj/item/stack/medical/ointment, /obj/item/stack/medical/mesh)
- infestation_rate = 0.075 // appx 4.33 minutes to reach sepsis without any treatment
+ infection_rate = 0.075 // appx 4.33 minutes to reach sepsis without any treatment
flesh_damage = 20
scar_keyword = "burncritical"
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 3e1ee963122..8e285c96ef4 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -8,12 +8,12 @@
/* DATA HUD DATUMS */
/atom/proc/add_to_all_human_data_huds()
- for(var/datum/atom_hud/data/human/hud in GLOB.huds)
- hud.add_atom_to_hud(src)
+ for(var/hud_key, hud_type in GLOB.huds)
+ astype(hud_type, /datum/atom_hud/data/human)?.add_atom_to_hud(src)
/atom/proc/remove_from_all_data_huds()
- for(var/datum/atom_hud/data/hud in GLOB.huds)
- hud.remove_atom_from_hud(src)
+ for(var/hud_key, hud_type in GLOB.huds)
+ astype(hud_type, /datum/atom_hud/data)?.remove_atom_from_hud(src)
/datum/atom_hud/data
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 2023722ea35..6abdd7900ed 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -738,7 +738,7 @@
var/mob/user = ui.user
add_fingerprint(user)
update_last_used(user)
- if(isAI(user) && !GLOB.cameranet.checkTurfVis(get_turf(src))) //We check if they're an AI specifically here, so borgs/adminghosts/human wand can still access off-camera stuff.
+ if(isAI(user) && !SScameras.is_visible_by_cameras(get_turf(src))) //We check if they're an AI specifically here, so borgs/adminghosts/human wand can still access off-camera stuff.
to_chat(user, span_warning("You can no longer connect to this device!"))
return FALSE
return ..()
diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm
index e39e2e4fed6..a66cd3209a2 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -122,6 +122,13 @@ GLOBAL_LIST_EMPTY(announcement_systems)
))
return list("config_entries" = configs)
+/obj/machinery/announcement_system/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["max_announcement_len"] = MAX_AAS_LENGTH
+
+ return data
+
/obj/machinery/announcement_system/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
@@ -148,7 +155,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
message_admins("[ADMIN_LOOKUPFLW(usr)] tried to set announcement line for nonexisting line in the [config.name] for AAS. Probably href injection. Received line: [html_encode(params["lineKey"])]")
log_game("[key_name(usr)] tried to mess with AAS. For [config.name] he tried to edit nonexistend [params["lineKey"]]")
return
- var/new_message = trim(html_encode(params["newText"]), MAX_MESSAGE_LEN)
+ var/new_message = trim(html_encode(params["newText"]), MAX_AAS_LENGTH)
if(new_message)
config.announcement_lines_map[params["lineKey"]] = new_message
usr.log_message("updated [params["lineKey"]] line in the [config.name] to: [new_message]", LOG_GAME)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 6d214d6781b..f323ddc30ac 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -110,12 +110,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
network -= network_name
network += LOWER_TEXT(network_name)
- GLOB.cameranet.cameras += src
+ SScameras.cameras += src
myarea = get_room_area()
if(camera_enabled)
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
LAZYADD(myarea.cameras, src)
#ifdef MAP_TEST
update_appearance()
@@ -133,8 +133,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
/obj/machinery/camera/Destroy(force)
if(can_use())
toggle_cam(null, 0) //kick anyone viewing out and remove from the camera chunks
- GLOB.cameranet.removeCamera(src)
- GLOB.cameranet.cameras -= src
+ SScameras.remove_camera_from_chunk(src)
+ SScameras.cameras -= src
cancelCameraAlarm()
if(isarea(myarea))
LAZYREMOVE(myarea.cameras, src)
@@ -219,7 +219,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
if(!prob(150 / severity))
return
network = list()
- GLOB.cameranet.removeCamera(src)
+ SScameras.remove_camera_from_chunk(src)
set_machine_stat(machine_stat | EMPED)
set_light(0)
emped++ //Increase the number of consecutive EMP's
@@ -246,7 +246,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
set_machine_stat(machine_stat & ~EMPED)
update_appearance()
if(can_use())
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
emped = 0 //Resets the consecutive EMP count
addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 10 SECONDS)
@@ -259,7 +259,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
/obj/machinery/camera/proc/setViewRange(num = 7)
src.view_range = num
- GLOB.cameranet.updateVisibility(src, 0)
+ SScameras.update_visibility(src)
/obj/machinery/camera/proc/shock(mob/living/user)
if(!istype(user))
@@ -336,7 +336,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
/obj/machinery/camera/proc/toggle_cam(mob/user, displaymessage = TRUE)
camera_enabled = !camera_enabled
if(can_use())
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
if (isturf(loc))
myarea = get_area(src)
LAZYADD(myarea.cameras, src)
@@ -344,12 +344,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
myarea = null
else
set_light(0)
- GLOB.cameranet.removeCamera(src)
+ SScameras.remove_camera_from_chunk(src)
if (isarea(myarea))
LAZYREMOVE(myarea.cameras, src)
// We are not guarenteed that the camera will be on a turf. account for that
- var/turf/our_turf = get_turf(src)
- GLOB.cameranet.updateChunk(our_turf.x, our_turf.y, our_turf.z)
var/change_msg = "deactivates"
if(camera_enabled)
change_msg = "reactivates"
@@ -389,6 +387,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
return FALSE
return TRUE
+/// Returns a list of turfs in this camera's view.
+/// This includes turfs that are "obscured by darkness" from the camera's POV.
/obj/machinery/camera/proc/can_see()
var/list/see = null
var/turf/pos = get_turf(src)
@@ -397,26 +397,22 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
var/check_higher = directly_above && istransparentturf(directly_above) && (pos != get_highest_turf(pos))
if(isXRay())
- see = range(view_range, pos)
+ see = RANGE_TURFS(view_range, pos)
else
- see = get_hear(view_range, pos)
+ see = get_hear_turfs(view_range, pos)
+
if(check_lower || check_higher)
// Haha datum var access KILL ME
- for(var/turf/seen in see)
+ for(var/turf/seen as anything in see)
if(check_lower)
- var/turf/visible = seen
- while(visible && istransparentturf(visible))
- var/turf/below = GET_TURF_BELOW(visible)
- for(var/turf/adjacent in range(1, below))
- see += adjacent
- see += adjacent.contents
- visible = below
+ var/turf/below = GET_TURF_BELOW(seen)
+ while(below && istransparentturf(below))
+ see += RANGE_TURFS(1, below)
+ below = GET_TURF_BELOW(below)
if(check_higher)
var/turf/above = GET_TURF_ABOVE(seen)
while(above && istransparentturf(above))
- for(var/turf/adjacent in range(1, above))
- see += adjacent
- see += adjacent.contents
+ see += RANGE_TURFS(1, above)
above = GET_TURF_ABOVE(above)
return see
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 89af3fc1192..7383db15f66 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -185,6 +185,7 @@
camera_upgrade_bitflags |= CAMERA_UPGRADE_XRAY
update_appearance()
+ SScameras.update_visibility(src)
/obj/machinery/camera/proc/removeXRay(ignore_malf_upgrades)
if(!ignore_malf_upgrades) //don't downgrade it if malf software is forced onto it.
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 8725bda22f5..f33cff0c7ea 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -89,7 +89,7 @@
var/list/data = list()
data["network"] = network
data["mapRef"] = cam_screen.assigned_map
- data["cameras"] = GLOB.cameranet.get_available_cameras_data(network)
+ data["cameras"] = SScameras.get_available_cameras_data(network)
return data
/obj/machinery/computer/security/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -99,7 +99,7 @@
if(action == "switch_camera")
active_camera?.on_stop_watching(src)
- var/obj/machinery/camera/selected_camera = locate(params["camera"]) in GLOB.cameranet.cameras
+ var/obj/machinery/camera/selected_camera = locate(params["camera"]) in SScameras.cameras
active_camera = selected_camera
if(isnull(active_camera))
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index bb034b1a322..c364afa9ec3 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -183,10 +183,10 @@
else
camera_location = myturf
else
- if((!consider_zlock || (myturf.z in z_lock)) && GLOB.cameranet.checkTurfVis(myturf))
+ if((!consider_zlock || (myturf.z in z_lock)) && SScameras.is_visible_by_cameras(myturf))
camera_location = myturf
else
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/C as anything in SScameras.cameras)
if(!C.can_use() || consider_zlock && !(C.z in z_lock))
continue
var/list/network_overlap = networks & C.network
@@ -229,7 +229,7 @@
var/mob/eye/camera/remote/remote_eye = owner.remote_control
var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin_ref.resolve()
- var/list/cameras_by_tag = GLOB.cameranet.get_available_camera_by_tag_list(origin.networks, origin.z_lock)
+ var/list/cameras_by_tag = SScameras.get_available_camera_by_tag_list(origin.networks, origin.z_lock)
playsound(origin, 'sound/machines/terminal/terminal_prompt.ogg', 25, FALSE)
var/camera = tgui_input_list(usr, "Camera to view", "Cameras", cameras_by_tag)
@@ -403,7 +403,7 @@
var/turf/eye_turf = get_turf(source)
if(!eye_turf)
return
- if(!GLOB.cameranet.checkTurfVis(eye_turf))
+ if(!SScameras.is_visible_by_cameras(eye_turf))
return
eye_x.set_output(source.x)
eye_y.set_output(source.y)
@@ -490,7 +490,7 @@
var/turf/target_turf = get_turf(target)
if(!target_turf)
return
- if(!GLOB.cameranet.checkTurfVis(target_turf))
+ if(!SScameras.is_visible_by_cameras(target_turf))
return
if(TIMER_COOLDOWN_RUNNING(parent.shell, COOLDOWN_CIRCUIT_TARGET_INTERCEPT))
return
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0e2e2b27ab4..26b3e77111d 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -196,8 +196,8 @@
damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
diag_hud_set_electrified()
@@ -331,8 +331,8 @@
close_others.Cut()
QDEL_NULL(note)
QDEL_NULL(seal)
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.remove_atom_from_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.remove_atom_from_hud(src)
return ..()
/obj/machinery/door/airlock/Exited(atom/movable/gone, direction)
@@ -526,7 +526,10 @@
/obj/machinery/door/airlock/proc/is_secure()
return (security_level > 0)
-/// Checks if this door would be affected by any currently active RETA grants
+/**
+ * Checks if this door would be affected by any currently active RETA grants
+ * If a grant is active, return the authorized department
+ */
/obj/machinery/door/airlock/proc/has_active_reta_access()
if(!CONFIG_GET(flag/reta_enabled))
return FALSE
@@ -544,11 +547,11 @@
for(var/required_access in req_access)
if(required_access in origin_dept_access)
- return TRUE
+ return target_dept
for(var/required_access in req_one_access)
if(required_access in origin_dept_access)
- return TRUE
+ return target_dept
return FALSE
@@ -761,6 +764,10 @@
else
. += "It looks very robust."
+ var/active_reta = has_active_reta_access()
+ if(active_reta)
+ . += span_nicegreen("Emergency Temporary Access is enabled for [EXAMINE_HINT(active_reta)].")
+
if(issilicon(user) && !(machine_stat & BROKEN))
. += span_notice("Shift-click [src] to [ density ? "open" : "close"] it.")
. += span_notice("Ctrl-click [src] to [ locked ? "raise" : "drop"] its bolts.")
@@ -1369,10 +1376,9 @@
set_airlock_state(AIRLOCK_OPENING, animated = TRUE, force_type = forced)
var/transparent_delay = animation_segment_delay(AIRLOCK_OPENING_TRANSPARENT)
sleep(transparent_delay)
- set_opacity(0)
+ set_opacity(FALSE)
if(multi_tile)
filler.set_opacity(FALSE)
- update_freelook_sight()
var/passable_delay = animation_segment_delay(AIRLOCK_OPENING_PASSABLE) - transparent_delay
sleep(passable_delay)
set_density(FALSE)
@@ -1459,7 +1465,6 @@
set_opacity(TRUE)
if(multi_tile)
filler.set_opacity(TRUE)
- update_freelook_sight()
var/close_delay = animation_segment_delay(AIRLOCK_CLOSING_FINISHED) - unpassable_delay - opaque_delay
sleep(close_delay)
set_airlock_state(AIRLOCK_CLOSED, animated = FALSE)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 306a3da3860..68154486c95 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -98,7 +98,6 @@
set_bounds()
set_filler()
update_overlays()
- update_freelook_sight()
air_update_turf(TRUE, TRUE)
register_context()
if(elevator_mode)
@@ -163,7 +162,6 @@
layer = initial(layer)
/obj/machinery/door/Destroy()
- update_freelook_sight()
if(elevator_mode)
GLOB.elevator_doors -= src
if(spark_system)
@@ -513,7 +511,7 @@
operating = TRUE
use_energy(active_power_usage)
run_animation(DOOR_OPENING_ANIMATION)
- set_opacity(0)
+ set_opacity(FALSE)
var/passable_delay = animation_segment_delay(DOOR_OPENING_PASSABLE)
SLEEP_NOT_DEL(passable_delay)
set_density(FALSE)
@@ -522,10 +520,9 @@
SLEEP_NOT_DEL(open_delay)
layer = initial(layer)
update_appearance()
- set_opacity(0)
+ set_opacity(FALSE)
operating = FALSE
air_update_turf(TRUE, FALSE)
- update_freelook_sight()
if(autoclose)
autoclose_in(DOOR_CLOSE_WAIT)
return TRUE
@@ -561,10 +558,9 @@
SLEEP_NOT_DEL(close_delay)
update_appearance()
if(visible && !glass)
- set_opacity(1)
+ set_opacity(TRUE)
operating = FALSE
air_update_turf(TRUE, TRUE)
- update_freelook_sight()
if(!can_crush)
return TRUE
@@ -623,10 +619,6 @@
/obj/machinery/door/proc/hasPower()
return !(machine_stat & NOPOWER)
-/obj/machinery/door/proc/update_freelook_sight()
- if(!glass && GLOB.cameranet)
- GLOB.cameranet.updateVisibility(src, 0)
-
/obj/machinery/door/block_superconductivity() // All non-glass airlocks block heat, this is intended.
if(opacity || heat_proof)
return 1
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 8ede2092a4c..7579756590f 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -256,7 +256,6 @@
var/open_delay = animation_segment_delay(DOOR_OPENING_FINISHED) - passable_delay
sleep(open_delay)
air_update_turf(TRUE, FALSE)
- update_freelook_sight()
if(operating == 1) //emag again
operating = FALSE
@@ -299,7 +298,6 @@
sleep(unpassable_delay)
set_density(TRUE)
air_update_turf(TRUE, TRUE)
- update_freelook_sight()
var/close_delay = animation_segment_delay(DOOR_CLOSING_FINISHED) - unpassable_delay
sleep(close_delay)
@@ -549,8 +547,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holding
operating = TRUE
set_density(FALSE)
+ set_opacity(FALSE)
air_update_turf(TRUE, FALSE)
- update_freelook_sight()
operating = FALSE
update_appearance()
@@ -564,8 +562,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/brigdoor/security/holding
operating = TRUE
set_density(TRUE)
+ set_opacity(TRUE)
air_update_turf(TRUE, TRUE)
- update_freelook_sight()
operating = FALSE
update_appearance()
diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm
index 471e43f9413..1323a3354a6 100644
--- a/code/game/machinery/launch_pad.dm
+++ b/code/game/machinery/launch_pad.dm
@@ -38,8 +38,8 @@
/obj/machinery/launchpad/Initialize(mapload)
. = ..()
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
update_hud()
@@ -57,8 +57,8 @@
return ..()
/obj/machinery/launchpad/Destroy()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.remove_atom_from_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.remove_atom_from_hud(src)
return ..()
/obj/machinery/launchpad/examine(mob/user)
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index dcbc5aa0e41..406b7a7c902 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -76,7 +76,7 @@
return SUCCESSFUL_UNFASTEN
/obj/machinery/recycler/crowbar_act(mob/living/user, obj/item/tool)
- if(default_pry_open(tool, close_after_pry = TRUE))
+ if(default_deconstruction_crowbar(tool))
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_BLOCKING
@@ -125,135 +125,144 @@
INVOKE_ASYNC(src, PROC_REF(eat), enterer)
/obj/machinery/recycler/proc/eat(atom/movable/morsel, sound=TRUE)
- if(machine_stat & (BROKEN|NOPOWER))
- return
- if(safety_mode)
- return
- if(iseffect(morsel))
+ if(machine_stat & (BROKEN|NOPOWER) || safety_mode)
return
if(!isturf(morsel.loc))
- return //I don't know how you called Crossed() but stop it.
+ stack_trace("on_entered() called with invalid location: [morsel.loc]") // I don't know how you called Entered() but stop it.
+ return
if(morsel.resistance_flags & INDESTRUCTIBLE)
return
- if(morsel.flags_1 & HOLOGRAM_1)
- visible_message(span_notice("[morsel] fades away!"))
- qdel(morsel)
- return
+ /// Queue of objects to process.
var/list/atom/to_eat = list(morsel)
-
- var/living_detected = FALSE //technically includes silicons as well but eh
+ /// Regular items to be recycled.
var/list/nom = list()
- var/list/crunchy_nom = list() //Mobs have to be handled differently so they get a different list instead of checking them multiple times.
+ /// Living mobs to be crushed.
+ var/list/crunchy_nom = list() // Mobs have to be handled differently so they get a different list instead of checking them multiple times.
+ /// Count of items that couldn't be processed.
var/not_eaten = 0
- while (to_eat.len)
- var/atom/movable/thing = to_eat[1]
- to_eat -= thing
+ while(LAZYLEN(to_eat))
+ var/atom/movable/thing = popleft(to_eat)
- if (thing.flags_1 & HOLOGRAM_1)
+ if(triggers_safety_shutdown(thing))
+ emergency_stop()
+ return
+
+ if(thing.resistance_flags & INDESTRUCTIBLE)
+ if(!isturf(thing.loc) && !recursive_loc_check(thing, /mob/living))
+ thing.forceMove(loc)
+ not_eaten++
+ continue
+
+ if(thing.flags_1 & HOLOGRAM_1)
+ for(var/atom/movable/hologram_content as anything in thing.contents)
+ hologram_content.forceMove(loc) // we shouldn't qdel() the non-holographic content of the hologram.
+ visible_message(span_notice("[thing] fades away!"))
qdel(thing)
continue
- if (thing.resistance_flags & INDESTRUCTIBLE)
- if (!isturf(thing.loc) && !recursive_loc_check(thing, /mob/living))
- thing.forceMove(loc)
- not_eaten += 1
+ if(isliving(thing))
+ LAZYADD(crunchy_nom, thing)
+ if(!issilicon(thing))
+ LAZYOR(to_eat, thing.contents)
continue
- if (isliving(thing))
- living_detected = TRUE
- crunchy_nom += thing
- if (!issilicon(thing))
- to_eat |= thing.contents
+ if(!isobj(thing))
+ not_eaten++
continue
- if (!isobj(thing))
- not_eaten += 1
- continue
-
- if (isitem(thing))
- var/obj/item/as_item = thing
- if (as_item.item_flags & ABSTRACT)
- not_eaten += 1
+ if(isitem(thing))
+ var/obj/item/item_thing = thing
+ if(item_thing.item_flags & ABSTRACT)
+ not_eaten++
continue
- // Prevent blindly deconstructing locked secure closets (head closets, important departmental orders, etc.)
- // unless they have already been unlocked to prevent exploiting the recycler to bypass closet access.
- if (iscloset(thing))
- var/obj/structure/closet/as_closet = thing
- if (as_closet.secure && as_closet.locked)
- not_eaten += 1
+ if(iscloset(thing))
+ var/obj/structure/closet/closet_thing = thing
+ if(closet_thing.secure && closet_thing.locked) // Prevent blindly deconstructing locked secure closets (head closets, important departmental orders, etc.)
+ not_eaten++ // unless they have already been unlocked to prevent exploiting the recycler to bypass closet access.
continue
- if (istype(thing, /obj/item/organ/brain) || istype(thing, /obj/item/dullahan_relay))
- living_detected = TRUE
+ LAZYADD(nom, thing)
+ LAZYOR(to_eat, thing.contents)
- if (istype(thing, /obj/item/mmi))
- var/obj/item/mmi/mmi = thing
- if (!isnull(mmi.brain))
- living_detected = TRUE
+ for(var/mob/living/living_mob in crunchy_nom)
+ if(!is_operational) //we ran out of power after recycling a large amount to living stuff, time to stop
+ break
+ if(living_mob.incorporeal_move)
+ continue
- nom += thing
- to_eat |= thing.contents
+ crush_living(living_mob)
+ use_energy(active_power_usage)
- if(living_detected) // First, check if we have any living beings detected.
- if(obj_flags & EMAGGED)
- for(var/CRUNCH in crunchy_nom) // Eat them and keep going because we don't care about safety.
- if(!isliving(CRUNCH)) // MMIs and brains will get eaten like normal items
- continue
-
- var/mob/living/living_mob = CRUNCH
- if(living_mob.incorporeal_move)
- continue
-
- if(!is_operational) //we ran out of power after recycling a large amount to living stuff, time to stop
- break
- crush_living(CRUNCH)
- use_energy(active_power_usage)
- else // Stop processing right now without eating anything.
- emergency_stop()
- return
+ var/nom_length = LAZYLEN(nom)
/**
* we process the list in reverse so that atoms without parents/contents are deleted first & their parents are deleted next & so on.
* this is the reverse order in which get_all_contents() returns its list
* if we delete an atom containing stuff then all its stuff are deleted with it as well so we will end recycling deleted items down the list and gain nothing from them
*/
- for(var/i = length(nom); i >= 1; i--)
+ for(var/i = nom_length; i >= 1; i--)
if(!is_operational) //we ran out of power after recycling a large amount to items, time to stop
break
+
var/full_power_usage = TRUE
var/obj/nom_obj = nom[i]
- if (isitem(nom_obj))
+
+ if(isitem(nom_obj))
// Whether or not items consume full power depends on if they produced a material when recycled.
full_power_usage = recycle_item(nom_obj)
else
// When a non-item is eaten, we deconstruct it with dismantled = FALSE so that
// it and its contents aren't just deleted. These always consume full power.
nom_obj.deconstruct(FALSE)
+
use_energy(active_power_usage / (full_power_usage ? 1 : 2))
- if(nom.len && sound)
- playsound(src, item_recycle_sound, (50 + nom.len * 5), TRUE, nom.len, ignore_walls = (nom.len - 10)) // As a substitute for playing 50 sounds at once.
- if(not_eaten)
- playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', (50 + not_eaten * 5), FALSE, not_eaten, ignore_walls = (not_eaten - 10)) // Ditto.
+ if(nom_length && sound)
+ var/sound_volume = clamp(nom_length * 5, 50, 100)
+ var/walls_ignoring = max(nom_length - 10, 0)
+ playsound(src, item_recycle_sound, sound_volume, TRUE, nom_length, ignore_walls = walls_ignoring) // As a substitute for playing 50 sounds at once.
-/obj/machinery/recycler/proc/recycle_item(obj/item/weapon)
- . = FALSE
- var/obj/item/grown/log/wood = weapon
- if(istype(wood))
- var/seed_modifier = 0
- if(wood.seed)
- seed_modifier = round(wood.seed.potency / 25)
+ if(not_eaten)
+ var/sound_volume = clamp(not_eaten * 5, 50, 100)
+ var/walls_ignoring = max(not_eaten - 10, 0)
+ playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', sound_volume, FALSE, not_eaten, ignore_walls = walls_ignoring) // Ditto.
+
+/// Determines if the target should trigger an emergency stop due to safety concerns.
+/obj/machinery/recycler/proc/triggers_safety_shutdown(atom/movable/target)
+ if(obj_flags & EMAGGED)
+ return FALSE // Emagged recycler ignores all safety checks.
+
+ if(isliving(target))
+ return TRUE
+
+ if(isbrain(target) || istype(target, /obj/item/dullahan_relay))
+ return TRUE
+
+ if(istype(target, /obj/item/mmi))
+ var/obj/item/mmi/mmi_thing = target
+ return !!(mmi_thing.brain)
+
+ return FALSE
+
+/obj/machinery/recycler/proc/recycle_item(obj/item/target)
+ if(istype(target, /obj/item/grown/log))
+ var/obj/item/grown/log/wood = target
+ var/seed_modifier = wood.seed ? round(wood.seed.potency / 25) : 0
new wood.plank_type(loc, 1 + seed_modifier)
- . = TRUE
- else
- var/retrieved = materials.insert_item(weapon, multiplier = (amount_produced / 100))
- if(retrieved > 0) //item was salvaged i.e. deleted
- materials.retrieve_all()
- return TRUE
- qdel(weapon)
+ qdel(target)
+ return TRUE
+
+ var/retrieved = materials.insert_item(target, multiplier = (amount_produced / 100))
+ if(retrieved > 0) //item was salvaged i.e. deleted
+ materials.retrieve_all()
+ qdel(target)
+ return TRUE
+
+ qdel(target)
+ return FALSE
/obj/machinery/recycler/proc/emergency_stop()
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
@@ -267,16 +276,13 @@
update_appearance()
/obj/machinery/recycler/proc/crush_living(mob/living/living_mob)
- living_mob.forceMove(loc)
-
if(issilicon(living_mob))
playsound(src, 'sound/items/tools/welder.ogg', 50, TRUE)
else
playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
- if(iscarbon(living_mob))
- if(living_mob.stat == CONSCIOUS)
- living_mob.say("ARRRRRRRRRRRGH!!!", forced= "recycler grinding")
+ if(iscarbon(living_mob) && living_mob.stat == CONSCIOUS)
+ living_mob.say("ARRRRRRRRRRRGH!!!", forced= "recycler grinding")
if(!issilicon(living_mob))
add_mob_blood(living_mob)
diff --git a/code/game/objects/effects/anomalies/anomalies_flux.dm b/code/game/objects/effects/anomalies/anomalies_flux.dm
index 1d823d00b60..ddf7b036733 100644
--- a/code/game/objects/effects/anomalies/anomalies_flux.dm
+++ b/code/game/objects/effects/anomalies/anomalies_flux.dm
@@ -44,10 +44,10 @@
/obj/effect/anomaly/flux/detonate()
switch(emp_zap)
if(FLUX_EMP)
- empulse(src, 4, 16)
+ empulse(src, 4, 16, emp_source = src)
explosion(src, heavy_impact_range = 1, light_impact_range = 4, flash_range = 6) //Trashes the room a bit, might blow a small hole in the hull.
if(FLUX_LIGHT_EMP)
- empulse(src, 4, 6)
+ empulse(src, 4, 6, emp_source = src)
explosion(src, light_impact_range = 3, flash_range = 6)
if(FLUX_NO_EMP)
new /obj/effect/particle_effect/sparks(loc)
diff --git a/code/game/objects/effects/decals/cleanable/mess.dm b/code/game/objects/effects/decals/cleanable/mess.dm
index 717dd4f7086..1d250034609 100644
--- a/code/game/objects/effects/decals/cleanable/mess.dm
+++ b/code/game/objects/effects/decals/cleanable/mess.dm
@@ -82,7 +82,7 @@
if(!isnull(broken_flooring))
return
var/turf/T = get_turf(src)
- if(T.tiled_dirt && is_tileable)
+ if(T.tiled_turf && is_tileable)
icon = 'icons/effects/dirt.dmi'
icon_state = "dirt-0"
smoothing_flags = SMOOTH_BITMASK
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 6ddd65f12cf..73ffc52a2bd 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -12,14 +12,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
pass_flags = PASSTABLE | PASSGRILLE
anchored = TRUE
-/obj/effect/particle_effect/Initialize(mapload)
- . = ..()
- GLOB.cameranet.updateVisibility(src)
-
-/obj/effect/particle_effect/Destroy()
- GLOB.cameranet.updateVisibility(src)
- return ..()
-
// Prevents effects from getting registered for SSnewtonian_movement
/obj/effect/particle_effect/newtonian_move(inertia_angle, instant = FALSE, start_delay = 0, drift_force = 0, controlled_cap = null)
return TRUE
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 30937c6d57a..3f60795f44b 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -808,3 +808,21 @@
/obj/effect/temp_visual/circle_wave/star_blast
color = COLOR_VOID_PURPLE
+
+/obj/effect/temp_visual/focus_ring
+ randomdir = FALSE
+ name = "ring"
+ icon_state = "focus_ring"
+ layer = BELOW_MOB_LAYER
+ duration = 2.5 SECONDS
+ pixel_y = -4
+ alpha = 0
+
+/obj/effect/temp_visual/focus_ring/Initialize(mapload)
+ . = ..()
+ animate(src, alpha = 100, time = 2 SECONDS, easing = QUAD_EASING|EASE_IN)
+ addtimer(CALLBACK(src, PROC_REF(dissipate)), 2 SECONDS)
+
+
+/obj/effect/temp_visual/focus_ring/proc/dissipate()
+ animate(src, alpha = 0, time = 0.5 SECONDS, easing = QUAD_EASING|EASE_OUT)
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index e7246fd04ef..640e08da102 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -1,13 +1,13 @@
-/proc/empulse(turf/epicenter, heavy_range, light_range, log=0)
+/proc/empulse(turf/epicenter, heavy_range, light_range, emp_source)
if(!epicenter)
return
if(!isturf(epicenter))
epicenter = get_turf(epicenter.loc)
- if(log)
- message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
- log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+ if(emp_source)
+ message_admins("EMP with size ([heavy_range], [light_range]) in [ADMIN_VERBOSEJMP(epicenter)], caused by [emp_source] ")
+ log_game("EMP with size ([heavy_range], [light_range]) in [ADMIN_VERBOSEJMP(epicenter)], caused by [emp_source] ")
if(heavy_range > 1)
new /obj/effect/temp_visual/emp/pulse(epicenter)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 89df142fc7b..4246ffed55f 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -1239,9 +1239,13 @@
if("operative")
outline_color = COLOR_THEME_OPERATIVE
if("clockwork")
- outline_color = COLOR_THEME_CLOCKWORK //if you want free gbp go fix the fact that clockwork's tooltip css is glass'
+ outline_color = COLOR_THEME_CLOCKWORK
if("glass")
outline_color = COLOR_THEME_GLASS
+ if("trasen-knox")
+ outline_color = COLOR_THEME_TRASENKNOX
+ if("detective")
+ outline_color = COLOR_THEME_DETECTIVE
else //this should never happen, hopefully
outline_color = COLOR_WHITE
if(color)
@@ -2257,3 +2261,11 @@
target_limb = victim.get_bodypart(target_limb) || victim.bodyparts[1]
return get_embed()?.embed_into(victim, target_limb)
+
+/// Checks if user can insert a valid container into the chemistry machine.
+/obj/item/proc/can_insert_container(mob/living/user, obj/machinery/chem_machine)
+ return is_chem_container() && chem_machine.can_interact(user) && user.can_perform_action(chem_machine, ALLOW_SILICON_REACH | FORBID_TELEKINESIS_REACH)
+
+/// Checks if this container is valid for use with chemistry machinery.
+/obj/item/proc/is_chem_container()
+ return FALSE
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index f2893b0d468..7f4b23f0bb7 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -295,10 +295,10 @@
for(var/x = x1; x <= x2; x += CHUNK_SIZE)
for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- var/datum/camerachunk/chunk = GLOB.cameranet.getCameraChunk(x, y, epicenter.z)
+ var/datum/camerachunk/chunk = SScameras.generate_chunk(x, y, epicenter.z)
// removing cameras in build mode didnt affect it and i guess it needs an AI eye to update so we have to do this manually
// unless we only want to see static in a jank manner only if an eye updates it
- chunk?.update() // UPDATE THE FUCK NOW
+ chunk?.force_update(only_if_necessary = FALSE) // UPDATE THE FUCK NOW
. |= chunk
/obj/item/multitool/ai_detect/proc/cleanup_static()
diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm
index 7fef3fb8657..ab8267e7ea4 100644
--- a/code/game/objects/items/food/pizza.dm
+++ b/code/game/objects/items/food/pizza.dm
@@ -73,7 +73,7 @@
. = ..()
if(!sliced)
return
- user.visible_message(span_notice("You take a slice of [src]."), span_notice("[user] takes a slice of [src]."))
+ user.visible_message(span_notice("[user] takes a slice of [src]."), span_notice("You take a slice of [src]."))
produce_slice(user)
/obj/item/food/pizza/proc/get_slices_filter() //to not repeat code
diff --git a/code/game/objects/items/granters/magic/charge.dm b/code/game/objects/items/granters/magic/charge.dm
index 988d17aa13b..0210227d3b0 100644
--- a/code/game/objects/items/granters/magic/charge.dm
+++ b/code/game/objects/items/granters/magic/charge.dm
@@ -17,4 +17,5 @@
/obj/item/book/granter/action/spell/charge/recoil(mob/living/user)
. = ..()
to_chat(user,span_warning("[src] suddenly feels very warm!"))
- empulse(src, 1, 1)
+ empulse(src, 1, 1, emp_source = src)
+
diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm
index f1173e45513..dc820c0aa1f 100644
--- a/code/game/objects/items/grenades/emgrenade.dm
+++ b/code/game/objects/items/grenades/emgrenade.dm
@@ -8,7 +8,6 @@
. = ..()
if(!.)
return
-
update_mob()
- empulse(src, 4, 10)
+ empulse(src, 4, 10, emp_source = src)
qdel(src)
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 665e1ce4b39..5e8c4b4dd46 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -20,7 +20,7 @@
/obj/item/implant/emp/activate()
. = ..()
uses--
- empulse(imp_in, 3, 5)
+ empulse(imp_in, 3, 5, emp_source = src)
if(!uses)
qdel(src)
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index a867ee98890..6f309211a7c 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -23,6 +23,8 @@
var/active_force = 30
/// Throwforce while active.
var/active_throwforce = 20
+ /// The throw speed of the weapon when on
+ var/active_throw_speed = 4
/// Sharpness while active.
var/active_sharpness = SHARP_EDGED
/// Hitsound played attacking while active.
@@ -71,7 +73,7 @@
/datum/component/transforming, \
force_on = active_force, \
throwforce_on = active_throwforce, \
- throw_speed_on = 4, \
+ throw_speed_on = active_throw_speed, \
sharpness_on = active_sharpness, \
hitsound_on = active_hitsound, \
w_class_on = active_w_class, \
@@ -166,6 +168,7 @@
active_force = 150
active_throwforce = 30
+ active_throw_speed = 3
active_w_class = WEIGHT_CLASS_HUGE
/obj/item/melee/energy/axe/make_transformable()
@@ -173,7 +176,7 @@
/datum/component/transforming, \
force_on = active_force, \
throwforce_on = active_throwforce, \
- throw_speed_on = throw_speed, \
+ throw_speed_on = active_throw_speed, \
sharpness_on = sharpness, \
w_class_on = active_w_class, \
)
@@ -394,7 +397,7 @@
icon_angle = 0
/obj/item/melee/energy/sword/surplus
- name = "\improper Type I 'Iaito' energy sword"
+ name = "\improper Pattern I 'Iaito' energy sword"
desc = "Oversized, overengineered, and somehow still mass-produced. The twin energy blades, theoretically, help make up for the poor cutting plane the emitter generates. \
When there are no more heroes in a desperate struggle, it's kill or be killed."
icon_state = "surplus_e_sword"
@@ -406,6 +409,7 @@
inhand_y_dimension = 64
active_force = 15 // This force is augmented by the state of our target.
active_throwforce = 15
+ active_throw_speed = 3
alt_continuous = list("whacks", "smacks", "bashes")
alt_simple = list("whack", "smack", "bash")
alt_sharpness = NONE
@@ -509,6 +513,20 @@
if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE) || charge <= 0)
return
+ expend_charge(user)
+
+/obj/item/melee/energy/sword/surplus/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
+ if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
+ return FALSE
+
+ if(prob(final_block_chance) && charge)
+ expend_charge(owner)
+ return TRUE
+
+/obj/item/melee/energy/sword/surplus/proc/expend_charge(mob/user)
+ if(!charge) // not that this will ever get here without charge, but...
+ return
+
charge--
if(charge <= 0)
user.balloon_alert(user, "out of charge!")
@@ -541,20 +559,17 @@
armour_penetration = 0
wound_bonus = -10
demolition_mod = 1
- embed_type = /datum/embedding/holy_esword
sword_color_icon = "blue"
light_color = LIGHT_COLOR_LIGHT_CYAN
active_force = 18
active_throwforce = 10
+ active_throw_speed = 3
alt_force_mod = -3
/obj/item/melee/energy/sword/nullrod/Initialize(mapload)
. = ..()
AddElement(/datum/element/nullrod_core)
-/datum/embedding/holy_esword
- embed_chance = 0
-
/obj/item/melee/energy/sword/nullrod/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
return FALSE
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 028d6fead81..4ac8d73c77e 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -545,3 +545,4 @@
if(attack_type == (PROJECTILE_ATTACK || LEAP_ATTACK || OVERWHELMING_ATTACK))
final_block_chance = 0 //Don't bring a...mace to a gunfight, and also you aren't going to really block someone full body tackling you with a mace. Or a road roller, if one happened to hit you.
return ..()
+
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index da44e6cb497..fca0d593551 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -662,6 +662,15 @@
worn_icon_state = "grass_sheath"
storage_type = /datum/storage/green_sabre_belt
+/obj/item/storage/belt/sheath/gladius
+ name = "gladius scabbard"
+ desc = "A fun-sized sheath for a fun-sized sword."
+ icon_state = "gladius_sheath"
+ inhand_icon_state = "gladius_sheath"
+ worn_icon_state = "gladius_sheath"
+ storage_type = /datum/storage/gladius_belt
+ stored_blade = /obj/item/claymore/gladius
+
/obj/item/storage/belt/plant
name = "botanical belt"
desc = "A sturdy leather belt used to hold most hydroponics supplies."
diff --git a/code/game/objects/items/tongs.dm b/code/game/objects/items/tongs.dm
index 3c85cc8c004..a6be04b604f 100644
--- a/code/game/objects/items/tongs.dm
+++ b/code/game/objects/items/tongs.dm
@@ -81,7 +81,7 @@
if (COOLDOWN_FINISHED(src, clack_cooldown))
click_clack()
return ..()
- if (!IsEdible(attacked) || attacked.w_class > WEIGHT_CLASS_NORMAL || !isnull(tonged))
+ if (!IS_EDIBLE(attacked) || attacked.w_class > WEIGHT_CLASS_NORMAL || !isnull(tonged))
return ..()
tonged = attacked
attacked.do_pickup_animation(src)
diff --git a/code/game/objects/items/v8_engine.dm b/code/game/objects/items/v8_engine.dm
index 2d2d5e40593..80c54be8ecb 100644
--- a/code/game/objects/items/v8_engine.dm
+++ b/code/game/objects/items/v8_engine.dm
@@ -1,8 +1,14 @@
-#define ENGINE_COOLDOWN (5 SECONDS)
-#define DASH_COOLDOWN (2.5 SECONDS)
+#define ENGINE_COOLDOWN 5 SECONDS
+#define SLASH_COOLDOWN 1.2 SECONDS
+#define SLASH_WINDUP 1 SECONDS
+#define CHARGE_DAMAGE_MOD 10
#define HOUSE_EDGE_ICONS_MAX 3
#define HOUSE_EDGE_ICONS_MIN 0
+/**
+ * File for the House Edge sword and the V8 Engine, obtained from the black market.
+ */
+
/obj/item/v8_engine
name = "ancient engine"
desc = "An extremely well-preserved, massive V8 engine from the early 2000s. It seems to be missing the rest of the vehicle. There's a tiny label on the side."
@@ -46,8 +52,9 @@
name = "House Edge"
desc = "Dangerous. Loud. Sleek. It has a built in roulette wheel. This thing could easily rip your arm off if you're not careful."
icon = 'icons/obj/weapons/sword.dmi'
- icon_state = "house_edge0"
- inhand_icon_state = "house_edge0"
+ icon_state = "house_edge"
+ base_icon_state = "house_edge"
+ inhand_icon_state = "house_edge"
icon_angle = -45
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
@@ -57,6 +64,7 @@
throwforce = 10
throw_range = 5
throw_speed = 1
+ armour_penetration = 15
hitsound = 'sound/items/car_engine_start.ogg'
/// The number of charges the house edge has accrued through 2-handed hits, to charge a more powerful charge attack.
var/fire_charges = 0
@@ -74,14 +82,11 @@
/obj/item/house_edge/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
if(!ismob(target))
return
- if(HAS_TRAIT(src, TRAIT_WIELDED))
+ var/mob/mob_target = target
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && mob_target.stat != DEAD)
//Add a fire charge to a max of 3, updates icon_state.
fire_charges = clamp((fire_charges + 1), HOUSE_EDGE_ICONS_MIN, HOUSE_EDGE_ICONS_MAX)
COOLDOWN_RESET(src, fire_charge_cooldown)
- else
- //Lose a fire charge to a min of 0, updates icon_state.
- fire_charges = clamp((fire_charges - 1), HOUSE_EDGE_ICONS_MIN, HOUSE_EDGE_ICONS_MAX)
- do_sparks(number = 0, cardinal_only = TRUE, source = src)
update_appearance(UPDATE_ICON_STATE)
/obj/item/house_edge/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
@@ -90,26 +95,102 @@
if(fire_charges <= 0)
balloon_alert(user, "no fire charges!")
return ITEM_INTERACT_BLOCKING
- user.throw_at(target = get_turf(interacting_with), range = 2 * fire_charges, speed = 5, thrower = user, spin = FALSE, gentle = FALSE, quickstart = TRUE)
- COOLDOWN_START(src, fire_charge_cooldown, DASH_COOLDOWN)
- reset_charges(on_dash = TRUE)
+ to_chat(user, span_boldnotice("You take aim at [interacting_with]..."))
+ user.add_shared_particles(/particles/bonfire)
+
+ if(!do_after(user, SLASH_WINDUP, target = src))
+ // Special attack fizzles, no slash and charges lost.
+ reset_charges()
+ drop_particles(user)
+ return ITEM_INTERACT_BLOCKING
+
+ user.add_shared_particles(/particles/bonfire)
+ new /obj/effect/temp_visual/focus_ring(get_turf(src))
+ playsound(src, 'sound/items/car_engine_start.ogg', vol = 35, vary = FALSE, extrarange = 3)
+
+ if(!do_after(user, SLASH_WINDUP * 2, target = src) || fire_charges < 3)
+ flaming_slash(interacting_with, user, upgraded = FALSE)
+ return ITEM_INTERACT_SUCCESS
+
+ flaming_slash(interacting_with, user, upgraded = TRUE) //Upgraded slash.
return ITEM_INTERACT_SUCCESS
/obj/item/house_edge/update_icon_state()
- inhand_icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "house_edge1" : "house_edge0"
- icon_state = "house_edge[fire_charges]"
+ inhand_icon_state = HAS_TRAIT(src, TRAIT_WIELDED) ? "house_edge1" : "house_edge"
+ icon_state = "[base_icon_state][fire_charges ? fire_charges : ""]"
return ..()
-/obj/item/house_edge/proc/reset_charges(on_dash = FALSE)
- if(!COOLDOWN_FINISHED(src, fire_charge_cooldown) && !on_dash)
+/**
+ * Proc that handles the house edge's fire_charge mechanic when resetting charges back to zero.
+ * Updates icon, sets count, and updates icon.
+ */
+/obj/item/house_edge/proc/reset_charges(on_slash = FALSE)
+ if(!COOLDOWN_FINISHED(src, fire_charge_cooldown) && !on_slash)
return
if(fire_charges)
balloon_alert_to_viewers("charges lost!")
fire_charges = 0
- icon_state = "house_edge[fire_charges]"
- update_icon()
+ update_icon(UPDATE_OVERLAYS|UPDATE_ICON_STATE)
+
+/// Kills any of the relevant particles off the wielder, as added during special attacks.
+/obj/item/house_edge/proc/drop_particles(mob/living/user)
+ user.remove_shared_particles(/particles/bonfire)
+
+/**
+ * Proc that creates and fires the flaming_slash projectile from the house edge special attack.
+ * Extends off the ranged_interact_with_atom_secondary() behavior.
+ * * upgraded: when juiced up from the second do_after, applies a light explosion radius to the slash.
+ */
+/obj/item/house_edge/proc/flaming_slash(atom/interacting_with, mob/living/user, upgraded = FALSE)
+ // Do the cool slash
+ var/obj/projectile/flaming_slash/projectile = new /obj/projectile/flaming_slash(get_turf(src))
+
+ projectile.aim_projectile(interacting_with, src)
+ projectile.firer = user
+ projectile.damage += (10 * fire_charges)
+ if(upgraded)
+ projectile.explosion_power = 1
+ projectile.damage /= 2 // The damage is pretty solid normally, but with the explosion and all the RNG that comes with, it's nearly a 1-shot. This evens a playing field a bit.
+ projectile.fire(null, interacting_with)
+
+ user.visible_message(span_danger("[user] makes a[upgraded ? " devastating" : "" ] blazing slash at [interacting_with]!"),\
+ span_notice("You take a blazing swipe at [interacting_with]!"))
+ playsound(src, 'sound/items/modsuit/flamethrower.ogg', vol = 75, vary = FALSE, extrarange = 3)
+ playsound(src, 'sound/items/weapons/slash.ogg', vol = 50, vary = FALSE, extrarange = 3)
+
+ drop_particles(user)
+ COOLDOWN_START(src, fire_charge_cooldown, SLASH_COOLDOWN)
+ reset_charges(on_slash = TRUE)
+
+/// Flaming slash for the special attack at max charges.
+/obj/projectile/flaming_slash
+ name = "flaming slash"
+ desc = "Someone is about to cash out."
+ icon_state = "flaming_slash"
+ damage_type = BURN
+ armor_flag = MELEE //We're operating off of anime remote slash logic here. As such, we can treat this as a hybrid burn/brute this way.
+ damage = 10 // Damage amps based on the number of flame_charges it was created off of.
+ speed = 2
+ light_range = 1
+ light_power = 1
+ light_color = LIGHT_COLOR_FIRE
+ sharpness = SHARP_EDGED
+
+ ///Applied in on_hit as the light_devastation_range. Defaults to zero unless giving the slash an extra juiced charge.
+ var/explosion_power = 0
+
+/obj/projectile/flaming_slash/on_hit(atom/target, blocked, pierce_hit)
+ . = ..()
+ explosion(loc,
+ light_impact_range = explosion_power,
+ flame_range = 3,
+ explosion_cause = "[firer] using \the [fired_from]",
+ explosion_arc = 120
+ )
#undef ENGINE_COOLDOWN
-#undef DASH_COOLDOWN
+#undef SLASH_COOLDOWN
+#undef SLASH_WINDUP
+#undef CHARGE_DAMAGE_MOD
#undef HOUSE_EDGE_ICONS_MAX
#undef HOUSE_EDGE_ICONS_MIN
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 63ee92212ec..736e5754d73 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -363,6 +363,25 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/claymore/highlander/robot/process()
loc.layer = ABOVE_ALL_MOB_LAYER
+/obj/item/claymore/gladius
+ name = "gladius"
+ desc = "A short but formidable sword, favored by recently-reanimated ancient warriors."
+ icon = 'icons/obj/weapons/sword.dmi'
+ icon_state = "gladius"
+ inhand_icon_state = "gladius"
+ lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ sharpness = SHARP_POINTY
+ attack_verb_continuous = list("stabs", "cuts")
+ attack_verb_simple = list("stab", "cut")
+ slot_flags = null
+ sound_vary = TRUE
+ block_sound = 'sound/items/weapons/parry.ogg'
+ hitsound = 'sound/items/weapons/bladeslice.ogg'
+ pickup_sound = SFX_KNIFE_PICKUP
+ drop_sound = SFX_KNIFE_DROP
+
+
/obj/item/katana
name = "katana"
desc = "Woefully underpowered in D20."
@@ -1023,10 +1042,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_SMALL
/// Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
var/static/list/splattable
- /// Things in this list which take a lot more damage from the fly swatter, but not be necessarily killed by it.
- var/static/list/strong_against
- /// How much extra damage the fly swatter does against mobs it is strong against
- var/extra_strength_damage = 24
/obj/item/melee/flyswatter/Initialize(mapload)
. = ..()
@@ -1041,11 +1056,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/effect/decal/cleanable/ants,
/obj/item/queen_bee,
))
- if (isnull(strong_against))
- strong_against = typecacheof(list(
- /mob/living/basic/spider,
- ))
-
+ AddElement(/datum/element/bane, mob_biotypes = MOB_BUG, target_type = /mob/living/basic, damage_multiplier = 0, added_damage = 24, requires_combat_mode = FALSE)
/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
if(is_type_in_typecache(target, splattable))
@@ -1057,10 +1068,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
bug.gib(DROP_ALL_REMAINS)
else
qdel(target)
- return
- if(is_type_in_typecache(target, strong_against) && isliving(target))
- var/mob/living/living_target = target
- living_target.adjustBruteLoss(extra_strength_damage)
/obj/item/proc/can_trigger_gun(mob/living/user, akimbo_usage)
if(!user.can_use_guns(src))
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 10b500824e5..cc7cf0f2ccd 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -64,10 +64,14 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
if (id_tag)
GLOB.objects_by_id_tag[id_tag] = src
+ if(opacity)
+ SScameras.update_visibility(src)
/obj/Destroy(force)
if(!ismachinery(src))
STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
+ if(opacity)
+ SScameras.update_visibility(src)
SStgui.close_uis(src)
GLOB.objects_by_id_tag -= id_tag
. = ..()
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 3e7e13c1df2..9d4442238ac 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -23,10 +23,8 @@
if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH(src)
QUEUE_SMOOTH_NEIGHBORS(src)
- GLOB.cameranet.updateVisibility(src)
/obj/structure/Destroy(force)
- GLOB.cameranet.updateVisibility(src)
if(smoothing_flags & USES_SMOOTHING)
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index fc2c2fe56d1..f07fd7dca1d 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -30,6 +30,8 @@
new /obj/item/clothing/shoes/sneakers/black(src)
new /obj/item/mod/module/plasma_stabilizer(src)
new /obj/item/climbing_hook/syndicate(src)
+ new /obj/item/mod/module/thermal_regulator(src)
+ new /obj/item/mod/module/plasma_stabilizer(src)
/obj/structure/closet/syndicate/nuclear
desc = "It's a storage unit for a Syndicate boarding party."
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index da169a042cd..84952e56353 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -136,7 +136,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/iron))
+ else if(istype(stack, /obj/item/stack/sheet/iron))
var/amount = construction_cost[/obj/item/stack/sheet/iron]
if(state == GIRDER_DISPLACED)
if(stack.get_amount() < amount)
@@ -182,7 +182,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
+ else if(istype(stack, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
var/amount = construction_cost[/obj/item/stack/sheet/titaniumglass]
if(stack.get_amount() < amount)
balloon_alert(user, "need [amount] sheets!")
@@ -198,7 +198,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/plasteel))
+ else if(istype(stack, /obj/item/stack/sheet/plasteel))
var/amount = construction_cost[/obj/item/stack/sheet/plasteel]
if(state == GIRDER_DISPLACED)
if(stack.get_amount() < amount)
@@ -241,7 +241,7 @@
qdel(src)
return
- if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
+ else if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
if(state == GIRDER_REINF)
if(stack.get_amount() < 1)
return
@@ -257,7 +257,7 @@
return
// No return here because generic material construction handles making normal plastitanium walls
- if(!stack.has_unique_girder && stack.material_type)
+ else if(!stack.has_unique_girder && stack.material_type)
if(istype(src, /obj/structure/girder/reinforced))
balloon_alert(user, "need plasteel or plastitanium!")
return
diff --git a/code/game/objects/structures/secure_safe.dm b/code/game/objects/structures/secure_safe.dm
index 43af43268e8..69aa061f2f2 100644
--- a/code/game/objects/structures/secure_safe.dm
+++ b/code/game/objects/structures/secure_safe.dm
@@ -104,7 +104,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
/obj/structure/secure_safe/Initialize(mapload)
. = ..()
//this will create the storage for us.
- AddComponent(/datum/component/lockable_storage, , stored_lock_code)
+ AddComponent(/datum/component/lockable_storage, stored_lock_code)
if(mapload)
PopulateContents()
find_and_hang_on_wall()
diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index a13a2a7dbe5..230eecabeec 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
//SKYRAT EDIT END
if(old_opacity != opacity && SSticker)
- GLOB.cameranet.bareMajorChunkChange(src)
+ SScameras.bare_major_chunk_change(src)
// We will only run this logic if the tile is not on the prime z layer, since we use area overlays to cover that
if(SSmapping.z_level_to_plane_offset[z])
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index e6cd991fcbf..c14573cf74e 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -188,7 +188,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = TRUE
+ tiled_turf = TRUE
/turf/open/indestructible/Melt()
to_be_destroyed = FALSE
@@ -264,7 +264,7 @@
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
heavyfootstep = FOOTSTEP_LAVA
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/indestructible/necropolis/Initialize(mapload)
. = ..()
@@ -327,7 +327,7 @@
barefootstep = null
clawfootstep = null
heavyfootstep = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/indestructible/binary
name = "tear in the fabric of reality"
diff --git a/code/game/turfs/open/ashplanet.dm b/code/game/turfs/open/ashplanet.dm
index e6703c04eb5..35c7ec5b1cd 100644
--- a/code/game/turfs/open/ashplanet.dm
+++ b/code/game/turfs/open/ashplanet.dm
@@ -14,7 +14,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
var/smooth_icon = 'icons/turf/floors/ash.dmi'
diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm
index ec4b5ca50ad..b0fba1ea4e1 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -16,7 +16,7 @@
thermal_conductivity = 0.02
heat_capacity = 20000
- tiled_dirt = TRUE
+ tiled_turf = TRUE
overfloor_placed = TRUE
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index 79429394a0a..07c1a6b6043 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -16,7 +16,7 @@
barefootstep = FOOTSTEP_WOOD_BAREFOOT
clawfootstep = FOOTSTEP_WOOD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_BASIC
/turf/open/floor/wood/broken_states()
@@ -151,7 +151,7 @@
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/floor/grass/broken_states()
@@ -205,7 +205,7 @@
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/floor/fake_snow
@@ -219,7 +219,7 @@
floor_tile = null
initial_gas_mix = FROZEN_ATMOS
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
slowdown = 1.5
bullet_sizzle = TRUE
@@ -254,7 +254,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/fakebasalt/Initialize(mapload)
. = ..()
@@ -283,7 +283,7 @@
barefootstep = FOOTSTEP_CARPET_BAREFOOT
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_BASIC
/turf/open/floor/carpet/examine(mob/user)
@@ -870,7 +870,7 @@
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_TURF_CHASM
canSmoothWith = SMOOTH_GROUP_TURF_CHASM
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/fakepit/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/floors.dmi'
@@ -896,7 +896,7 @@
floor_tile = /obj/item/stack/tile/fakespace
layer = SPACE_LAYER
plane = PLANE_SPACE
- tiled_dirt = FALSE
+ tiled_turf = FALSE
damaged_dmi = 'icons/turf/space.dmi'
/turf/open/floor/fakespace/broken_states()
diff --git a/code/game/turfs/open/floor/iron_floor.dm b/code/game/turfs/open/floor/iron_floor.dm
index 978a9ab0fdf..6f0489acea5 100644
--- a/code/game/turfs/open/floor/iron_floor.dm
+++ b/code/game/turfs/open/floor/iron_floor.dm
@@ -472,7 +472,7 @@
/turf/open/floor/iron/grimy
icon_state = "grimy"
base_icon_state = "grimy"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
floor_tile = /obj/item/stack/tile/iron/grimy
/turf/open/floor/iron/vaporwave
@@ -485,13 +485,13 @@
desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."
icon_state = "plaque"
base_icon_state = "plaque"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
floor_tile = /obj/item/stack/tile/iron/goonplaque
/turf/open/floor/iron/stairs
icon_state = "stairs"
base_icon_state = "stairs"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/iron/stairs/airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm
index eaccba29aaa..93ae88597ad 100644
--- a/code/game/turfs/open/floor/light_floor.dm
+++ b/code/game/turfs/open/floor/light_floor.dm
@@ -19,7 +19,7 @@
var/currentcolor = LIGHT_COLOR_CYAN
///var to prevent changing color on certain admin spawn only tiles
var/can_modify_colour = TRUE
- tiled_dirt = FALSE
+ tiled_turf = FALSE
///icons for radial menu
var/static/list/lighttile_designs
///used for light floors that cycle colours
diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
index 8ca8b45c101..8456afc084b 100644
--- a/code/game/turfs/open/floor/mineral_floor.dm
+++ b/code/game/turfs/open/floor/mineral_floor.dm
@@ -15,7 +15,7 @@
material_flags = MATERIAL_EFFECTS
rust_resistance = RUST_RESISTANCE_BASIC
var/list/icons
- tiled_dirt = FALSE
+ tiled_turf = FALSE
diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm
index 40fd7055524..2b6fe12a158 100644
--- a/code/game/turfs/open/floor/plating/misc_plating.dm
+++ b/code/game/turfs/open/floor/plating/misc_plating.dm
@@ -18,7 +18,7 @@
name = "alien floor"
icon_state = "alienpod1"
base_icon_state = "alienpod1"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
// Not actually broken, just should never break...yeah.
broken = TRUE
@@ -32,7 +32,7 @@
name = "alien plating"
icon_state = "alienplating"
base_icon_state = "alienplating"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
damaged_dmi = null
diff --git a/code/game/turfs/open/floor/reinforced_floor.dm b/code/game/turfs/open/floor/reinforced_floor.dm
index 219e284db36..9cd61766442 100644
--- a/code/game/turfs/open/floor/reinforced_floor.dm
+++ b/code/game/turfs/open/floor/reinforced_floor.dm
@@ -10,7 +10,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rcd_proof = TRUE
rust_resistance = RUST_RESISTANCE_REINFORCED
floor_tile = /obj/item/stack/rods
diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm
index b9c27e3faf2..fcc5b2e3692 100644
--- a/code/game/turfs/open/misc.dm
+++ b/code/game/turfs/open/misc.dm
@@ -19,7 +19,7 @@
thermal_conductivity = 0.02
heat_capacity = 20000
- tiled_dirt = TRUE
+ tiled_turf = TRUE
/turf/open/misc/attackby(obj/item/attacking_item, mob/user, list/modifiers)
. = ..()
diff --git a/code/game/turfs/open/planet.dm b/code/game/turfs/open/planet.dm
index e0fe7e842b9..55963e2cf68 100644
--- a/code/game/turfs/open/planet.dm
+++ b/code/game/turfs/open/planet.dm
@@ -12,7 +12,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/misc/dirt/station
diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm
index faccf7db104..71ffa6be613 100644
--- a/code/game/turfs/open/sand.dm
+++ b/code/game/turfs/open/sand.dm
@@ -72,7 +72,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rust_resistance = RUST_RESISTANCE_ORGANIC
/turf/open/misc/sandy_dirt/break_tile()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 2d20bccfd0d..e8f012c2f52 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
var/bullet_sizzle = FALSE //used by ammo_casing/bounce_away() to determine if the shell casing should make a sizzle sound when it's ejected over the turf
//IE if the turf is supposed to be water, set TRUE.
- var/tiled_dirt = FALSE // use smooth tiled dirt decal
+ var/tiled_turf = FALSE // use tiled water and dirt decals
///Icon-smoothing variable to map a diagonal wall corner with a fixed underlay.
var/list/fixed_underlay = null
@@ -553,9 +553,6 @@ GLOBAL_LIST_EMPTY(station_turfs)
/turf/proc/can_lay_cable()
return can_have_cabling() && underfloor_accessibility >= UNDERFLOOR_INTERACTABLE
-/turf/proc/visibilityChanged()
- GLOB.cameranet.updateVisibility(src)
-
/turf/proc/burn_tile()
return
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 3e8d212d071..fdde0aa1cb2 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -135,11 +135,11 @@
var/effect_range = 5
/obj/effect/fun_balloon/scatter/effect()
- for(var/mob/living/M in range(effect_range, get_turf(src)))
- var/turf/T = find_safe_turf(zlevel = src.z)
- new /obj/effect/temp_visual/gravpush(get_turf(M))
- M.forceMove(T)
- to_chat(M, span_notice("Pop!"), confidential = TRUE)
+ for(var/mob/living/dispersed_mob in range(effect_range, get_turf(src)))
+ var/turf/drop_off = find_safe_turf(z)
+ new /obj/effect/temp_visual/gravpush(get_turf(dispersed_mob))
+ dispersed_mob.forceMove(drop_off)
+ dispersed_mob.balloon_alert(dispersed_mob, "pop!")
// ----------- Station Crash
// Can't think of anywhere better to put it right now
diff --git a/code/modules/admin/smites/boneless.dm b/code/modules/admin/smites/boneless.dm
index a3031ce13ff..3fd1a1121f4 100644
--- a/code/modules/admin/smites/boneless.dm
+++ b/code/modules/admin/smites/boneless.dm
@@ -11,7 +11,7 @@
var/mob/living/carbon/carbon_target = target
for(var/obj/item/bodypart/limb as anything in carbon_target.bodyparts)
- var/severity = pick_weight(list(
+ var/severity = pick_weight(alist(
WOUND_SEVERITY_MODERATE = 1,
WOUND_SEVERITY_SEVERE = 2,
WOUND_SEVERITY_CRITICAL = 2,
diff --git a/code/modules/admin/verbs/commandreport.dm b/code/modules/admin/verbs/commandreport.dm
index 9d2202d8fda..8d118339fca 100644
--- a/code/modules/admin/verbs/commandreport.dm
+++ b/code/modules/admin/verbs/commandreport.dm
@@ -100,13 +100,13 @@ ADMIN_VERB(create_command_report, R_ADMIN, "Create Command Report", "Create a co
if("set_report_sound")
if(params["picked_sound"] == CUSTOM_SOUND_PRESET)
played_sound = DEFAULT_ANNOUNCEMENT_SOUND // fallback by default
- var/sound_file = input(ui_user, "Select sound file (OGG, WAV, MP3)", "Upload sound") as file|null
+ var/sound_file = input(ui_user, "Select sound file", "Upload sound") as sound|null
if(!sound_file)
tgui_alert(ui_user, "The custom sound could not be loaded. The standard sound will be played.", "Loading error", list("Ok"))
return
- if(!(copytext("[sound_file]", -4) in list(".ogg", ".wav", ".mp3")))
- tgui_alert(ui_user, "Invalid file type. Please select an OGG, WAV, or MP3 file.", "Loading error", list("Ok"))
+ if(!IS_SOUND_FILE(sound_file))
+ tgui_alert(ui_user, "Invalid file type. Please select a sound file.", "Loading error", list("Ok"))
return
played_sound = sound_file
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index a981a5c3e74..c7b4a0e3d13 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -320,7 +320,7 @@ ADMIN_VERB(cmd_admin_areatest, R_DEBUG, "Test Areas", "Tests the areas for vario
areas_with_intercom.Add(A.type)
CHECK_TICK
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/C as anything in SScameras.cameras)
var/area/A = get_area(C)
if(!A)
dat += "Skipped over [C] in invalid location, [C.loc].
"
@@ -615,7 +615,7 @@ ADMIN_VERB(place_ruin, R_DEBUG, "Spawn Ruin", "Attempt to randomly place a speci
themed_names[name] = list(ruin, theme, list(ruin.default_area))
names += sort_list(themed_names)
- var/ruinname = tgui_input_list(user, "Select ruin", "Spawn Ruin", sort_list(names))
+ var/ruinname = tgui_input_list(user, "Select ruin", "Spawn Ruin", names)
var/data = names[ruinname]
if (!data)
return
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index f0e0e002d2c..5bd512ec9b7 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -8,11 +8,11 @@ ADMIN_VERB(camera_view, R_DEBUG, "Camera Range Display", "Shows the range of cam
if(!on)
var/list/seen = list()
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
- for(var/turf/T in C.can_see())
- seen[T]++
- for(var/turf/T in seen)
- T.maptext = MAPTEXT(seen[T])
+ for(var/obj/machinery/camera/cam as anything in SScameras.cameras)
+ for(var/turf/cam_turf as anything in cam.can_see())
+ seen[cam]++
+ for(var/turf/seen_turf as anything in seen)
+ seen_turf.maptext = MAPTEXT(seen[seen_turf])
BLACKBOX_LOG_ADMIN_VERB("Show Camera Range")
#ifdef TESTING
@@ -34,7 +34,7 @@ ADMIN_VERB_VISIBILITY(sec_camera_report, ADMIN_VERB_VISIBLITY_FLAG_MAPPING_DEBUG
ADMIN_VERB(sec_camera_report, R_DEBUG, "Camera Report", "Get a printout of all camera issues.", ADMIN_CATEGORY_MAPPING)
var/list/obj/machinery/camera/CL = list()
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/C as anything in SScameras.cameras)
CL += C
var/output = {"
Camera Abnormalities Report
diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm
index 0141ae73cbf..10abf2577ee 100644
--- a/code/modules/antagonists/abductor/machinery/camera.dm
+++ b/code/modules/antagonists/abductor/machinery/camera.dm
@@ -72,7 +72,7 @@
use_delay = (world.time + abductor_pad_cooldown)
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
+ if(SScameras.is_visible_by_cameras(remote_eye.loc))
P.PadToLoc(remote_eye.loc)
/datum/action/innate/teleport_out
@@ -116,7 +116,7 @@
use_delay = (world.time + teleport_self_cooldown)
- if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
+ if(SScameras.is_visible_by_cameras(remote_eye.loc))
P.MobToLoc(remote_eye.loc,C)
/datum/action/innate/vest_mode_swap
diff --git a/code/modules/antagonists/changeling/powers/darkness_adaptation.dm b/code/modules/antagonists/changeling/powers/darkness_adaptation.dm
index 47fe31c215b..4d8e8a7e474 100644
--- a/code/modules/antagonists/changeling/powers/darkness_adaptation.dm
+++ b/code/modules/antagonists/changeling/powers/darkness_adaptation.dm
@@ -51,7 +51,7 @@
/// Makes the user harder to see in the dark (and makes the user see in the dark easier)
/datum/status_effect/darkness_adapted
id = "darkness_adapted"
- tick_interval = 0.5 SECONDS
+ tick_interval = 0.6 SECONDS
alert_type = null
/// Threshold before the dark color is applied
var/dark_color_threshold = 70
diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm
index a89755a4732..1c2b6973e72 100644
--- a/code/modules/antagonists/changeling/powers/shriek.dm
+++ b/code/modules/antagonists/changeling/powers/shriek.dm
@@ -50,7 +50,7 @@
user.balloon_alert(user, "throat is sore!")
return FALSE
//BUBBER EDIT: NO PULSE IF YOU'RE ON COOLDOWN
- empulse(get_turf(user), 2, 5, 1)
+ empulse(get_turf(user), 2, 5, 1, emp_source = src)
for(var/obj/machinery/light/L in range(5, usr))
L.on = TRUE
L.break_light_tube()
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index d2d80e2bbeb..29fbd8b9449 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -183,7 +183,7 @@
owner.whisper(invocation, language = /datum/language/common, forced = "cult invocation")
owner.visible_message(span_warning("[owner]'s hand flashes a bright blue!"), \
span_cult_italic("You speak the cursed words, emitting an EMP blast from your hand."))
- empulse(owner, 2, 5)
+ empulse(owner, 2, 5, emp_source = src)
charges--
SSblackbox.record_feedback("tally", "cult_spell_invoke", 1, "[name]")
if(charges <= 0)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index b3dfd066fae..e3f90646442 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -1170,7 +1170,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
for(var/mob/living/target in range(src, 3))
target.Paralyze(30)
- empulse(T, 0.42*(intensity), 1)
+ empulse(T, 0.42*(intensity), 1, emp_source = src)
var/list/images = list()
for(var/mob/living/M in GLOB.alive_mob_list)
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 5300f6d1943..4b2b82adc56 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -231,7 +231,7 @@
return ..()
/datum/heretic_knowledge/limited_amount/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user)
+ var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user)
if(our_heretic && our_heretic.unlimited_blades)
if(length(result_atoms & typesof(/obj/item/melee/sickly_blade)))
return TRUE
diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm
index eae583f2f82..fe3eefc5eb3 100644
--- a/code/modules/antagonists/heretic/items/heretic_blades.dm
+++ b/code/modules/antagonists/heretic/items/heretic_blades.dm
@@ -54,7 +54,7 @@
return .
/obj/item/melee/sickly_blade/attack_self(mob/user)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
if(heretic_datum?.unlimited_blades)
return
if(HAS_TRAIT(user, TRAIT_ELDRITCH_ARENA_PARTICIPANT))
@@ -81,7 +81,7 @@
/// Attempts to teleport the passed mob to somewhere safe on the station, if they can use the blade.
/obj/item/melee/sickly_blade/proc/seek_safety(mob/user)
- var/turf/safe_turf = find_safe_turf(zlevels = z, extended_safety_checks = TRUE)
+ var/turf/safe_turf = find_safe_turf(z, extended_safety_checks = TRUE)
if(check_usability(user))
if(do_teleport(user, safe_turf, channel = TELEPORT_CHANNEL_MAGIC))
to_chat(user, span_warning("As you shatter [src], you feel a gust of energy flow through your body. [after_use_message]"))
@@ -168,7 +168,7 @@
. = ..()
if(!infused || target == user || !isliving(target))
return
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
var/mob/living/living_target = target
if(!heretic_datum)
return
diff --git a/code/modules/antagonists/heretic/items/madness_mask.dm b/code/modules/antagonists/heretic/items/madness_mask.dm
index 4e80ee862f6..4a91a69192a 100644
--- a/code/modules/antagonists/heretic/items/madness_mask.dm
+++ b/code/modules/antagonists/heretic/items/madness_mask.dm
@@ -54,7 +54,7 @@
REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT)
for(var/mob/living/carbon/human/human_in_range in view(local_user))
- if(IS_HERETIC_OR_MONSTER(human_in_range) || human_in_range.is_blind())
+ if(IS_HERETIC_OR_MONSTER(human_in_range) || human_in_range.stat > SOFT_CRIT || human_in_range.is_blind())
continue
if(human_in_range.can_block_magic(MAGIC_RESISTANCE|MAGIC_RESISTANCE_MIND))
diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
index d8dbc03c5d1..9a178521f65 100644
--- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
@@ -32,7 +32,7 @@
"Use your labyrinth book to shake off pursuers. It creates impassible walls to anyone but you.",
)
- start = /datum/heretic_knowledge/limited_amount/starting/base_knock
+ start = /datum/heretic_knowledge/limited_amount/starting/base_lock
knowledge_tier1 = /datum/heretic_knowledge/key_ring
guaranteed_side_tier1 = /datum/heretic_knowledge/painting
knowledge_tier2 = /datum/heretic_knowledge/limited_amount/concierge_rite
@@ -44,7 +44,7 @@
knowledge_tier4 = /datum/heretic_knowledge/spell/caretaker_refuge
ascension = /datum/heretic_knowledge/ultimate/lock_final
-/datum/heretic_knowledge/limited_amount/starting/base_knock
+/datum/heretic_knowledge/limited_amount/starting/base_lock
name = "A Steward's Secret"
desc = "Opens up the Path of Lock to you. \
Allows you to transmute a knife and a crowbar into a Key Blade. \
@@ -62,26 +62,28 @@
mark_type = /datum/status_effect/eldritch/lock
eldritch_passive = /datum/status_effect/heretic_passive/lock
-/datum/heretic_knowledge/limited_amount/starting/base_knock/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
+/datum/heretic_knowledge/limited_amount/starting/base_lock/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, PROC_REF(on_secondary_mansus_grasp))
var/datum/action/cooldown/spell/touch/mansus_grasp/grasp_spell = locate() in user.actions
grasp_spell?.invocation_type = INVOCATION_NONE
grasp_spell?.sound = null
-/datum/heretic_knowledge/limited_amount/starting/base_knock/on_lose(mob/user, datum/antagonist/heretic/our_heretic)
+/datum/heretic_knowledge/limited_amount/starting/base_lock/on_lose(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY)
-/datum/heretic_knowledge/limited_amount/starting/base_knock/on_mansus_grasp(mob/living/source, mob/living/target)
+/datum/heretic_knowledge/limited_amount/starting/base_lock/on_mansus_grasp(mob/living/source, mob/living/target)
. = ..()
var/obj/item/clothing/under/suit = target.get_item_by_slot(ITEM_SLOT_ICLOTHING)
+ if(!suit.can_adjust)
+ return
if(istype(suit) && suit.adjusted == NORMAL_STYLE)
suit.toggle_jumpsuit_adjust()
suit.update_appearance()
-/datum/heretic_knowledge/limited_amount/starting/base_knock/proc/on_secondary_mansus_grasp(mob/living/source, atom/target)
+/datum/heretic_knowledge/limited_amount/starting/base_lock/proc/on_secondary_mansus_grasp(mob/living/source, atom/target)
SIGNAL_HANDLER
if(ismecha(target))
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index d99712400cc..4db73da4622 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -69,7 +69,7 @@
/datum/heretic_knowledge/limited_amount/starting/base_moon/on_gain(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
- ADD_TRAIT(user, TRAIT_EMPATH, REF(src))
+ user.AddComponentFrom(REF(src), /datum/component/empathy, seen_it = TRUE, visible_info = ALL, self_empath = FALSE, sense_dead = FALSE, sense_whisper = TRUE, smite_target = FALSE)
/datum/heretic_knowledge/limited_amount/starting/base_moon/on_mansus_grasp(mob/living/source, mob/living/target)
. = ..()
diff --git a/code/modules/antagonists/heretic/magic/fire_blast.dm b/code/modules/antagonists/heretic/magic/fire_blast.dm
index 873f131c28f..36ed3b4caab 100644
--- a/code/modules/antagonists/heretic/magic/fire_blast.dm
+++ b/code/modules/antagonists/heretic/magic/fire_blast.dm
@@ -157,7 +157,7 @@
id = "fire_blasted"
alert_type = null
duration = 5 SECONDS
- tick_interval = 0.5 SECONDS
+ tick_interval = 0.6 SECONDS
/// How much fire / stam to do per tick (stamina damage is doubled this)
var/tick_damage = 1
/// How long does the animation of the appearance last? If 0 or negative, we make no overlay
diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
index 591b81d06c3..0035a44167b 100644
--- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
@@ -704,8 +704,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
var/turf/T = turfs[n]
if(!isfloorturf(T))
success = FALSE
- var/datum/camerachunk/C = GLOB.cameranet.getCameraChunk(T.x, T.y, T.z)
- if(!C.visibleTurfs[T])
+ if(!SScameras.is_visible_by_cameras(T))
alert_msg = "You don't have camera vision of this location!"
success = FALSE
for(var/atom/movable/AM in T.contents)
@@ -830,7 +829,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
/datum/action/innate/ai/reactivate_cameras/Activate()
var/fixed_cameras = 0
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/C as anything in SScameras.cameras)
if(!uses)
break
if(!C.camera_enabled || C.view_range != initial(C.view_range))
@@ -862,13 +861,12 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
AI.update_sight()
var/upgraded_cameras = 0
- for(var/obj/machinery/camera/camera as anything in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/camera as anything in SScameras.cameras)
var/upgraded = FALSE
if(!camera.isXRay())
camera.upgradeXRay(TRUE) //if this is removed you can get rid of camera_assembly/var/malf_xray_firmware_active and clean up isxray()
//Update what it can see.
- GLOB.cameranet.updateVisibility(camera, 0)
upgraded = TRUE
if(!camera.isEmpProof())
diff --git a/code/modules/antagonists/voidwalker/voidwalker_mob.dm b/code/modules/antagonists/voidwalker/voidwalker_mob.dm
index 7915e85d116..c64b4e0dda5 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_mob.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_mob.dm
@@ -146,6 +146,9 @@
var/should_attack = try_kidnap(hewmon)
+ // Marks the victim with nodeath
+ hewmon.apply_status_effect(/datum/status_effect/void_chomped)
+
if(!should_attack)
return FALSE
diff --git a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
index e2716c6399e..238aa3cf87f 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
@@ -16,16 +16,17 @@
use_user_hud_icon = TRUE
overlay_state = "paralysis"
-/datum/status_effect/void_eatered
- id = "void_eatered"
- duration = 10 SECONDS
+/datum/status_effect/void_chomped
+ id = "void_chomped"
+ duration = 15 SECONDS
+ status_type = STATUS_EFFECT_REFRESH
remove_on_fullheal = TRUE
alert_type = null
-/datum/status_effect/void_eatered/on_apply()
+/datum/status_effect/void_chomped/on_apply()
. = ..()
ADD_TRAIT(owner, TRAIT_NODEATH, TRAIT_STATUS_EFFECT(id))
-/datum/status_effect/void_eatered/on_remove()
+/datum/status_effect/void_chomped/on_remove()
. = ..()
REMOVE_TRAIT(owner, TRAIT_NODEATH, TRAIT_STATUS_EFFECT(id))
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 4d90d4aa53b..6f6b87c5e17 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -304,7 +304,7 @@
uniform = /obj/item/clothing/under/costume/roman
shoes = /obj/item/clothing/shoes/roman
back = /obj/item/spear
- r_hand = /obj/item/claymore
+ belt = /obj/item/storage/belt/sheath/gladius
l_hand = /obj/item/shield/roman
/datum/outfit/roman/pre_equip(mob/living/carbon/human/H, visuals_only)
diff --git a/code/modules/antagonists/wizard/equipment/enchanted_clown_suit.dm b/code/modules/antagonists/wizard/equipment/enchanted_clown_suit.dm
index 62397127693..c0ae9379f1b 100644
--- a/code/modules/antagonists/wizard/equipment/enchanted_clown_suit.dm
+++ b/code/modules/antagonists/wizard/equipment/enchanted_clown_suit.dm
@@ -62,7 +62,7 @@
return ..()
/datum/action/cooldown/spell/conjure_item/clown_pockets/post_created(atom/cast_on, atom/created)
- cast_on.visible_message(span_notice("[cast_on] pulls out [created]!"))
+ cast_on.visible_message(span_notice("[cast_on] pulls out [created]!"), span_notice("You pull out [created]!"))
/datum/action/cooldown/spell/conjure_item/clown_pockets/can_cast_spell(feedback = TRUE)
. = ..()
@@ -76,7 +76,8 @@
/// Prints a funny message, exists so I can override it to print a different message
/datum/action/cooldown/spell/conjure_item/clown_pockets/proc/cast_message(mob/cast_on)
cast_on.visible_message(span_notice("[cast_on] reaches far deeper into [cast_on.p_their()] pockets than you think \
- should be possible and starts rummaging around for something."))
+ should be possible and starts rummaging around for something."), span_notice("You reach further down into your \
+ pockets than you ever have before and feel around for something."))
/// Longer cooldown variant which is attached to the enchanted clown suit
/datum/action/cooldown/spell/conjure_item/clown_pockets/enchantment
@@ -84,7 +85,8 @@
cooldown_time = 60 SECONDS
/datum/action/cooldown/spell/conjure_item/clown_pockets/enchantment/cast_message(mob/cast_on)
- cast_on.visible_message(span_notice("[cast_on] starts rummaging around in [cast_on.p_their()] comically large pants."))
+ cast_on.visible_message(span_notice("[cast_on] starts rummaging around in [cast_on.p_their()] comically large pants."), span_notice("You \
+ start rummaging around in your comically large pants."))
/// Enchanted clown suit
/obj/item/clothing/under/rank/civilian/clown/magic
diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm
index 8965d55b92d..594911c0d3d 100644
--- a/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/grand_side_effect.dm
@@ -123,7 +123,7 @@
/datum/grand_side_effect/emp/trigger(potency, turf/ritual_location, mob/invoker)
var/heavy = LERP(0, 3, potency/GRAND_RITUAL_FINALE_COUNT)
var/light = LERP(3, 6, potency/GRAND_RITUAL_FINALE_COUNT)
- empulse(ritual_location, heavy, light)
+ empulse(ritual_location, heavy, light, emp_source = src)
/// Swap locations of nearby mobs arbitrarily and confuse them
/datum/grand_side_effect/translocate
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index ffd45abb600..64cd36ca239 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -7,10 +7,10 @@
//Builds a list of gas id to reaction group
for(var/gas_id in GLOB.meta_gas_info)
priority_reactions[gas_id] = list(
- PRIORITY_PRE_FORMATION = list(),
- PRIORITY_FORMATION = list(),
- PRIORITY_POST_FORMATION = list(),
- PRIORITY_FIRE = list()
+ /* PRIORITY_PRE_FORMATION = */ list(),
+ /* PRIORITY_FORMATION = */ list(),
+ /* PRIORITY_POST_FORMATION = */ list(),
+ /* PRIORITY_FIRE = */ list()
)
for(var/datum/gas_reaction/reaction as anything in subtypesof(/datum/gas_reaction))
diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
index 10f4b898029..f460ca127fb 100644
--- a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
+++ b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
@@ -560,7 +560,7 @@
epicenter = loc,
heavy_range = critical ? emp_heavy_size * 2 : emp_heavy_size,
light_range = critical ? emp_light_size * 2 : emp_heavy_size,
- log = TRUE
+ emp_source = src
)
qdel(src)
diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm
index 94c71287eef..4a2f63b8cfb 100644
--- a/code/modules/awaymissions/signpost.dm
+++ b/code/modules/awaymissions/signpost.dm
@@ -16,19 +16,20 @@
. = ..()
if(.)
return
- if(tgui_alert(usr,question,name,list("Yes","No")) == "Yes" && Adjacent(user))
- var/turf/T = zlevels ? find_safe_turf(zlevels=zlevels) : get_safe_random_station_turf_equal_weight()
+ if(tgui_alert(usr,question,name,list("Yes","No")) != "Yes" && !Adjacent(user))
+ return
- if(T)
- var/atom/movable/AM = user.pulling
- if(AM)
- AM.forceMove(T)
- user.forceMove(T)
- if(AM)
- user.start_pulling(AM)
- to_chat(user, span_notice("You blink and find yourself in [get_area_name(T)]."))
- else
- to_chat(user, "Nothing happens. You feel that this is a bad sign.")
+ var/turf/safe_dropoff = zlevels ? find_safe_turf(zlevels) : get_safe_random_station_turf_equal_weight()
+ if(!safe_dropoff)
+ to_chat(user, "Nothing happens. You feel that this is a bad sign.")
+ return
+
+ var/atom/movable/pulled = user.pulling
+ user.forceMove(safe_dropoff)
+ if(pulled)
+ pulled.forceMove(safe_dropoff)
+ user.start_pulling(pulled)
+ to_chat(user, span_notice("You blink and find yourself in [get_area_name(safe_dropoff)]."))
/obj/structure/signpost/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
return interact(user)
diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm
index 47b96c9c9e7..fe9b0d373e7 100644
--- a/code/modules/bitrunning/components/avatar_connection.dm
+++ b/code/modules/bitrunning/components/avatar_connection.dm
@@ -70,6 +70,7 @@
avatar.fully_replace_character_name(newname = alias)
update_avatar_id()
+ avatar.mind.set_assigned_role(SSjob.get_job_type(/datum/job/bit_avatar))
for(var/skill_type in old_mind.known_skills)
avatar.mind.set_experience(skill_type, old_mind.get_skill_exp(skill_type), silent = TRUE)
diff --git a/code/modules/bitrunning/job.dm b/code/modules/bitrunning/job.dm
index d62bd2cf3ae..519f4974cbd 100644
--- a/code/modules/bitrunning/job.dm
+++ b/code/modules/bitrunning/job.dm
@@ -39,3 +39,6 @@
uniform = /obj/item/clothing/under/rank/cargo/bitrunner
belt = /obj/item/modular_computer/pda/bitrunner
ears = /obj/item/radio/headset/headset_cargo
+
+/datum/job/bit_avatar
+ title = "Bit Avatar"
diff --git a/code/modules/bitrunning/server/_parent.dm b/code/modules/bitrunning/server/_parent.dm
index 99477688876..9e0e8251d01 100644
--- a/code/modules/bitrunning/server/_parent.dm
+++ b/code/modules/bitrunning/server/_parent.dm
@@ -145,17 +145,16 @@
return ..()
-/obj/machinery/quantum_server/attackby(obj/item/weapon, mob/user, list/modifiers, list/attack_modifiers)
- . = ..()
-
- if(!istype(weapon, /obj/item/bitrunning_debug))
- return
+/obj/machinery/quantum_server/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!istype(tool, /obj/item/bitrunning_debug))
+ return NONE
+ balloon_alert(user, "*hacker voice* i'm in")
obj_flags |= EMAGGED
glitch_chance = 0.5
capacitor_coefficient = 0.1
points = 100
-
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/quantum_server/crowbar_act(mob/living/user, obj/item/crowbar)
. = NONE
diff --git a/code/modules/bitrunning/spawners.dm b/code/modules/bitrunning/spawners.dm
index 06eccfdcd60..69e6cae07a0 100644
--- a/code/modules/bitrunning/spawners.dm
+++ b/code/modules/bitrunning/spawners.dm
@@ -18,6 +18,7 @@
if(antag)
spawned_mob.mind.add_antag_datum(/datum/antagonist/domain_ghost_actor)
+ spawned_mob.mind.set_assigned_role(SSjob.get_job_type(/datum/job/bitrunning_glitch))
/// Simulates a ghost role spawn without calling special(), ie a bitrunner spawn instead of a ghost.
/obj/effect/mob_spawn/ghost_role/human/virtual_domain/proc/artificial_spawn(mob/living/runner)
diff --git a/code/modules/bitrunning/virtual_domain/domains/heretic_hunt.dm b/code/modules/bitrunning/virtual_domain/domains/heretic_hunt.dm
new file mode 100644
index 00000000000..43225d18e38
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/heretic_hunt.dm
@@ -0,0 +1,234 @@
+/datum/lazy_template/virtual_domain/heretic_hunt
+ name = "Heretical Hunt"
+ cost = BITRUNNER_COST_LOW
+ desc = "Betray your fellow man to achieve ultimate power."
+ difficulty = BITRUNNER_DIFFICULTY_LOW
+ help_text = "Heretics require sacrifice to fuel their dark rituals - bring corpses back to the ritual site! \
+ Corpses of higher ranking crew members are more valuable and may be holding useful equipment."
+ forced_outfit = /datum/outfit/virtual_domain_heretic
+ key = "heretic_hunt"
+ map_name = "heretic_hunt"
+ reward_points = BITRUNNER_REWARD_LOW
+
+/datum/lazy_template/virtual_domain/heretic_hunt/setup_domain(list/created_atoms)
+ for(var/mob/living/basic/fake_crewman/target in created_atoms)
+ RegisterSignal(target, COMSIG_LIVING_DROPPED_LOOT, PROC_REF(on_body_spawned))
+
+ for(var/mob/living/basic/heretic_summon/helper in created_atoms)
+ helper.ai_controller = new /datum/ai_controller/basic_controller/simple/simple_hostile(helper)
+ helper.ai_controller.blackboard[BB_BASIC_MOB_IDLE_WALK_CHANCE] = 0.1
+
+ var/obj/effect/heretic_rune/big/rune = locate() in created_atoms
+ rune.set_greyscale(pick(assoc_to_values(GLOB.heretic_path_to_color)))
+
+/datum/lazy_template/virtual_domain/heretic_hunt/proc/on_body_spawned(mob/living/source, list/loot, gibbed)
+ SIGNAL_HANDLER
+
+ if(gibbed)
+ return
+
+ for(var/mob/living/carbon/human/body in loot)
+ RegisterSignal(body, COMSIG_MOVABLE_MOVED, PROC_REF(check_loc))
+ // let's be safe
+ for(var/obj/item/modular_computer/pda/pda in body.get_all_gear())
+ qdel(pda)
+
+/datum/lazy_template/virtual_domain/heretic_hunt/proc/check_loc(mob/living/carbon/human/source, ...)
+ SIGNAL_HANDLER
+
+ var/obj/effect/heretic_rune/big/rune = locate() in source.loc
+ if(isnull(rune))
+ return
+
+ var/datum/job/fake_job = SSjob.get_job(source.job) || SSjob.get_job_type(/datum/job/unassigned)
+ // 10 points are needed
+ if(fake_job.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND)
+ add_points(3)
+ else if(fake_job.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY)
+ add_points(2)
+ else
+ add_points(1)
+ // cleanup
+ source.gib(ALL)
+
+ // mimic a ritual effect
+ if(locate(/obj/structure/closet/crate/secure/bitrunning/encrypted) in range(1, rune))
+ rune.balloon_alert_to_viewers("ritual completed")
+ else
+ rune.balloon_alert_to_viewers("sacrifice accepted")
+ flick("[rune.icon_state]_active", rune)
+ playsound(rune, 'sound/effects/magic/castsummon.ogg', 50, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_exponent = 10, ignore_walls = FALSE)
+
+/datum/outfit/virtual_domain_heretic
+ name = "Virtual Domain Heretic"
+
+ // this gear is just given to them in the safehouse
+ // suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch
+ // suit_store = /obj/item/melee/sickly_blade
+
+ // otherwise just thematically appropriate clothing
+ uniform = /obj/item/clothing/under/color/black
+ shoes = /obj/item/clothing/shoes/jackboots
+ neck = /obj/item/clothing/neck/heretic_focus
+ mask = /obj/item/clothing/mask/madness_mask
+
+/datum/outfit/virtual_domain_heretic/pre_equip(mob/living/carbon/human/user, visuals_only)
+ ADD_TRAIT(user, TRAIT_ACT_AS_HERETIC, INNATE_TRAIT)
+ ADD_TRAIT(user, TRAIT_NO_TELEPORT, INNATE_TRAIT)
+ user.AddElement(/datum/element/leeching_walk)
+ user.faction |= FACTION_HERETIC
+
+// All it does is stand there, only attacks if attacked (Manuel player)
+/datum/ai_controller/basic_controller/fake_crewman
+ blackboard = list(
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+ BB_TARGET_MINIMUM_STAT = HARD_CRIT,
+ BB_REINFORCEMENTS_SAY = "Help me!",
+ )
+ ai_movement = /datum/ai_movement/basic_avoidance
+ idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/escape_captivity,
+ /datum/ai_planning_subtree/call_reinforcements,
+ /datum/ai_planning_subtree/target_retaliate,
+ /datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+/datum/ai_controller/basic_controller/fake_crewman/ranged
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/escape_captivity,
+ /datum/ai_planning_subtree/call_reinforcements,
+ /datum/ai_planning_subtree/target_retaliate,
+ /datum/ai_planning_subtree/maintain_distance,
+ /datum/ai_planning_subtree/ranged_skirmish,
+ /datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+// Immediately tries to attack the player (Terry player)
+/datum/ai_controller/basic_controller/fake_crewman/instant_hostile
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/escape_captivity,
+ /datum/ai_planning_subtree/call_reinforcements,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+/datum/ai_controller/basic_controller/fake_crewman/instant_hostile/ranged
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/escape_captivity,
+ /datum/ai_planning_subtree/call_reinforcements,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/maintain_distance,
+ /datum/ai_planning_subtree/ranged_skirmish,
+ /datum/ai_planning_subtree/attack_obstacle_in_path/trooper,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+// The actual crewmate
+/mob/living/basic/fake_crewman
+ name = "crewmember"
+ desc = "How do you do, fellow crewmen?"
+ mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+ faction = list(FACTION_HOSTILE, "vdom_fake_crew")
+ icon = 'icons/mob/simple/simple_human.dmi'
+ gender = MALE
+ basic_mob_flags = DEL_ON_DEATH
+
+ ai_controller = /datum/ai_controller/basic_controller/fake_crewman
+
+ maxHealth = 60
+ health = 60
+ melee_damage_lower = 15
+ melee_damage_upper = 20
+ obj_damage = 20
+ armour_penetration = 10
+
+ attack_sound = null // autoset
+ melee_damage_type = null // autoset
+
+ var/death_spawner = /obj/effect/mob_spawn/corpse/human
+ var/obj/item/weapon = /obj/item/storage/toolbox
+
+/mob/living/basic/fake_crewman/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/ai_retaliate)
+ AddElement(/datum/element/death_drops, string_list(list(weapon, death_spawner)))
+ var/lhand = prob(50) ? weapon : null
+ var/rhand = lhand ? null : weapon
+ apply_dynamic_human_appearance(src, mob_spawn_path = death_spawner, l_hand = lhand, r_hand = rhand)
+
+ attack_sound ||= weapon::hitsound
+ melee_damage_type ||= weapon::damtype
+ sharpness = weapon::sharpness
+ wound_bonus = weapon::wound_bonus * 0.5
+ exposed_wound_bonus = weapon::exposed_wound_bonus * 0.5
+
+/mob/living/basic/fake_crewman/md
+ name = "medical doctor"
+ death_spawner = /obj/effect/mob_spawn/corpse/human/doctor
+ weapon = /obj/item/circular_saw
+
+/mob/living/basic/fake_crewman/sec
+ name = "security officer"
+ ai_controller = /datum/ai_controller/basic_controller/fake_crewman/instant_hostile
+ death_spawner = /obj/effect/mob_spawn/corpse/human/secoff
+ weapon = /obj/item/knife/combat/survival
+ damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 1, STAMINA = 1, OXY = 1)
+
+/mob/living/basic/fake_crewman/engi
+ name = "engineer"
+ death_spawner = /obj/effect/mob_spawn/corpse/human/engineer
+ weapon = /obj/item/weldingtool
+ attack_sound = 'sound/items/tools/welder.ogg'
+ melee_damage_type = BURN
+ damage_coeff = list(BRUTE = 1, BURN = 0.9, TOX = 1, STAMINA = 1, OXY = 1)
+
+/mob/living/basic/fake_crewman/engi/mod
+ death_spawner = /obj/effect/mob_spawn/corpse/human/engineer/mod
+ damage_coeff = list(BRUTE = 0.8, BURN = 0.8, TOX = 1, STAMINA = 1, OXY = 1)
+
+/mob/living/basic/fake_crewman/assistant
+ name = "assistant"
+ ai_controller = /datum/ai_controller/basic_controller/fake_crewman/instant_hostile
+ death_spawner = /obj/effect/mob_spawn/corpse/human/assistant
+ weapon = /obj/item/knife/shiv
+
+/mob/living/basic/fake_crewman/assistant/alt
+ weapon = /obj/item/storage/toolbox/mechanical
+
+/mob/living/basic/fake_crewman/boss
+ name = "senior crewmember"
+ maxHealth = 120
+ health = 120
+ melee_damage_lower = 20
+ melee_damage_upper = 25
+ armour_penetration = 30
+
+/mob/living/basic/fake_crewman/boss/cmo
+ name = "chief medical officer"
+ death_spawner = /obj/effect/mob_spawn/corpse/human/cmo
+ weapon = /obj/item/surgicaldrill
+
+/mob/living/basic/fake_crewman/boss/ce
+ name = "chief engineer"
+ ai_controller = /datum/ai_controller/basic_controller/fake_crewman/ranged
+ death_spawner = /obj/effect/mob_spawn/corpse/human/ce
+ weapon = /obj/item/gun/energy/plasmacutter/adv
+
+/mob/living/basic/fake_crewman/boss/ce/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/ranged_attacks, /obj/item/ammo_casing/energy/plasma/adv, projectile_sound = 'sound/items/weapons/plasma_cutter.ogg', cooldown_time = 1.6 SECONDS)
+
+/mob/living/basic/fake_crewman/boss/hos
+ name = "head of security"
+ ai_controller = /datum/ai_controller/basic_controller/fake_crewman/instant_hostile/ranged
+ death_spawner = /obj/effect/mob_spawn/corpse/human/hos
+ weapon = /obj/item/gun/energy/e_gun/hos
+ damage_coeff = list(BRUTE = 0.6, BURN = 0.6, TOX = 1, STAMINA = 1, OXY = 1)
+
+/mob/living/basic/fake_crewman/boss/hos/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/ranged_attacks, /obj/item/ammo_casing/energy/laser, projectile_sound = 'sound/items/weapons/laser.ogg', cooldown_time = 1.2 SECONDS)
diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm
index 76df017d5f7..c9326807cc5 100644
--- a/code/modules/cargo/markets/market_items/weapons.dm
+++ b/code/modules/cargo/markets/market_items/weapons.dm
@@ -145,7 +145,7 @@
availability_prob = 35
/datum/market_item/weapon/surplus_esword
- name = "Type I 'Iaito' Energy Sword"
+ name = "Pattern I 'Iaito' Energy Sword"
desc = "A mass-produced energy sword. It is functionally worse than a milspec energy sword commonly found amongst paramilitary organizations. \
But hey, better than nothing. Does have some power supply problems, but nothing that a bit of percussive maintenance can't fix."
item = /obj/item/melee/energy/sword/surplus
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 32d50e2db09..303a32ef976 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -277,8 +277,7 @@ GLOBAL_LIST_INIT(unrecommended_builds, list(
persistent_client = new(ckey)
persistent_client.set_client(src)
- if(byond_version >= 516)
- winset(src, null, list("browser-options" = "find,refresh,byondstorage"))
+ winset(src, null, list("browser-options" = "find,refresh"))
// Instantiate stat panel
stat_panel = new(src, "statbrowser")
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 4af712a6b3a..8c512ded551 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -202,6 +202,24 @@
greyscale_config_worn = null
greyscale_colors = null
+/obj/item/clothing/neck/robe_cape
+ name = "robe cape"
+ desc = "A comfortable cape, draped down your back and held around your neck with a brooch."
+ icon = 'icons/obj/clothing/neck.dmi'
+ icon_state = "/obj/item/clothing/neck/robe_cape"
+ post_init_icon_state = "robe_cape"
+ worn_icon = 'icons/mob/clothing/neck.dmi'
+ worn_icon_state = "robe_cape"
+ abstract_type = /obj/item/clothing/neck
+ greyscale_config = /datum/greyscale_config/robe_cape
+ greyscale_config_worn = /datum/greyscale_config/robe_cape/worn
+ greyscale_colors = "#2a2844"
+ flags_1 = IS_PLAYER_COLORABLE_1
+
+/obj/item/clothing/neck/robe_cape/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/surgery_initiator)
+
/obj/item/clothing/neck/tie/disco
name = "horrific necktie"
icon = 'icons/obj/clothing/neck.dmi'
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index d75e5407798..97eb723c77e 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -59,11 +59,11 @@
if (!istype(tool, /obj/item/extinguisher_refill))
return
- if (extinguishes_left == 5)
+ if (extinguishes_left == initial(extinguishes_left))
to_chat(user, span_notice("The inbuilt extinguisher is full."))
return ITEM_INTERACT_BLOCKING
- extinguishes_left = 5
+ extinguishes_left = initial(extinguishes_left)
to_chat(user, span_notice("You refill the suit's built-in extinguisher, using up the cartridge."))
check_fire_state()
qdel(tool)
diff --git a/code/modules/events/camerafailure.dm b/code/modules/events/camerafailure.dm
index d2fcdda8314..f6929d4768f 100644
--- a/code/modules/events/camerafailure.dm
+++ b/code/modules/events/camerafailure.dm
@@ -12,7 +12,7 @@
/datum/round_event/camera_failure/start()
var/iterations = 1
- var/list/cameras = GLOB.cameranet.cameras.Copy()
+ var/list/cameras = SScameras.cameras.Copy()
while(prob(round(100/iterations)))
var/obj/machinery/camera/C = pick_n_take(cameras)
if (!C)
diff --git a/code/modules/events/space_vines/vine_event.dm b/code/modules/events/space_vines/vine_event.dm
index 2ccd4f04489..104dd39601e 100644
--- a/code/modules/events/space_vines/vine_event.dm
+++ b/code/modules/events/space_vines/vine_event.dm
@@ -36,7 +36,7 @@
else
var/obj/structure/spacevine/vine = new()
var/list/floor_candidates = list()
- for(var/area/station/hallway/area in shuffle(GLOB.areas.Copy()))
+ for(var/area/station/hallway/area in shuffle(GLOB.areas))
for(var/turf/open/floor in area.get_turfs_from_all_zlevels())
if(isopenspaceturf(floor))
continue
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 907cf0f5908..eca4e8a7ebf 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -380,8 +380,9 @@
return
if(!hook.can_be_hooked(target_atom))
return
+ if(!create_fishing_line(target_atom, user))
+ return
currently_hooked = target_atom
- create_fishing_line(target_atom, user)
hook.hook_attached(target_atom, src)
SEND_SIGNAL(src, COMSIG_FISHING_ROD_HOOKED_ITEM, target_atom, user)
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 02722d8a154..7ef38b1a778 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -63,7 +63,7 @@
desc = "Looking at the luscious field, you suddenly feel homesick."
icon_state = "grass0"
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/grass/Initialize(mapload)
. = ..()
@@ -76,7 +76,7 @@
icon = 'icons/turf/sand.dmi'
icon_state = "sand"
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/beach/coast
gender = NEUTER
@@ -103,7 +103,7 @@
name = "asteroid sand"
desc = "The sand crunches beneath your feet, though it feels soft to the touch."
icon_state = "asteroid"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/asteroid/Initialize(mapload)
icon_state = "asteroid[rand(0, 12)]"
@@ -114,7 +114,7 @@
name = "basalt"
desc = "You still feel hot, despite the cool walls of the holodeck."
icon_state = "basalt0"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/basalt/Initialize(mapload)
. = ..()
@@ -140,7 +140,7 @@
icon = 'icons/turf/space.dmi'
icon_state = "speedspace_ns_1"
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/hyperspace/Initialize(mapload)
icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"
@@ -161,7 +161,7 @@
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_CARPET
canSmoothWith = SMOOTH_GROUP_CARPET
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/carpet/Initialize(mapload)
. = ..()
@@ -175,7 +175,7 @@
/turf/open/floor/holofloor/wood
icon_state = "wood"
desc = "Makes you feel at home."
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/snow
gender = PLURAL
@@ -186,7 +186,7 @@
slowdown = 2
bullet_sizzle = TRUE
bullet_bounce_sound = null
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/dark
icon_state = "darkfull"
@@ -195,7 +195,7 @@
/turf/open/floor/holofloor/stairs
name = "stairs"
icon_state = "stairs"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/holofloor/stairs/left
icon_state = "stairs-l"
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index bbd19a69005..25cf131e388 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -452,18 +452,25 @@
equipped.update_ID_card()
+ if(!pda_slot) //This job outfit doesn't have a PDA.
+ return
+
var/obj/item/modular_computer/pda/pda = equipped.get_item_by_slot(pda_slot)
+ if(pda && !istype(pda)) //we found something but it isn't a PDA, check if it's inside it instead.
+ pda = locate() in pda
- if(istype(pda))
- pda.imprint_id(equipped.real_name, equipped_job.title)
- pda.update_ringtone(equipped_job.job_tone)
- pda.UpdateDisplay()
+ if(!istype(pda)) //We couldn't find a PDA at all.
+ stack_trace("pda_slot was set but we couldn't find a PDA!")
+ return
- var/client/equipped_client = GLOB.directory[ckey(equipped.mind?.key)]
+ pda.imprint_id(equipped.real_name, equipped_job.title)
+ pda.update_ringtone(equipped_job.job_tone)
+ pda.UpdateDisplay()
- if(equipped_client)
- pda.update_pda_prefs(equipped_client)
+ var/client/equipped_client = GLOB.directory[ckey(equipped.mind?.key)]
+ if(equipped_client)
+ pda.update_pda_prefs(equipped_client)
/datum/outfit/job/get_chameleon_disguise_info()
var/list/types = ..()
diff --git a/code/modules/jobs/job_types/bridge_assistant.dm b/code/modules/jobs/job_types/bridge_assistant.dm
index 6cbda1e91ca..94e4af8ab42 100644
--- a/code/modules/jobs/job_types/bridge_assistant.dm
+++ b/code/modules/jobs/job_types/bridge_assistant.dm
@@ -86,6 +86,7 @@
shoes = /obj/item/clothing/shoes/laceup
l_pocket = /obj/item/gun/energy/e_gun/mini
r_pocket = /obj/item/assembly/flash/handheld
+ pda_slot = ITEM_SLOT_BACK
// Coffeemaker time!
/datum/job/bridge_assistant/New()
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
index f0e0aa8047f..3cc485b34f0 100644
--- a/code/modules/jobs/job_types/prisoner.dm
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -61,6 +61,7 @@
ears = null
shoes = /obj/item/clothing/shoes/sneakers/orange
box = /obj/item/storage/box/survival/prisoner
+ pda_slot = null
/datum/outfit/job/prisoner/pre_equip(mob/living/carbon/human/H)
..()
diff --git a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
index 3172155dc96..6bd84ce0c0f 100644
--- a/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
+++ b/code/modules/jobs/job_types/station_trait/veteran_advisor.dm
@@ -83,3 +83,4 @@
r_hand = /obj/item/cane
implants = list(/obj/item/implant/mindshield)
+ pda_slot = ITEM_SLOT_BACK
diff --git a/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm b/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm
index 5c86d246dff..eb365c914f4 100644
--- a/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm
+++ b/code/modules/library/skill_learning/generic_skillchips/acrobatics.dm
@@ -11,7 +11,7 @@
/// set integrity to 1 when mapping for !!FUN!!
max_integrity = 100
/// list of emotes whose cd is overridden by this skillchip. can be edited in mapping or ingame
- var/list/affected_emotes = list("spin", "flip")
+ var/list/affected_emotes = list("spin", "flip", "backflip")
var/datum/effect_system/spark_spread/sparks
/// you can use this without lowering integrity! let's be honest. nobody's doing that
var/allowed_usage = 5
diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm
index 21676d1741e..b671de56cfc 100644
--- a/code/modules/lighting/lighting_atom.dm
+++ b/code/modules/lighting/lighting_atom.dm
@@ -84,6 +84,8 @@
AddElement(/datum/element/light_blocking)
else
RemoveElement(/datum/element/light_blocking)
+ // Change in opacity could change camera visibility
+ SScameras.update_visibility(src)
/turf/set_opacity(new_opacity)
. = ..()
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/cursed_slot_machine.dm b/code/modules/mapfluff/ruins/objects_and_mobs/cursed_slot_machine.dm
index 16b63f37b2a..cfeeda16514 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/cursed_slot_machine.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/cursed_slot_machine.dm
@@ -80,8 +80,8 @@
COOLDOWN_START(src, spin_cooldown, cooldown_length)
if(!prob(win_prob))
- if(status_effect_on_roll && isnull(user.has_status_effect(/datum/status_effect/grouped/cursed)))
- user.apply_status_effect(/datum/status_effect/grouped/cursed)
+ if(status_effect_on_roll)
+ user.apply_status_effect(/datum/status_effect/slot_machine_curse)
SEND_SIGNAL(user, COMSIG_CURSED_SLOT_MACHINE_LOST)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index b6e659462a6..0fb7850832d 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -397,13 +397,13 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
desc = "Stylish dark wood with extra reinforcement. Secured firmly to the floor to prevent tampering."
icon_state = "wood"
footstep = FOOTSTEP_WOOD
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/indestructible/hoteltile
desc = "Smooth tile with extra reinforcement. Secured firmly to the floor to prevent tampering."
icon_state = "showroomfloor"
footstep = FOOTSTEP_FLOOR
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/space/bluespace
name = "\proper bluespace hyperzone"
diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm
index f632717000f..bdbdaf883d5 100644
--- a/code/modules/meteors/meteor_types.dm
+++ b/code/modules/meteors/meteor_types.dm
@@ -376,7 +376,7 @@
/obj/effect/meteor/emp/meteor_effect()
..()
playsound(src, 'sound/items/weapons/zapbang.ogg', 100, TRUE, -1)
- empulse(src, 3, 8)
+ empulse(src, 3, 8, emp_source = src)
//Meaty Ore
/obj/effect/meteor/meaty
diff --git a/code/modules/mining/lavaland/cain_and_abel/dagger_status_effects.dm b/code/modules/mining/lavaland/cain_and_abel/dagger_status_effects.dm
index 0f535f31951..a6cb6c04e67 100644
--- a/code/modules/mining/lavaland/cain_and_abel/dagger_status_effects.dm
+++ b/code/modules/mining/lavaland/cain_and_abel/dagger_status_effects.dm
@@ -1,8 +1,8 @@
///status effect applied to us when we're wildly swinging
/datum/status_effect/dagger_swinging
id = "dagger swinging"
- tick_interval = 0.25 SECONDS
- duration = 1.75 SECONDS
+ tick_interval = 0.2 SECONDS
+ duration = 1.6 SECONDS
alert_type = null
///base damage we apply to mobs near us
var/base_damage = 5
diff --git a/code/modules/mining/lavaland/mining_loot/megafauna/the_thing.dm b/code/modules/mining/lavaland/mining_loot/megafauna/the_thing.dm
index 19c04179d25..44172c5ed11 100644
--- a/code/modules/mining/lavaland/mining_loot/megafauna/the_thing.dm
+++ b/code/modules/mining/lavaland/mining_loot/megafauna/the_thing.dm
@@ -118,7 +118,7 @@
if(AI.controlled_equipment)
to_chat(AI, span_warning("You are already loaded into an onboard computer!"))
return
- if(!GLOB.cameranet.checkCameraVis(owner))
+ if(!SScameras.is_visible_by_cameras(owner))
to_chat(AI, span_warning("Target is no longer near active cameras."))
return
if(!isturf(AI.loc))
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 07d9469de3f..aca91e60a32 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -80,20 +80,25 @@
hands_use_check = TRUE
mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer, /mob/eye/imaginary_friend)
mob_type_ignore_stat_typecache = list(/mob/dead/observer, /mob/living/silicon/ai, /mob/eye/imaginary_friend)
+ /// The probability we fall our our arse
+ var/fall_over_prob = 60
+ /// The direction we spin in. TRUE means clockwise, FALSE means counter-clockwise.
+ var/clockwise_spin = TRUE
-// BUBBER EDIT CHANGE BEGIN - Flip Cooldown
/datum/emote/flip/run_emote(mob/user, params , type_override, intentional)
. = ..()
+ // BUBBER EDIT CHANGE BEGIN - Flip Cooldown
if(iscarbon(user))
var/mob/living/carbon/flippy_mcgee = user
flippy_mcgee.set_confusion_if_lower(FLIP_EMOTE_DURATION)
if(flippy_mcgee.get_timed_status_effect_duration(/datum/status_effect/confusion) > BEYBLADE_PUKE_THRESHOLD)
flippy_mcgee.vomit(VOMIT_CATEGORY_KNOCKDOWN, lost_nutrition = BEYBLADE_PUKE_NUTRIENT_LOSS, distance = 0)
return
+ // BUBBER EDIT CHANGE END - Flip Cooldown
- user.SpinAnimation(FLIP_EMOTE_DURATION, 1)
+ user.SpinAnimation(FLIP_EMOTE_DURATION, 1, clockwise = clockwise_spin)
-/*
+/* BUBBER EDIT CHANGE BEGIN - Flip Cooldown
/datum/emote/flip/check_cooldown(mob/user, intentional)
. = ..()
if(.)
@@ -102,13 +107,13 @@
return
if(isliving(user))
var/mob/living/flippy_mcgee = user
- if(prob(20))
+ if(prob(fall_over_prob))
flippy_mcgee.Knockdown(1 SECONDS)
flippy_mcgee.visible_message(
span_notice("[flippy_mcgee] attempts to do a flip and falls over, what a doofus!"),
span_notice("You attempt to do a flip while still off balance from the last flip and fall down!")
)
- if(prob(50))
+ if(prob(fall_over_prob/2))
flippy_mcgee.adjustBruteLoss(1)
else
flippy_mcgee.visible_message(
@@ -116,30 +121,37 @@
span_notice("You stumble a bit from still being off balance from your last flip.")
)
*/
-/datum/emote/flip/check_cooldown(mob/living/carbon/user, intentional)
+/datum/emote/flip/check_cooldown(mob/user, intentional)
. = ..()
if(.)
return
if(!can_run_emote(user, intentional=intentional))
return
- if(!iscarbon(user))
+ if(!isliving(user))
return
-
var/mob/living/flippy_mcgee = user
var/sickness = flippy_mcgee.get_timed_status_effect_duration(/datum/status_effect/confusion)
- if(sickness && !(HAS_TRAIT(flippy_mcgee, TRAIT_FREERUNNING)))
- if(prob(20))
- flippy_mcgee.Knockdown(1.5 SECONDS)
- flippy_mcgee.visible_message(
- span_notice("[flippy_mcgee] attempts to do a flip and falls over, what a doofus!"),
- span_notice("You attempt to do a flip while still off balance from the last flip and fall down!")
- )
- user.set_dizzy_if_lower(BEYBLADE_DIZZINESS_DURATION)
- user.adjust_confusion_up_to(BEYBLADE_CONFUSION_INCREMENT, BEYBLADE_CONFUSION_LIMIT)
- if(sickness > (BEYBLADE_PUKE_THRESHOLD * 0.5))
- to_chat(user, span_warning("You feel woozy from flipping."))
+ if(!sickness || HAS_TRAIT(flippy_mcgee, TRAIT_FREERUNNING))
+ return
+ if(prob(20))
+ flippy_mcgee.Knockdown(1.5 SECONDS)
+ flippy_mcgee.visible_message(
+ span_notice("[flippy_mcgee] attempts to do a flip and falls over, what a doofus!"),
+ span_notice("You attempt to do a flip while still off balance from the last flip and fall down!")
+ )
+ flippy_mcgee.set_dizzy_if_lower(BEYBLADE_DIZZINESS_DURATION)
+ flippy_mcgee.adjust_confusion_up_to(BEYBLADE_CONFUSION_INCREMENT, BEYBLADE_CONFUSION_LIMIT)
+ if(sickness > (BEYBLADE_PUKE_THRESHOLD * 0.5))
+ to_chat(user, span_warning("You feel woozy from flipping."))
// BUBBER EDIT CHANGE END
+
+/datum/emote/flip/backflip
+ key = "backflip"
+ key_third_person = "backflips"
+ fall_over_prob = 20
+ clockwise_spin = FALSE
+
/datum/emote/spin
key = "spin"
key_third_person = "spins"
diff --git a/code/modules/mob/eye/camera/camera.dm b/code/modules/mob/eye/camera/camera.dm
index 58019f73859..8df02a444b2 100644
--- a/code/modules/mob/eye/camera/camera.dm
+++ b/code/modules/mob/eye/camera/camera.dm
@@ -71,7 +71,7 @@
SHOULD_CALL_PARENT(TRUE)
if(use_visibility)
- GLOB.cameranet.visibility(src)
+ SScameras.update_eye_chunk(src)
/mob/eye/camera/zMove(dir, turf/target, z_move_flags = NONE, recursions_left = 1, list/falling_movs)
. = ..()
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 58ecef8863d..5311dd06de7 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -131,8 +131,8 @@ GLOBAL_LIST_INIT(command_strings, list(
//Adds bot to the diagnostic HUD system
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
diag_hud_set_bothealth()
diag_hud_set_botstat()
diag_hud_set_botmode()
diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm
index d595dc5196b..d0825c53722 100644
--- a/code/modules/mob/living/basic/drone/_drone.dm
+++ b/code/modules/mob/living/basic/drone/_drone.dm
@@ -134,8 +134,8 @@
shy_update()
alert_drones(DRONE_NET_CONNECT)
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
add_traits(list(
TRAIT_VENTCRAWLER_ALWAYS,
diff --git a/code/modules/mob/living/basic/drone/drone_say.dm b/code/modules/mob/living/basic/drone/drone_say.dm
index 3a006d8d1b2..ce33b2ca883 100644
--- a/code/modules/mob/living/basic/drone/drone_say.dm
+++ b/code/modules/mob/living/basic/drone/drone_say.dm
@@ -48,4 +48,4 @@
/mob/living/basic/drone/proc/drone_chat(message, list/spans = list(), list/message_mods = list())
log_sayverb_talk(message, message_mods, tag = "drone chat")
var/message_part = generate_messagepart(message, spans, message_mods)
- alert_drones("
Drone Chat: [span_name("[name]")] [message_part]", TRUE)
+ alert_drones(span_drone("Drone Chat: [span_name("[name]")] [span_message(message_part)]"), TRUE)
diff --git a/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm b/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm
index 52fedbe9c05..a654e0c29d0 100644
--- a/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm
+++ b/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm
@@ -44,7 +44,7 @@
target_key = BB_DEER_GRASS_TARGET
finding_behavior = /datum/ai_behavior/find_and_set/in_list/turf_types
hunting_behavior = /datum/ai_behavior/hunt_target/eat_grass
- hunt_targets = list(/turf/open/floor/grass)
+ hunt_targets = list(/turf/open/floor/grass, /turf/open/misc/grass)
hunt_range = 7
hunt_chance = 45
diff --git a/code/modules/mob/living/basic/farm_animals/goose/goose.dm b/code/modules/mob/living/basic/farm_animals/goose/goose.dm
index 0a34400f161..aa25ca7e9d7 100644
--- a/code/modules/mob/living/basic/farm_animals/goose/goose.dm
+++ b/code/modules/mob/living/basic/farm_animals/goose/goose.dm
@@ -57,7 +57,7 @@
SIGNAL_HANDLER
if (ai_controller?.blackboard[BB_GOOSE_PANICKED])
return COMSIG_MOB_CANCEL_EAT
- if (potential_food.has_material_type(/datum/material/plastic) || IsEdible(potential_food))
+ if (potential_food.has_material_type(/datum/material/plastic) || IS_EDIBLE(potential_food))
return NONE// Geese only eat FOOD or PLASTIC
return COMSIG_MOB_CANCEL_EAT
diff --git a/code/modules/mob/living/basic/farm_animals/goose/goose_ai.dm b/code/modules/mob/living/basic/farm_animals/goose/goose_ai.dm
index d161145d06b..0ed86b50f7b 100644
--- a/code/modules/mob/living/basic/farm_animals/goose/goose_ai.dm
+++ b/code/modules/mob/living/basic/farm_animals/goose/goose_ai.dm
@@ -62,7 +62,7 @@
var/list/filtered = list()
for (var/obj/item/thing as anything in found)
- if (IsEdible(thing) || thing.has_material_type(/datum/material/plastic))
+ if (IS_EDIBLE(thing) || thing.has_material_type(/datum/material/plastic))
filtered += thing
if(length(filtered))
diff --git a/code/modules/mob/living/basic/farm_animals/goose/goose_vomit.dm b/code/modules/mob/living/basic/farm_animals/goose/goose_vomit.dm
index 2b347903e22..2d3f2b6df20 100644
--- a/code/modules/mob/living/basic/farm_animals/goose/goose_vomit.dm
+++ b/code/modules/mob/living/basic/farm_animals/goose/goose_vomit.dm
@@ -124,7 +124,7 @@
/// Stop fucking around and get the rest of it out
/datum/status_effect/goose_vomit/proc/vomit_finale()
- tick_interval = 0.1 SECONDS
+ tick_interval = 0.2 SECONDS
owner.set_jitter_if_lower(1 SECONDS)
hurl_item(vomit_strongly = TRUE)
@@ -176,7 +176,7 @@
/datum/status_effect/goose_choking/on_remove()
UnregisterSignal(owner, COMSIG_LIVING_DEATH)
- if (duration >= world.time)
+ if (duration > 0)
return // Saved by something, although probably by dying early
owner.death_message = "lets out one final oxygen-deprived honk before [owner.p_they()] go[owner.p_es()] limp and lifeless.."
owner.death()
diff --git a/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm b/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm
index 34205124db6..5e5d98afb10 100644
--- a/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm
+++ b/code/modules/mob/living/basic/space_fauna/changeling/flesh_spider.dm
@@ -16,7 +16,7 @@
response_help_simple = "pet"
response_disarm_continuous = "gently pushes aside"
response_disarm_simple = "gently push aside"
- damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1)
+ damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 4, STAMINA = 1, OXY = 1)
basic_mob_flags = FLAMMABLE_MOB
status_flags = NONE
speed = -0.1
diff --git a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
index 5ef69e41242..42e6e831dd5 100644
--- a/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
+++ b/code/modules/mob/living/basic/space_fauna/regal_rat/regal_rat.dm
@@ -197,7 +197,7 @@
return TRUE // it might be possible to attack this? we'll find out soon enough
var/mob/living/living_target = the_target
- if (HAS_TRAIT(living_target, TRAIT_FAKEDEATH) || living_target.stat == DEAD)
+ if(HAS_TRAIT_NOT_FROM(living_target, TRAIT_FAKEDEATH, SPECIES_TRAIT) || living_target.stat == DEAD)
balloon_alert(src, "already dead!")
return FALSE
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider.dm b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
index ace8d97bbfb..2e7c5db5276 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spider.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spider.dm
@@ -14,7 +14,7 @@
response_disarm_simple = "gently push aside"
initial_language_holder = /datum/language_holder/spider
melee_attack_cooldown = CLICK_CD_MELEE
- damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1)
+ damage_coeff = list(BRUTE = 1, BURN = 1.25, TOX = 3, STAMINA = 1, OXY = 1)
basic_mob_flags = FLAMMABLE_MOB
status_flags = NONE
unsuitable_cold_damage = 4
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index a80a4f90574..37d3780b7e4 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -198,38 +198,12 @@
if(reagents.has_reagent(/datum/reagent/teslium, needs_metabolizing = TRUE))
. += span_smallnoticeital("[t_He] [t_is] emitting a gentle blue glow!") // this should be signalized
+ var/mob/living/living_user = user
+ SEND_SIGNAL(living_user, COMSIG_CARBON_MID_EXAMINE, src, .) // Adds examine text after clothing and wounds but before death and scars
if(just_sleeping)
. += span_notice("[t_He] [t_is]n't responding to anything around [t_him] and seem[p_s()] to be asleep.")
-
else if(!appears_dead)
- var/mob/living/living_user = user
if(src != user)
- if(HAS_TRAIT(user, TRAIT_EMPATH))
- if (combat_mode)
- . += "[t_He] seem[p_s()] to be on guard."
- if (getOxyLoss() >= 10)
- . += "[t_He] seem[p_s()] winded."
- if (getToxLoss() >= 10)
- . += "[t_He] seem[p_s()] sickly."
- if(mob_mood.sanity <= SANITY_DISTURBED)
- . += "[t_He] seem[p_s()] distressed."
- living_user.add_mood_event("empath", /datum/mood_event/sad_empath, src)
- if(is_blind())
- . += "[t_He] appear[p_s()] to be staring off into space."
- if (HAS_TRAIT(src, TRAIT_DEAF))
- . += "[t_He] appear[p_s()] to not be responding to noises."
- if (bodytemperature > dna.species.bodytemp_heat_damage_limit)
- . += "[t_He] [t_is] flushed and wheezing."
- if (bodytemperature < dna.species.bodytemp_cold_damage_limit)
- . += "[t_He] [t_is] shivering."
- if(HAS_TRAIT(src, TRAIT_EVIL))
- . += "[t_His] eyes radiate with a unfeeling, cold detachment. There is nothing but darkness within [t_his] soul."
- if(living_user.mind?.holy_role >= HOLY_ROLE_PRIEST)
- . += span_warning("PERFECT FOR SMITING!!")
- else
- living_user.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil)
- living_user.set_jitter_if_lower(15 SECONDS)
-
if(HAS_TRAIT(user, TRAIT_SPIRITUAL) && mind?.holy_role && user != src)
. += "[t_He] [t_has] a holy aura about [t_him]."
living_user.add_mood_event("religious_comfort", /datum/mood_event/religiously_comforted)
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index 0f8fc16e68b..50b7e04263e 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -55,6 +55,8 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
if(!isitem(checking)) //What the fuck are you on
to_nuke += checking
continue
+ if(checking.item_flags & DO_NOT_WARDROBE) // Skip any items like MOD parts, which are created in the contents of a stashed item and should not be destroyed
+ continue
var/list/contents = checking.contents
if(length(contents))
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 2682492f4bb..9280fe843a9 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -732,3 +732,10 @@
if (HAS_TRAIT(src, TRAIT_IGNORE_FIRE_PROTECTION))
no_protection = TRUE
fire_handler.harm_human(seconds_per_tick, no_protection)
+
+/mob/living/carbon/human/expose_reagents(list/reagents, datum/reagents/source, methods, volume_modifier, show_message)
+ if(external || internal)
+ methods &= ~INHALE
+ if(methods == NONE)
+ return
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 218be39b41a..7fbc95d62ec 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -40,10 +40,12 @@
else
RegisterSignal(new_vampire, COMSIG_MOB_HUD_CREATED, PROC_REF(on_hud_created))
-/datum/species/human/vampire/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load)
+/datum/species/human/vampire/on_species_loss(mob/living/carbon/human/old_vampire, datum/species/new_species, pref_load)
. = ..()
- UnregisterSignal(C, COMSIG_ATOM_ATTACKBY)
- QDEL_NULL(blood_display)
+ UnregisterSignal(old_vampire, COMSIG_ATOM_ATTACKBY)
+ if(blood_display)
+ old_vampire.hud_used.infodisplay -= blood_display
+ QDEL_NULL(blood_display)
/datum/species/human/vampire/spec_life(mob/living/carbon/human/vampire, seconds_per_tick, times_fired)
. = ..()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 393cd6c8097..35f59e89a39 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -8,8 +8,8 @@
set_name()
var/datum/atom_hud/data/human/medical/advanced/medhud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medhud.add_atom_to_hud(src)
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
faction += "[REF(src)]"
GLOB.mob_living_list += src
SSpoints_of_interest.make_point_of_interest(src)
@@ -1404,7 +1404,7 @@
if(onSyndieBase() && !(ROLE_SYNDICATE in user?.faction))
return FALSE
// Now, are they viewable by a camera? (This is last because it's the most intensive check)
- if(!GLOB.cameranet.checkCameraVis(src))
+ if(!SScameras.is_visible_by_cameras(src))
return FALSE
return TRUE
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index fe35e64de71..6763323cd07 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
if(isliving(speaker))
var/mob/living/living_speaker = speaker
var/mouth_hidden = living_speaker.is_mouth_covered() || HAS_TRAIT(living_speaker, TRAIT_FACE_COVERED)
- if(!HAS_TRAIT(src, TRAIT_EMPATH) && mouth_hidden) // Can't see them speak if their mouth is covered or hidden, unless we're an empath
+ if(mouth_hidden && !HAS_TRAIT(src, TRAIT_SEE_MASK_WHISPER)) // Can't see them speak if their mouth is covered or hidden, unless we're an empath
return FALSE
deaf_message = "[span_name("[speaker]")] [speaker.verb_whisper] something, but you are too far away to hear [speaker.p_them()]."
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 78a52163e5d..edb6bd530ae 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -310,7 +310,7 @@
return ISINRANGE(target_turf.x, ai_turf.x - interaction_range, ai_turf.x + interaction_range) \
&& ISINRANGE(target_turf.y, ai_turf.y - interaction_range, ai_turf.y + interaction_range)
else
- return GLOB.cameranet.checkTurfVis(target_turf)
+ return SScameras.is_visible_by_cameras(target_turf)
/mob/living/silicon/ai/cancel_camera()
view_core()
@@ -432,7 +432,7 @@
return
if (href_list["switchcamera"])
- switchCamera(locate(href_list["switchcamera"]) in GLOB.cameranet.cameras)
+ switchCamera(locate(href_list["switchcamera"]) in SScameras.cameras)
if (href_list["showalerts"])
alert_control.ui_interact(src)
#ifdef AI_VOX
@@ -476,7 +476,7 @@
if(controlled_equipment)
to_chat(src, span_warning("You are already loaded into an onboard computer!"))
return
- if(!GLOB.cameranet.checkCameraVis(M))
+ if(!SScameras.is_visible_by_cameras(M))
to_chat(src, span_warning("Exosuit is no longer near active cameras."))
return
if(!isturf(loc))
@@ -521,7 +521,7 @@
//The target must be in view of a camera or near the core.
if(turf_check in range(get_turf(src)))
call_bot(turf_check)
- else if(GLOB.cameranet && GLOB.cameranet.checkTurfVis(turf_check))
+ else if(SScameras.is_visible_by_cameras(turf_check))
call_bot(turf_check)
else
to_chat(src, span_danger("Selected location is not visible."))
@@ -579,7 +579,7 @@
var/mob/living/silicon/ai/U = usr
- for (var/obj/machinery/camera/C in GLOB.cameranet.cameras)
+ for (var/obj/machinery/camera/C in SScameras.cameras)
var/turf/camera_turf = get_turf(C) //get camera's turf in case it's built into something so we don't get z=0
var/list/tempnetwork = C.network
@@ -601,7 +601,7 @@
if(isnull(network))
network = old_network // If nothing is selected
else
- for(var/obj/machinery/camera/C in GLOB.cameranet.cameras)
+ for(var/obj/machinery/camera/C in SScameras.cameras)
if(!C.can_use())
continue
if(network in C.network)
@@ -807,7 +807,7 @@
if(isturf(loc)) //AI in core, check if on cameras
//get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera
//apc_override is needed here because AIs use their own APC when depowered
- return ((GLOB.cameranet && GLOB.cameranet.checkTurfVis(get_turf_pixel(A))) || (A == apc_override))
+ return (SScameras.is_visible_by_cameras(get_turf_pixel(A)) || (A == apc_override))
//AI is carded/shunted
//view(src) returns nothing for carded/shunted AIs and they have X-ray vision so just use get_dist
var/list/viewscale = getviewsize(client.view)
@@ -1046,7 +1046,7 @@
. = ..()
/mob/living/silicon/ai/proc/camera_visibility(mob/eye/camera/ai/moved_eye)
- GLOB.cameranet.visibility(moved_eye)
+ SScameras.update_eye_chunk(moved_eye)
/mob/living/silicon/ai/forceMove(atom/destination)
. = ..()
@@ -1080,7 +1080,7 @@
REMOVE_TRAIT(src, TRAIT_INCAPACITATED, POWER_LACK_TRAIT)
/mob/living/silicon/ai/proc/show_camera_list()
- var/list/cameras = GLOB.cameranet.get_available_camera_by_tag_list(network)
+ var/list/cameras = SScameras.get_available_camera_by_tag_list(network)
var/camera_tag = tgui_input_list(src, "Choose which camera you want to view", "Cameras", cameras)
if(isnull(camera_tag))
return
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
deleted file mode 100644
index 5e534297d77..00000000000
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ /dev/null
@@ -1,253 +0,0 @@
-// CAMERA NET
-//
-// The datum containing all the chunks.
-
-GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
-
-/datum/cameranet
- /// Name to show for VV and stat()
- var/name = "Camera Net"
-
- /// The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm in Initialize() and Destroy().
- var/list/obj/machinery/camera/cameras = list()
- /// The chunks of the map, mapping the areas that the cameras can see.
- var/list/chunks = list()
-
- /// List of images cloned by all chunk static images put onto turfs cameras cant see
- /// Indexed by the plane offset to use
- var/list/image/obscured_images
-
-/datum/cameranet/New()
- obscured_images = list()
- update_offsets(SSmapping.max_plane_offset)
- RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(on_offset_growth))
-
-/datum/cameranet/proc/update_offsets(new_offset)
- for(var/i in length(obscured_images) to new_offset)
- var/image/obscured = new('icons/effects/cameravis.dmi')
- SET_PLANE_W_SCALAR(obscured, CAMERA_STATIC_PLANE, i)
- obscured.appearance_flags = RESET_TRANSFORM | RESET_ALPHA | RESET_COLOR | KEEP_APART
- obscured.override = TRUE
- obscured_images += obscured
-
-/datum/cameranet/proc/on_offset_growth(datum/source, old_offset, new_offset)
- SIGNAL_HANDLER
- update_offsets(new_offset)
-
-/// Checks if a chunk has been Generated in x, y, z.
-/datum/cameranet/proc/chunkGenerated(x, y, z)
- x = GET_CHUNK_COORD(x)
- y = GET_CHUNK_COORD(y)
- if(GET_LOWEST_STACK_OFFSET(z) != 0)
- var/turf/lowest = get_lowest_turf(locate(x, y, z))
- return chunks["[x],[y],[lowest.z]"]
-
- return chunks["[x],[y],[z]"]
-
-// Returns the chunk in the x, y, z.
-// If there is no chunk, it creates a new chunk and returns that.
-/datum/cameranet/proc/getCameraChunk(x, y, z)
- x = GET_CHUNK_COORD(x)
- y = GET_CHUNK_COORD(y)
- var/turf/lowest = get_lowest_turf(locate(x, y, z))
- var/key = "[x],[y],[lowest.z]"
- . = chunks[key]
- if(!.)
- chunks[key] = . = new /datum/camerachunk(x, y, lowest.z)
-
-/// Updates what the camera eye can see. It is recommended you use this when a camera eye moves or its location is set.
-/datum/cameranet/proc/visibility(list/moved_eyes)
- if(!islist(moved_eyes))
- moved_eyes = moved_eyes ? list(moved_eyes) : list()
-
- for(var/mob/eye/camera/eye as anything in moved_eyes)
- var/list/visibleChunks = list()
- //Get the eye's turf in case its located in an object like a mecha
- var/turf/eye_turf = get_turf(eye)
- if(eye.loc)
- var/static_range = eye.static_visibility_range
- var/x1 = max(1, eye_turf.x - static_range)
- var/y1 = max(1, eye_turf.y - static_range)
- var/x2 = min(world.maxx, eye_turf.x + static_range)
- var/y2 = min(world.maxy, eye_turf.y + static_range)
-
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- visibleChunks |= getCameraChunk(x, y, eye_turf.z)
-
- var/list/remove = eye.visibleCameraChunks - visibleChunks
- var/list/add = visibleChunks - eye.visibleCameraChunks
-
- for(var/datum/camerachunk/chunk as anything in remove)
- chunk.remove(eye)
-
- for(var/datum/camerachunk/chunk as anything in add)
- chunk.add(eye)
-
-/// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open.
-/datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1)
- if(!SSticker || (opacity_check && !A.opacity))
- return
- majorChunkChange(A, 2)
-
-/datum/cameranet/proc/updateChunk(x, y, z)
- var/datum/camerachunk/chunk = chunkGenerated(x, y, z)
- if (!chunk)
- return
- chunk.hasChanged()
-
-/// Removes a camera from a chunk.
-/datum/cameranet/proc/removeCamera(obj/machinery/camera/c)
- majorChunkChange(c, 0)
-
-/// Add a camera to a chunk.
-/datum/cameranet/proc/addCamera(obj/machinery/camera/c)
- if(c.can_use())
- majorChunkChange(c, 1)
-
-/**
- * Used for Cyborg/mecha cameras. Since portable cameras can be in ANY chunk.
- * update_delay_buffer is passed all the way to hasChanged() from their camera updates on movement
- * to change the time between static updates.
-*/
-/datum/cameranet/proc/updatePortableCamera(obj/machinery/camera/updating_camera, update_delay_buffer)
- if(updating_camera.can_use())
- majorChunkChange(updating_camera, 1, update_delay_buffer)
-
-/**
- * Never access this proc directly!!!!
- * This will update the chunk and all the surrounding chunks.
- * It will also add the atom to the cameras list if you set the choice to 1.
- * Setting the choice to 0 will remove the camera from the chunks.
- * If you want to update the chunks around an object, without adding/removing a camera, use choice 2.
- * update_delay_buffer is passed all the way to hasChanged() from portable camera updates on movement
- * to change the time between static updates.
- */
-/datum/cameranet/proc/majorChunkChange(atom/c, choice, update_delay_buffer)
- PROTECTED_PROC(TRUE)
-
- if(QDELETED(c) && choice == 1)
- CRASH("Tried to add a qdeleting camera to the net")
-
- var/turf/T = get_turf(c)
- if(T)
- var/x1 = max(1, T.x - (CHUNK_SIZE / 2))
- var/y1 = max(1, T.y - (CHUNK_SIZE / 2))
- var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2))
- var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2))
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- var/datum/camerachunk/chunk = chunkGenerated(x, y, T.z)
- if(chunk)
- if(choice == 0)
- // Remove the camera.
- chunk.cameras["[T.z]"] -= c
- else if(choice == 1)
- // You can't have the same camera in the list twice.
- chunk.cameras["[T.z]"] |= c
- chunk.hasChanged(update_delay_buffer = update_delay_buffer)
-
-/// A faster, turf only version of [/datum/cameranet/proc/majorChunkChange]
-/// For use in sensitive code, be careful with it
-/datum/cameranet/proc/bareMajorChunkChange(turf/changed)
- var/x1 = max(1, changed.x - (CHUNK_SIZE / 2))
- var/y1 = max(1, changed.y - (CHUNK_SIZE / 2))
- var/x2 = min(world.maxx, changed.x + (CHUNK_SIZE / 2))
- var/y2 = min(world.maxy, changed.y + (CHUNK_SIZE / 2))
- for(var/x = x1; x <= x2; x += CHUNK_SIZE)
- for(var/y = y1; y <= y2; y += CHUNK_SIZE)
- var/datum/camerachunk/chunk = chunkGenerated(x, y, changed.z)
- chunk?.hasChanged()
-
-/// Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0.
-/datum/cameranet/proc/checkCameraVis(mob/living/target)
- var/turf/position = get_turf(target)
- if(!position)
- return
- return checkTurfVis(position)
-
-/datum/cameranet/proc/checkTurfVis(turf/position)
- var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z)
- if(chunk)
- if(chunk.changed)
- chunk.hasChanged(1) // Update now, no matter if it's visible or not.
- if(chunk.visibleTurfs[position])
- return TRUE
- return FALSE
-
-/datum/cameranet/proc/getTurfVis(turf/position)
- RETURN_TYPE(/datum/camerachunk)
- var/datum/camerachunk/chunk = getCameraChunk(position.x, position.y, position.z)
- if(!chunk)
- return FALSE
- if(chunk.changed)
- chunk.hasChanged(1) // Update now, no matter if it's visible or not.
- if(chunk.visibleTurfs[position])
- return chunk
-
-/// Returns list of available cameras, ready to use for UIs displaying list of them
-/// The format is: list("name" = "camera.c_tag", ref = REF(camera))
-/datum/cameranet/proc/get_available_cameras_data(list/networks_available, list/z_levels_available)
- var/list/available_cameras_data = list()
- for(var/obj/machinery/camera/camera as anything in get_filtered_and_sorted_cameras(networks_available, z_levels_available))
- available_cameras_data += list(list(
- name = camera.c_tag,
- ref = REF(camera),
- ))
-
- return available_cameras_data
-
-/**
- * get_available_camera_by_tag_list
- *
- * Builds a list of all available cameras that can be seen to networks_available and in z_levels_available.
- * Entries are stored in `c_tag[camera.can_use() ? null : " (Deactivated)"]` => `camera` format
- * Args:
- * networks_available - List of networks that we use to see which cameras are visible to it.
- * z_levels_available - List of z levels to filter camera by. If empty, all z levels are considered valid.
- * sort_by_ctag - If the resulting list should be sorted by `c_tag`.
- */
-/datum/cameranet/proc/get_available_camera_by_tag_list(list/networks_available, list/z_levels_available)
- var/list/available_cameras_by_tag = list()
- for(var/obj/machinery/camera/camera as anything in get_filtered_and_sorted_cameras(networks_available, z_levels_available))
- available_cameras_by_tag["[camera.c_tag][camera.can_use() ? null : " (Deactivated)"]"] = camera
-
- return available_cameras_by_tag
-
-/// Returns list of all cameras that passed `is_camera_available` filter and sorted by `cmp_camera_ctag_asc`
-/datum/cameranet/proc/get_filtered_and_sorted_cameras(list/networks_available, list/z_levels_available)
- PRIVATE_PROC(TRUE)
-
- var/list/filtered_cameras = list()
- for(var/obj/machinery/camera/camera as anything in cameras)
- if(!is_camera_available(camera, networks_available, z_levels_available))
- continue
-
- filtered_cameras += camera
-
- return sortTim(filtered_cameras, GLOBAL_PROC_REF(cmp_camera_ctag_asc))
-
-/// Checks if the `camera_to_check` meets the requirements of availability.
-/datum/cameranet/proc/is_camera_available(obj/machinery/camera/camera_to_check, list/networks_available, list/z_levels_available)
- PRIVATE_PROC(TRUE)
-
- if(!camera_to_check.c_tag)
- return FALSE
-
- if(length(z_levels_available) && !(camera_to_check.z in z_levels_available))
- return FALSE
-
- return length(camera_to_check.network & networks_available) > 0
-
-/obj/effect/overlay/camera_static
- name = "static"
- icon = null
- icon_state = null
- anchored = TRUE // should only appear in vis_contents, but to be safe
- appearance_flags = RESET_TRANSFORM | TILE_BOUND | LONG_GLIDE
- // this combination makes the static block clicks to everything below it,
- // without appearing in the right-click menu for non-AI clients
- mouse_opacity = MOUSE_OPACITY_ICON
- invisibility = INVISIBILITY_ABSTRACT
-
- plane = CAMERA_STATIC_PLANE
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index a2dcee69cd1..23098ab15e9 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -1,5 +1,3 @@
-#define UPDATE_BUFFER_TIME (2.5 SECONDS)
-
/**
* A 16x16 grid of the map with a list of turfs that can be seen, are visible and are dimmed. \
* Allows Camera Eyes to stream these chunks and know what it can and cannot see.
@@ -12,7 +10,7 @@
var/list/visibleTurfs = list()
///cameras that can see into our grid
///indexed by the z level of the camera
- var/list/cameras = list()
+ var/alist/cameras = alist()
///list of all turfs, associative with that turf's static image
///turf -> /image
var/list/turfs = list()
@@ -21,18 +19,19 @@
///images currently in use on obscured turfs.
var/list/active_static_images = list()
- var/changed = FALSE
var/x = 0
var/y = 0
var/lower_z
var/upper_z
-/// Add a camera eye to the chunk, then update if changed.
+ /// List of atoms that caused the chunk to update - assoc atom ref() to opacity on queue
+ var/list/update_sources = list()
+
+/// Add a camera eye to the chunk, updating the chunk if necessary.
/datum/camerachunk/proc/add(mob/eye/camera/eye)
eye.visibleCameraChunks += src
seenby += eye
- if(changed)
- update()
+ force_update()
var/client/client = eye.GetViewerClient()
if(client && eye.use_visibility)
@@ -47,36 +46,74 @@
if(client && eye.use_visibility && seenby.len == 0)
client.images -= active_static_images
-/// Called when a chunk has changed. I.E: A wall was deleted.
-/datum/camerachunk/proc/visibilityChanged(turf/loc)
- if(!visibleTurfs[loc])
+/**
+ * Queues the chuck to be updated after a delay.
+ *
+ * * update_source - the atom that caused the update
+ * * update_delay_buffer - the delay before the update is performed. Defaults to 0 (instant).
+ */
+/datum/camerachunk/proc/queue_update(atom/update_source, update_delay_buffer = 0)
+ // This chunk is being actively observed, skip queuing
+ if(length(seenby))
+ addtimer(CALLBACK(src, PROC_REF(update)), update_delay_buffer || 1, TIMER_UNIQUE)
return
- hasChanged()
+
+ // Only start queue if this is the first thing to queue an update
+ var/start_queue = !length(update_sources)
+
+ var/update_key = REF(update_source)
+ // Camera updates will never be second guessed.
+ // Track the number of times the camera has queued an update instead of opacity (just for fun)
+ if(istype(update_source, /obj/machinery/camera))
+ update_sources[update_source] += 1
+
+ // Otherwise track this atom's opacity at time of queue
+ else if(isnull(update_sources[update_key]))
+ update_sources[update_key] = update_source.opacity
+
+ // If the tracked opacity does not match current opacity,
+ // that implies that the atom changed opacity twice in the time before the update happened
+ // So we can safely remove this atom as a "source of update"
+ else if(update_sources[update_key] != update_source.opacity)
+ update_sources -= update_key
+ return
+
+ if(!start_queue)
+ return
+
+ if(update_delay_buffer <= 0)
+ _queue_update()
+ else
+ addtimer(CALLBACK(src, PROC_REF(_queue_update)), update_delay_buffer, TIMER_UNIQUE)
+
+/datum/camerachunk/proc/_queue_update()
+ PRIVATE_PROC(TRUE)
+ // Something forced an update during the delay
+ if(!length(update_sources))
+ return
+ SScameras.chunks_to_update[src] += 1
/**
- * Updates the chunk, makes sure that it doesn't update too much. If the chunk isn't being watched it will
- * instead be flagged to update the next time an AI Eye moves near it.
+ * Forces the chunk to update immediately
*
- * update_delay_buffer is used for cameras that are moving around, which are cyborg inbuilt cameras and
- * mecha onboard cameras. This buffer should be usually lower than UPDATE_BUFFER_TIME because
- * otherwise a moving camera can run out of its own view before updating static.
+ * * only_if_necessary - if TRUE, will not update the chunk unless it's been marked to update.
*/
-/datum/camerachunk/proc/hasChanged(update_now = 0, update_delay_buffer = UPDATE_BUFFER_TIME)
- if(seenby.len || update_now)
- addtimer(CALLBACK(src, PROC_REF(update)), update_delay_buffer, TIMER_UNIQUE)
- else
- changed = TRUE
+/datum/camerachunk/proc/force_update(only_if_necessary = TRUE)
+ if(only_if_necessary && !length(update_sources))
+ return
+ update()
/// The actual updating. It gathers the visible turfs from cameras and puts them into the appropiate lists.
-/// Accepts an optional partial_update argument, that blocks any calls out to chunks that could affect us, like above or below
-/datum/camerachunk/proc/update(partial_update = FALSE)
- if(GLOB.block_camera_updates)
+/datum/camerachunk/proc/update()
+ if(SScameras.disable_camera_updates)
return
+ update_sources.Cut()
+
var/list/updated_visible_turfs = list()
for(var/z_level in lower_z to upper_z)
- for(var/obj/machinery/camera/current_camera as anything in cameras["[z_level]"])
+ for(var/obj/machinery/camera/current_camera as anything in cameras[z_level])
if(!current_camera || !current_camera.can_use())
continue
@@ -84,9 +121,8 @@
if(get_dist(point, current_camera) > CHUNK_SIZE + (CHUNK_SIZE / 2))
continue
- for(var/turf/vis_turf in current_camera.can_see())
- if(turfs[vis_turf])
- updated_visible_turfs[vis_turf] = vis_turf
+ for(var/turf/vis_turf as anything in turfs & current_camera.can_see())
+ updated_visible_turfs[vis_turf] = vis_turf
///new turfs that we couldnt see last update but can now
var/list/newly_visible_turfs = updated_visible_turfs - visibleTurfs
@@ -121,8 +157,6 @@
active_static_images += static_image
visibleTurfs = updated_visible_turfs
- changed = FALSE
-
for(var/mob/eye/camera/client_eye as anything in seenby)
var/client/client = client_eye.GetViewerClient()
if(!client)
@@ -156,9 +190,9 @@
if(mech.chassis_camera?.can_use())
local_cameras += mech.chassis_camera
- cameras["[z_level]"] = local_cameras
+ cameras[z_level] = local_cameras
- var/image/mirror_from = GLOB.cameranet.obscured_images[GET_Z_PLANE_OFFSET(z_level) + 1]
+ var/image/mirror_from = SScameras.obscured_images[GET_Z_PLANE_OFFSET(z_level) + 1]
var/turf/chunk_corner = locate(x, y, z_level)
for(var/turf/lad as anything in CORNER_BLOCK(chunk_corner, CHUNK_SIZE, CHUNK_SIZE)) //we use CHUNK_SIZE for width and height here as it handles subtracting 1 from those two parameters by itself
var/image/our_image = new /image(mirror_from)
@@ -172,18 +206,10 @@
if(!camera.can_use())
continue
- for(var/turf/vis_turf in camera.can_see())
- if(turfs[vis_turf])
- visibleTurfs[vis_turf] = vis_turf
+ for(var/turf/vis_turf as anything in turfs & camera.can_see())
+ visibleTurfs[vis_turf] = vis_turf
for(var/turf/obscured_turf as anything in turfs - visibleTurfs)
var/image/new_static = turfs[obscured_turf]
active_static_images += new_static
obscuredTurfs[obscured_turf] = new_static
-
-#undef UPDATE_BUFFER_TIME
-
-GLOBAL_VAR_INIT(block_camera_updates, FALSE)
-
-ADMIN_VERB(pause_camera_updates, R_ADMIN, "Toggle Camera Updates", "Stop security cameras from updating, meaning what they see now is what they will see forever.", ADMIN_CATEGORY_DEBUG)
- GLOB.block_camera_updates = !GLOB.block_camera_updates
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 900ff158ee7..6d279194f8f 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -221,7 +221,7 @@
/mob/eye/camera/ai/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
. = ..()
- if(relay_speech && speaker && ai && !radio_freq && speaker != ai && GLOB.cameranet.checkCameraVis(speaker))
+ if(relay_speech && speaker && ai && !radio_freq && speaker != ai && SScameras.is_visible_by_cameras(speaker))
ai.relay_speech(speaker, message_language, raw_message, radio_freq, spans, message_mods)
/obj/effect/overlay/ai_detect_hud
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 3758c8698e3..390a5b18fbd 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -62,8 +62,8 @@
faction += FACTION_SILICON
if(ispath(radio))
radio = new radio(src)
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
diag_hud_set_status()
diag_hud_set_health()
add_sensors()
diff --git a/code/modules/mob/living/silicon/silicon_movement.dm b/code/modules/mob/living/silicon/silicon_movement.dm
index 0ea6ece169c..7ead122301b 100644
--- a/code/modules/mob/living/silicon/silicon_movement.dm
+++ b/code/modules/mob/living/silicon/silicon_movement.dm
@@ -19,6 +19,6 @@
*/
/mob/living/silicon/proc/do_camera_update(oldLoc)
if(oldLoc != get_turf(src))
- GLOB.cameranet.updatePortableCamera(builtInCamera, SILICON_CAMERA_BUFFER)
+ SScameras.update_portable_camera(builtInCamera, SILICON_CAMERA_BUFFER)
updating = FALSE
#undef SILICON_CAMERA_BUFFER
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 7fbe53a584e..8e742979b32 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -183,8 +183,8 @@
//Adds bot to the diagnostic HUD system
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
diag_hud_set_bothealth()
diag_hud_set_botstat()
diag_hud_set_botmode()
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index c331b8d4f3d..5d50e66022c 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -36,7 +36,7 @@
/mob/living/proc/AmountStun() //How many deciseconds remain in our stun
var/datum/status_effect/incapacitating/stun/S = IsStun()
if(S)
- return S.duration - world.time
+ return S.duration
return 0
/mob/living/proc/Stun(amount, ignore_canstun = FALSE) //Can't go below remaining duration
@@ -46,7 +46,7 @@
return
var/datum/status_effect/incapacitating/stun/S = IsStun()
if(S)
- S.duration = max(world.time + amount, S.duration)
+ S.duration = max(amount, S.duration)
else if(amount > 0)
S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount)
return S
@@ -62,7 +62,7 @@
qdel(S)
else
if(S)
- S.duration = world.time + amount
+ S.duration = amount
else
S = apply_status_effect(/datum/status_effect/incapacitating/stun, amount)
return S
@@ -86,7 +86,7 @@
/mob/living/proc/AmountKnockdown() //How many deciseconds remain in our knockdown
var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
if(K)
- return K.duration - world.time
+ return K.duration
return 0
/mob/living/proc/Knockdown(amount, daze_amount = 0, ignore_canstun = FALSE) //Can't go below remaining duration
@@ -96,7 +96,7 @@
return
var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
if(K)
- K.duration = max(world.time + amount, K.duration)
+ K.duration = max(amount, K.duration)
else if(amount > 0)
K = apply_status_effect(/datum/status_effect/incapacitating/knockdown, amount)
if(daze_amount > 0)
@@ -114,7 +114,7 @@
qdel(K)
else
if(K)
- K.duration = world.time + amount
+ K.duration = amount
else
K = apply_status_effect(/datum/status_effect/incapacitating/knockdown, amount)
return K
@@ -140,7 +140,7 @@
/mob/living/proc/AmountImmobilized() //How many deciseconds remain in our Immobilized status effect
var/datum/status_effect/incapacitating/immobilized/I = IsImmobilized()
if(I)
- return I.duration - world.time
+ return I.duration
return 0
/mob/living/proc/Immobilize(amount, ignore_canstun = FALSE) //Can't go below remaining duration
@@ -150,7 +150,7 @@
return
var/datum/status_effect/incapacitating/immobilized/I = IsImmobilized()
if(I)
- I.duration = max(world.time + amount, I.duration)
+ I.duration = max(amount, I.duration)
else if(amount > 0)
I = apply_status_effect(/datum/status_effect/incapacitating/immobilized, amount)
return I
@@ -166,7 +166,7 @@
qdel(I)
else
if(I)
- I.duration = world.time + amount
+ I.duration = amount
else
I = apply_status_effect(/datum/status_effect/incapacitating/immobilized, amount)
return I
@@ -190,7 +190,7 @@
/mob/living/proc/AmountParalyzed() //How many deciseconds remain in our Paralyzed status effect
var/datum/status_effect/incapacitating/paralyzed/P = IsParalyzed(FALSE)
if(P)
- return P.duration - world.time
+ return P.duration
return 0
/mob/living/proc/Paralyze(amount, ignore_canstun = FALSE) //Can't go below remaining duration
@@ -200,7 +200,7 @@
return
var/datum/status_effect/incapacitating/paralyzed/P = IsParalyzed(FALSE)
if(P)
- P.duration = max(world.time + amount, P.duration)
+ P.duration = max(amount, P.duration)
else if(amount > 0)
P = apply_status_effect(/datum/status_effect/incapacitating/paralyzed, amount)
return P
@@ -216,7 +216,7 @@
qdel(P)
else
if(P)
- P.duration = world.time + amount
+ P.duration = amount
else
P = apply_status_effect(/datum/status_effect/incapacitating/paralyzed, amount)
return P
@@ -240,7 +240,7 @@
/mob/living/proc/amount_incapacitated()
var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(/datum/status_effect/incapacitating/incapacitated)
if (incapacitated_status_effect)
- return incapacitated_status_effect.duration - world.time
+ return incapacitated_status_effect.duration
else
return 0
@@ -256,7 +256,7 @@
return
var/datum/status_effect/incapacitating/incapacitated/incapacitated_status_effect = has_status_effect(/datum/status_effect/incapacitating/incapacitated)
if(incapacitated_status_effect)
- incapacitated_status_effect.duration = max(world.time + amount, incapacitated_status_effect.duration)
+ incapacitated_status_effect.duration = max(amount, incapacitated_status_effect.duration)
else if(amount > 0)
incapacitated_status_effect = apply_status_effect(/datum/status_effect/incapacitating/incapacitated, amount)
return incapacitated_status_effect
@@ -278,7 +278,7 @@
qdel(incapacitated_status_effect)
else
if(incapacitated_status_effect)
- incapacitated_status_effect.duration = world.time + amount
+ incapacitated_status_effect.duration = amount
else
incapacitated_status_effect = apply_status_effect(/datum/status_effect/incapacitating/incapacitated, amount)
return incapacitated_status_effect
@@ -333,7 +333,7 @@
/mob/living/proc/AmountUnconscious() //How many deciseconds remain in our unconsciousness
var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious()
if(U)
- return U.duration - world.time
+ return U.duration
return 0
/mob/living/proc/Unconscious(amount, ignore_canstun = FALSE) //Can't go below remaining duration
@@ -343,7 +343,7 @@
return
var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious()
if(U)
- U.duration = max(world.time + amount, U.duration)
+ U.duration = max(amount, U.duration)
else if(amount > 0)
U = apply_status_effect(/datum/status_effect/incapacitating/unconscious, amount)
return U
@@ -358,7 +358,7 @@
if(U)
qdel(U)
else if(U)
- U.duration = world.time + amount
+ U.duration = amount
else
U = apply_status_effect(/datum/status_effect/incapacitating/unconscious, amount)
return U
@@ -383,7 +383,7 @@
/mob/living/proc/AmountSleeping() //How many deciseconds remain in our sleep
var/datum/status_effect/incapacitating/sleeping/S = IsSleeping()
if(S)
- return S.duration - world.time
+ return S.duration
return 0
/mob/living/proc/Sleeping(amount) //Can't go below remaining duration
@@ -393,7 +393,7 @@
return
var/datum/status_effect/incapacitating/sleeping/S = IsSleeping()
if(S)
- S.duration = max(world.time + amount, S.duration)
+ S.duration = max(amount, S.duration)
else if(amount > 0)
S = apply_status_effect(/datum/status_effect/incapacitating/sleeping, amount)
return S
@@ -408,7 +408,7 @@
if(S)
qdel(S)
else if(S)
- S.duration = world.time + amount
+ S.duration = amount
else
S = apply_status_effect(/datum/status_effect/incapacitating/sleeping, amount)
return S
@@ -623,13 +623,12 @@
if(isnum(max_duration) && duration > 0)
// Check the duration remaining on the existing status effect
// If it's greater than / equal to our passed max duration, we don't need to do anything
- var/remaining_duration = existing.duration - world.time
- if(remaining_duration >= max_duration)
+ if(existing.duration >= max_duration)
return
// Otherwise, add duration up to the max (max_duration - remaining_duration),
// or just add duration if it doesn't exceed our max at all
- existing.duration += min(max_duration - remaining_duration, duration)
+ existing.duration += min(max_duration - existing.duration, duration)
else
existing.duration += duration
@@ -637,7 +636,7 @@
// If the duration was decreased and is now less 0 seconds,
// qdel it / clean up the status effect immediately
// (rather than waiting for the process tick to handle it)
- if(existing.duration <= world.time)
+ if(existing.duration <= 0)
qdel(existing)
else if(duration > 0)
@@ -670,12 +669,11 @@
if(only_if_higher)
// If the existing status effect has a higher remaining duration
// than what we aim to set it to, don't downgrade it - do nothing (return)
- var/remaining_duration = existing.duration - world.time
- if(remaining_duration >= duration)
+ if(existing.duration >= duration)
return
// Set the duration accordingly
- existing.duration = world.time + duration
+ existing.duration = duration
else if(duration > 0)
apply_status_effect(effect, duration)
@@ -698,7 +696,7 @@
if(existing.duration == STATUS_EFFECT_PERMANENT)
return INFINITY
- return existing.duration - world.time
+ return existing.duration
/**
* Adjust the "drunk value" the mob is currently experiencing,
diff --git a/code/modules/mob_spawn/corpses/job_corpses.dm b/code/modules/mob_spawn/corpses/job_corpses.dm
index 01ffdbe0d46..b0014424037 100644
--- a/code/modules/mob_spawn/corpses/job_corpses.dm
+++ b/code/modules/mob_spawn/corpses/job_corpses.dm
@@ -88,3 +88,21 @@
name = JOB_BITRUNNER
outfit = /datum/outfit/job/bitrunner
icon_state = "corpsecargotech"
+
+/obj/effect/mob_spawn/corpse/human/cmo
+ name = JOB_CHIEF_MEDICAL_OFFICER
+ outfit = /datum/outfit/job/cmo
+ icon_state = "corpsedoctor"
+
+/obj/effect/mob_spawn/corpse/human/ce
+ name = JOB_CHIEF_ENGINEER
+ outfit = /datum/outfit/job/ce
+ icon_state = "corpseengineer"
+
+/obj/effect/mob_spawn/corpse/human/secoff
+ name = JOB_SECURITY_OFFICER
+ outfit = /datum/outfit/job/security
+
+/obj/effect/mob_spawn/corpse/human/hos
+ name = JOB_HEAD_OF_SECURITY
+ outfit = /datum/outfit/job/hos
diff --git a/code/modules/mob_spawn/corpses/mining_corpses.dm b/code/modules/mob_spawn/corpses/mining_corpses.dm
index 4dc4e7d5ad0..1b15f0a39c0 100644
--- a/code/modules/mob_spawn/corpses/mining_corpses.dm
+++ b/code/modules/mob_spawn/corpses/mining_corpses.dm
@@ -262,7 +262,7 @@
else
backpack_contents += backpack_loot
if(prob(30))
- backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(list( 1 = 3, 2 = 2, 3 = 1)))
+ backpack_contents += list(/obj/item/stack/sheet/mineral/bananium = pick_weight(alist( 1 = 3, 2 = 2, 3 = 1)))
if(prob(10))
l_pocket = pick_weight(list(
/obj/item/bikehorn/golden = 3,
diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
index 17e9bf8b3ec..314944390e2 100644
--- a/code/modules/mob_spawn/mob_spawn.dm
+++ b/code/modules/mob_spawn/mob_spawn.dm
@@ -345,6 +345,7 @@
spawned_human.Drain()
else //Because for some reason I can't track down, things are getting turned into husks even if husk = false. It's in some damage proc somewhere.
spawned_human.cure_husk()
+ spawned_human.job = name
/obj/effect/mob_spawn/corpse/human/equip(mob/living/carbon/human/spawned_human)
. = ..()
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index c749d6837c2..8e552f61023 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -128,6 +128,7 @@
part.set_armor(armor_type)
part.resistance_flags = resistance_flags
part.flags_1 |= atom_flags //flags like initialization or admin spawning are here, so we cant set, have to add
+ part.item_flags |= DO_NOT_WARDROBE
part.heat_protection = NONE
part.cold_protection = NONE
part.max_heat_protection_temperature = max_heat_protection_temperature
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index 11346d00f28..7c0b763fdd4 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -291,7 +291,7 @@
/obj/item/mod/module/emp_shield/pulse/on_use(mob/activator)
playsound(src, 'sound/effects/empulse.ogg', 60, TRUE)
- empulse(src, heavy_range = 4, light_range = 6)
+ empulse(src, heavy_range = 4, light_range = 6, emp_source = src)
drain_power(use_energy_cost)
/// Ninja Status Readout - Like the normal status display (see the base type), but with a clock.
diff --git a/code/modules/modular_computers/file_system/programs/raptordex.dm b/code/modules/modular_computers/file_system/programs/raptordex.dm
index b54e847ce1f..d26151f9c29 100644
--- a/code/modules/modular_computers/file_system/programs/raptordex.dm
+++ b/code/modules/modular_computers/file_system/programs/raptordex.dm
@@ -5,7 +5,7 @@
program_open_overlay = "bountyboard"
extended_desc = "Scan and analyze raptor genes."
size = 2
- tgui_id = "RaptorDex"
+ tgui_id = "NtosRaptorDex"
program_icon = "crow"
can_run_on_flags = PROGRAM_PDA
/// Raptor scan data we have stored
diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
index 4a90f25f5b0..51e3cfed303 100644
--- a/code/modules/modular_computers/file_system/programs/secureye.dm
+++ b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -129,7 +129,7 @@
data["network"] = network
data["mapRef"] = cam_screen.assigned_map
data["can_spy"] = !!spying
- data["cameras"] = GLOB.cameranet.get_available_cameras_data(network)
+ data["cameras"] = SScameras.get_available_cameras_data(network)
return data
/datum/computer_file/program/secureye/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
@@ -145,7 +145,7 @@
if(!spying)
playsound(computer, SFX_TERMINAL_TYPE, 25, FALSE)
- var/obj/machinery/camera/selected_camera = locate(params["camera"]) in GLOB.cameranet.cameras
+ var/obj/machinery/camera/selected_camera = locate(params["camera"]) in SScameras.cameras
if(selected_camera)
camera_ref = WEAKREF(selected_camera)
else
@@ -168,12 +168,13 @@
/datum/computer_file/program/secureye/proc/on_track_target(datum/trackable/source, mob/living/target)
SIGNAL_HANDLER
- var/datum/camerachunk/target_camerachunk = GLOB.cameranet.getTurfVis(get_turf(target))
+ var/target_turf = get_turf(target)
+ var/datum/camerachunk/target_camerachunk = SScameras.get_turf_camera_chunk(target_turf)
if(!target_camerachunk)
CRASH("[src] was able to track [target] through /datum/trackable, but was not on a visible turf to cameras.")
- for(var/obj/machinery/camera/cameras as anything in target_camerachunk.cameras["[target.z]"])
- var/found_target = locate(target) in cameras.can_see()
- if(!found_target)
+ for(var/obj/machinery/camera/cameras as anything in target_camerachunk.cameras[target.z])
+ // We need to find a particular camera that can see this turf
+ if(!(target_turf in cameras.can_see()))
continue
var/new_camera = WEAKREF(cameras)
if(camera_ref == new_camera)
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index 9ef40666fc3..c0c956e3698 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -191,17 +191,11 @@
/// Check whether an AI could take a picture of the target turf.
/obj/item/camera/proc/can_ai_target(turf/target_turf)
- if(!GLOB.cameranet.checkTurfVis(target_turf))
- return FALSE
- return TRUE
+ return SScameras.is_visible_by_cameras(target_turf)
/// Check whether a mob could take a picture of the target turf.
/obj/item/camera/proc/can_mob_target(turf/target_turf, mob/user)
- var/user_view = user.client ? user.client.view : WIDESCREEN_VIEWPORT_SIZE
- var/user_eye = user.client ? user.client.eye : user
- if(!(target_turf in get_hear(user_view, user_eye)))
- return FALSE
- return TRUE
+ return (target_turf in get_hear_turfs(user.client?.view || world.view, user.client?.eye || user))
/obj/item/camera/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
// Always skip on storage and tables
@@ -260,18 +254,17 @@
var/list/desc = list("This is a photo of an area of [size_x+1] meters by [size_y+1] meters.")
var/list/mobs_spotted = list()
var/list/dead_spotted = list()
- var/list/seen
- var/list/viewlist = user?.client ? getviewsize(user.client.view) : getviewsize(world.view)
- var/viewr = max(viewlist[1], viewlist[2]) + max(size_x, size_y)
- var/viewc = user?.client ? user.client.eye : target
- seen = get_hear(viewr, viewc)
+ var/list/viewlist = getviewsize(user?.client?.view || world.view)
+ var/view_range = max(viewlist[1], viewlist[2]) + max(size_x, size_y)
+ var/viewer = user?.client?.eye || user || target // not sure why target is a fallback
+ var/list/seen = get_hear_turfs(view_range, viewer)
var/list/turfs = list()
var/list/mobs = list()
var/blueprints = FALSE
var/clone_area = SSmapping.request_turf_block_reservation(size_x * 2 + 1, size_y * 2 + 1, 1)
///list of human names taken on picture
var/list/names = list()
- var/cameranet_user = isAI(user) || istype(viewc, /mob/eye/camera)
+ var/cameranet_user = isAI(user) || istype(viewer, /mob/eye/camera)
var/width = size_x * 2 + 1
var/height = size_y * 2 + 1
@@ -279,7 +272,7 @@
if(isnull(seen_placeholder))
continue
- if(cameranet_user && !GLOB.cameranet.checkTurfVis(seen_placeholder))
+ if(cameranet_user && !SScameras.is_visible_by_cameras(seen_placeholder))
continue
if(!cameranet_user && !(seen_placeholder in seen))
continue
diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm
index 0fef34ef4ca..88ad345ffa0 100644
--- a/code/modules/plumbing/plumbers/iv_drip.dm
+++ b/code/modules/plumbing/plumbers/iv_drip.dm
@@ -15,7 +15,7 @@
/obj/machinery/iv_drip/plumbing/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
. = ..()
- if(held_item.tool_behaviour != TOOL_WRENCH)
+ if(isnull(held_item) || held_item.tool_behaviour != TOOL_WRENCH)
return
context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Una" : "A"]nchor"
return CONTEXTUAL_SCREENTIP_SET
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 4123b4eca90..508aa22ca10 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -443,6 +443,8 @@
frame = new /obj/item/wallframe/light_fixture(drop_point)
if("bulb")
frame = new /obj/item/wallframe/light_fixture/small(drop_point)
+ if("floor bulb")
+ frame = new /obj/item/wallframe/light_fixture/small(drop_point)
if(!disassembled)
frame.take_damage(frame.max_integrity * 0.5, sound_effect = FALSE)
if(status != LIGHT_BROKEN)
@@ -747,7 +749,7 @@
layer = BELOW_CATWALK_LAYER
plane = FLOOR_PLANE
light_type = /obj/item/light/bulb
- fitting = "bulb"
+ fitting = "floor bulb"
nightshift_brightness = 4
fire_brightness = 4.5
@@ -758,6 +760,15 @@
status = LIGHT_BROKEN
icon_state = "floor-broken"
+/obj/machinery/light/floor/burned
+ status = LIGHT_BURNED
+ icon_state = "floor-burned"
+
+/obj/machinery/light/floor/empty
+ icon_state = "floor-empty"
+ start_with_cell = FALSE
+ status = LIGHT_EMPTY
+
/obj/machinery/light/floor/transport
name = "transport light"
break_if_moved = FALSE
diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm
index c38a34318ca..4899bb3fd35 100644
--- a/code/modules/power/lighting/light_construct.dm
+++ b/code/modules/power/lighting/light_construct.dm
@@ -141,9 +141,11 @@
tool.play_tool_sound(src, 75)
switch(fixture_type)
if("tube")
- new_light = new /obj/machinery/light/built(loc)
+ new_light = new /obj/machinery/light/empty(loc)
if("bulb")
- new_light = new /obj/machinery/light/small/built(loc)
+ new_light = new /obj/machinery/light/small/empty(loc)
+ if("floor")
+ new_light = new /obj/machinery/light/floor/empty(loc)
new_light.setDir(dir)
new_light.find_and_hang_on_wall()
transfer_fingerprints_to(new_light)
@@ -169,3 +171,9 @@
icon_state = "bulb-construct-stage1"
fixture_type = "bulb"
sheets_refunded = 1
+
+/obj/structure/light_construct/floor
+ name = "floor light fixture frame"
+ icon_state = "floor-construct-stage1"
+ fixture_type = "floor"
+ sheets_refunded = 1
diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm
index 7a025e7f761..41378a319e3 100644
--- a/code/modules/power/lighting/light_mapping_helpers.dm
+++ b/code/modules/power/lighting/light_mapping_helpers.dm
@@ -2,7 +2,11 @@
status = LIGHT_BROKEN
icon_state = "tube-broken"
-/obj/machinery/light/built
+/obj/machinery/light/burned
+ status = LIGHT_BURNED
+ icon_state = "tube-burned"
+
+/obj/machinery/light/empty
icon_state = "tube-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
@@ -68,7 +72,11 @@
status = LIGHT_BROKEN
icon_state = "bulb-broken"
-/obj/machinery/light/small/built
+/obj/machinery/light/small/burned
+ status = LIGHT_BURNED
+ icon_state = "bulb-burned"
+
+/obj/machinery/light/small/empty
icon_state = "bulb-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
@@ -105,7 +113,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/broken, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_construct, 0)
// ---- Tube frames
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/built, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/empty, 0)
// ---- No nightlight tubes
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/no_nightlight, 0)
@@ -148,7 +156,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_construct/small, 0)
// ---- Bulb frames
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/built, 0)
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/empty, 0)
// ---- Broken bulbs
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/broken, 0)
diff --git a/code/modules/power/lighting/light_wallframes.dm b/code/modules/power/lighting/light_wallframes.dm
index af650232cca..f370bc2a917 100644
--- a/code/modules/power/lighting/light_wallframes.dm
+++ b/code/modules/power/lighting/light_wallframes.dm
@@ -20,3 +20,35 @@
to_chat(user, span_warning("You cannot place [src] in this area!"))
return
return TRUE
+
+/obj/item/wallframe/light_fixture/small/attack_self(mob/user)
+ var/turf/local_turf = get_turf(user)
+ var/area/local_area = get_area(user)
+ if(!isturf(user.loc) || !isfloorturf(local_turf))
+ balloon_alert(user, "cannot place here!")
+ return
+ if(local_area.always_unpowered || !local_area.static_lighting)
+ balloon_alert(user, "cannot place in this area!")
+ return
+ for(var/obj/object in local_turf)
+ if(object.density && !(object.obj_flags & IGNORE_DENSITY) || object.obj_flags & BLOCKS_CONSTRUCTION)
+ balloon_alert(user, "something is in the way!")
+ return
+ if(local_turf.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
+ balloon_alert(user, "remove the floor plating!")
+ return
+ if(locate(/obj/structure/light_construct/floor) in local_turf)
+ balloon_alert(user, "already has a light!")
+ return
+ if(locate(/obj/machinery/light/floor) in local_turf)
+ balloon_alert(user, "already has a light!")
+ return
+
+ playsound(src.loc, 'sound/machines/click.ogg', 75, TRUE)
+ user.visible_message(span_notice("[user.name] attaches [src] to the floor."),
+ span_notice("You attach [src] to the floor."),
+ span_hear("You hear clicking."))
+
+ new /obj/structure/light_construct/floor(local_turf)
+ qdel(src)
+
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 73c2fad8ca9..309de9c7b15 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -146,14 +146,24 @@
QDEL_NULL(sparks)
return ..()
+/obj/machinery/power/emitter/update_overlays()
+ . = ..()
+ if(!active)
+ return
+ var/laser_color = COLOR_VIBRANT_LIME
+ if (!powered)
+ laser_color = COLOR_ORANGE //stank low power orange
+ else if (diskie)
+ laser_color = diskie.laser_color
+ var/mutable_appearance/overlay = mutable_appearance(icon, "emitter_overlay")
+ overlay.color = laser_color
+ . += overlay
+
/obj/machinery/power/emitter/update_icon_state()
- if(!active || !powernet)
- icon_state = base_icon_state
- return ..()
if(panel_open)
icon_state = "[base_icon_state]_open"
- return ..()
- icon_state = avail(active_power_usage) ? icon_state_on : icon_state_underpowered
+ else
+ icon_state = base_icon_state
return ..()
/obj/machinery/power/emitter/interact(mob/user)
@@ -373,6 +383,7 @@
no_shot_counter = diskie.no_shot_counter
playsound(src, 'sound/machines/card_slide.ogg', 50)
to_chat(user, span_notice("You update the [src]'s diode configuration with the [config_disk]."))
+ update_appearance()
if(diskie.consumable)
qdel(diskie)
return ..()
@@ -412,6 +423,7 @@
user.put_in_hands(diskie)
diskie = null
playsound(src, 'sound/machines/card_slide.ogg', 50, TRUE)
+ update_appearance()
set_projectile()
return TRUE
@@ -620,6 +632,7 @@
desc = "This disk can be used on an emitter with an open panel to reset its projectile. Unless this was handed to you by an admin, you should report this on github."
icon = 'icons/obj/devices/circuitry_n_data.dmi'
icon_state = "datadisk6"
+ var/laser_color = COLOR_VIBRANT_LIME
var/stored_proj = /obj/projectile/beam/emitter/hitscan
var/stored_sound = 'sound/items/weapons/emitter.ogg'
var/consumed_on_removal = TRUE
@@ -633,6 +646,7 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/bluelens
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_TRUE_BLUE
/obj/item/emitter_disk/healing
name = "\improper Diode Disk: Bioregenerative"
@@ -640,6 +654,7 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/bioregen
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_YELLOW
/obj/item/emitter_disk/incendiary
name = "\improper Diode Disk: Conflagratory"
@@ -647,6 +662,8 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/incend
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_RED_LIGHT
+
/obj/item/emitter_disk/sanity
name = "\improper Diode Disk: Psychosiphoning"
@@ -654,6 +671,8 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/psy
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_TONGUE_PINK
+
/obj/item/emitter_disk/magnetic
name = "\improper Diode Disk: Magnetogenerative"
@@ -661,6 +680,7 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/magnetic
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_SILVER
/obj/item/emitter_disk/blast
name = "\improper Diode Disk: Hyperconcussive"
@@ -668,4 +688,5 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/blast
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_SYNDIE_RED //magnetic is already grey
fire_rate_mod = 2
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index 2ec850950b0..ab4e38dbb95 100644
--- a/code/modules/projectiles/ammunition/ballistic/rifle.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -154,7 +154,7 @@
if (can_sleep && (owner.mob_biotypes & MOB_ORGANIC))
owner.adjust_drowsiness(drowsy_per_second * seconds_per_tick)
var/datum/status_effect/drowsiness/drowsiness = owner.has_status_effect(/datum/status_effect/drowsiness)
- if (drowsiness?.duration - world.time >= drowsy_knockout)
+ if (drowsiness?.duration >= drowsy_knockout)
owner.Sleeping(3 SECONDS)
if (casing.heals_left <= 0)
fall_out()
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index dae805e4ac1..580f3e6523e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -94,7 +94,7 @@
. = ..()
if(ispath(pin))
pin = new pin
- pin.gun_insert(new_gun = src)
+ pin.gun_insert(new_gun = src, starting = TRUE)
add_seclight_point()
give_gun_safeties() // SKYRAT EDIT ADDITION - GUN SAFETIES
@@ -646,7 +646,7 @@
if(pin)
qdel(pin)
var/obj/item/firing_pin/new_pin = new
- new_pin.gun_insert(new_gun = src)
+ new_pin.gun_insert(new_gun = src, starting = TRUE)
//Happens before the actual projectile creation
/obj/item/gun/proc/before_firing(atom/target,mob/user)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 987e67e6f9a..bfbd1a5a743 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -211,7 +211,6 @@
// luxury shuttle funnies
/obj/item/firing_pin/paywall/luxury
multi_payment = TRUE
- owned = TRUE
payment_amount = 20
/obj/item/gun/energy/laser/luxurypaywall
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index a682d074fbe..d3059ac3fda 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -59,11 +59,11 @@
balloon_alert(user, "authentication checks overridden")
return TRUE
-/obj/item/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/new_gun)
+/obj/item/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/new_gun, starting = FALSE)
gun = new_gun
forceMove(gun)
gun.pin = src
- SEND_SIGNAL(gun, COMSIG_GUN_PIN_INSERTED, src, user)
+ SEND_SIGNAL(gun, COMSIG_GUN_PIN_INSERTED, src, user, starting)
return TRUE
/obj/item/firing_pin/proc/gun_remove(mob/living/user)
@@ -173,7 +173,7 @@
return TRUE //The clown op leader antag datum isn't a subtype of the normal clown op antag datum.
return FALSE
-/obj/item/firing_pin/clown/ultra/gun_insert(mob/living/user, obj/item/gun/new_gun)
+/obj/item/firing_pin/clown/ultra/gun_insert(mob/living/user, obj/item/gun/new_gun, starting = FALSE)
..()
new_gun.clumsy_check = FALSE
@@ -232,69 +232,66 @@
desc = "A firing pin with a built-in configurable paywall."
color = COLOR_GOLD
fail_message = ""
- ///list of account IDs which have accepted the license prompt. If this is the multi-payment pin, then this means they accepted the waiver that each shot will cost them money
+ /// List of account IDs which have accepted the license prompt. If this is the multi-payment pin, then this means they accepted the waiver that each shot will cost them money
var/list/gun_owners = list()
- ///how much gets paid out to license yourself to the gun
+ /// How much gets paid out to license yourself to the gun
var/payment_amount
+ /// Owner of the gun
var/datum/bank_account/pin_owner
- ///if true, user has to pay everytime they fire the gun
+ /// If true, user has to pay everytime they fire the gun
var/multi_payment = FALSE
- var/owned = FALSE
- ///purchase prompt to prevent spamming it, set to the user who opens to prompt to prevent locking the gun up for other users.
+ /// Purchase prompt to prevent spamming it, set to the user who opens to prompt to prevent locking the gun up for other users.
var/active_prompt_user
/obj/item/firing_pin/paywall/attack_self(mob/user)
multi_payment = !multi_payment
- to_chat(user, span_notice("You set the pin to [( multi_payment ) ? "process payment for every shot" : "one-time license payment"]."))
+ to_chat(user, span_notice("You set the pin to [multi_payment ? "process payment for every shot" : "one-time license payment"]."))
/obj/item/firing_pin/paywall/examine(mob/user)
. = ..()
if(pin_owner)
. += span_notice("This firing pin is currently authorized to pay into the account of [pin_owner.account_holder].")
-/obj/item/firing_pin/paywall/gun_insert(mob/living/user, obj/item/gun/new_gun)
- if(!pin_owner)
- if(isnull(user))
- forceMove(new_gun.drop_location())
- else
- to_chat(user, span_warning("ERROR: Please swipe valid identification card before installing firing pin!"))
- user.put_in_hands(src)
- return FALSE
- ..()
- if(multi_payment)
- gun.desc += span_notice(" This [gun.name] has a per-shot cost of [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""].")
- return TRUE
- gun.desc += span_notice(" This [gun.name] has a license permit cost of [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""].")
- return TRUE
+/obj/item/firing_pin/paywall/gun_insert(mob/living/user, obj/item/gun/new_gun, starting = FALSE)
+ if(pin_owner || starting)
+ . = ..()
+ gun.desc += span_notice("This [gun.name] has a [multi_payment ? "per-shot" : "license permit"] cost of [payment_amount] credit[payment_amount > 1 ? "s" : ""].")
+ return
+ if(isnull(user))
+ forceMove(new_gun.drop_location())
+ else
+ to_chat(user, span_warning("ERROR: Please swipe valid identification card before installing firing pin!"))
+ user.put_in_hands(src)
+ return FALSE
/obj/item/firing_pin/paywall/gun_remove(mob/living/user)
gun.desc = gun::desc
- ..()
+ . = ..()
-/obj/item/firing_pin/paywall/attackby(obj/item/M, mob/living/user, list/modifiers, list/attack_modifiers)
- if(isidcard(M))
- var/obj/item/card/id/id = M
- if(!id.registered_account)
- to_chat(user, span_warning("ERROR: Identification card lacks registered bank account!"))
- return
- if(id.registered_account != pin_owner && owned)
- to_chat(user, span_warning("ERROR: This firing pin has already been authorized!"))
- return
- if(id.registered_account == pin_owner)
- to_chat(user, span_notice("You unlink the card from the firing pin."))
- gun_owners -= user.get_bank_account()
- pin_owner = null
- owned = FALSE
- return
- var/transaction_amount = tgui_input_number(user, "Insert valid deposit amount for gun purchase", "Money Deposit")
- if(!transaction_amount || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
- return
- pin_owner = id.registered_account
- owned = TRUE
- payment_amount = transaction_amount
- gun_owners += user.get_bank_account()
- to_chat(user, span_notice("You link the card to the firing pin."))
+/obj/item/firing_pin/paywall/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!isidcard(tool))
+ return NONE
+ var/obj/item/card/id/id = tool
+ if(!id.registered_account)
+ to_chat(user, span_warning("ERROR: Identification card lacks registered bank account!"))
+ return ITEM_INTERACT_BLOCKING
+ if(id.registered_account != pin_owner)
+ to_chat(user, span_warning("ERROR: This firing pin has already been authorized!"))
+ return ITEM_INTERACT_BLOCKING
+ if(id.registered_account == pin_owner)
+ to_chat(user, span_notice("You unlink the card from the firing pin."))
+ gun_owners -= user.get_bank_account()
+ pin_owner = NUTRITION_LEVEL_START_MIN
+ return ITEM_INTERACT_SUCCESS
+ var/transaction_amount = tgui_input_number(user, "Insert valid deposit amount for gun purchase", "Money Deposit")
+ if(!transaction_amount || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
+ return ITEM_INTERACT_BLOCKING
+ pin_owner = id.registered_account
+ payment_amount = transaction_amount
+ gun_owners += user.get_bank_account()
+ to_chat(user, span_notice("You link the card to the firing pin."))
+ return ITEM_INTERACT_SUCCESS
/obj/item/firing_pin/paywall/pin_auth(mob/living/user)
if(!istype(user))//nice try commie
@@ -332,12 +329,12 @@
pin_owner.adjust_money(payment_amount, "Firing Pin: Gun License Bought")
gun_owners += credit_card_details
to_chat(user, span_notice("Gun license purchased, have a secure day!"))
-
else
to_chat(user, span_warning("ERROR: User balance insufficent for successful transaction!"))
if("No", null)
to_chat(user, span_warning("ERROR: User has declined to purchase gun license!"))
+
active_prompt_user = null
return FALSE //we return false here so you don't click initially to fire, get the prompt, accept the prompt, and THEN the gun
diff --git a/code/modules/projectiles/projectile/bullets/cannonball.dm b/code/modules/projectiles/projectile/bullets/cannonball.dm
index 167f61dfa2c..30c95fdad6c 100644
--- a/code/modules/projectiles/projectile/bullets/cannonball.dm
+++ b/code/modules/projectiles/projectile/bullets/cannonball.dm
@@ -57,7 +57,7 @@
damage = 15 //very low
/obj/projectile/bullet/cannonball/emp/on_hit(atom/target, blocked = 0, pierce_hit)
- empulse(src, 4, 10)
+ empulse(src, 4, 10, emp_source = src)
. = ..()
/obj/projectile/bullet/cannonball/biggest_one
diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm
index ce352fcd93a..0a13cbb9e84 100644
--- a/code/modules/projectiles/projectile/bullets/sniper.dm
+++ b/code/modules/projectiles/projectile/bullets/sniper.dm
@@ -50,7 +50,7 @@
if(issilicon(target)) //also especially good against borgs
var/mob/living/silicon/borg_boy = target
borg_boy.apply_damage(damage, BRUTE)
- empulse(target, emp_radius, emp_radius)
+ empulse(target, emp_radius, emp_radius, emp_source = src)
/obj/projectile/bullet/p50/incendiary
name =".50 BMG incendiary bullet"
diff --git a/code/modules/projectiles/projectile/special/ion.dm b/code/modules/projectiles/projectile/special/ion.dm
index 9d25f1504cd..96dacf6305e 100644
--- a/code/modules/projectiles/projectile/special/ion.dm
+++ b/code/modules/projectiles/projectile/special/ion.dm
@@ -9,7 +9,7 @@
/obj/projectile/ion/on_hit(atom/target, blocked = 0, pierce_hit)
..()
- empulse(target, emp_radius, emp_radius)
+ empulse(target, emp_radius, emp_radius, emp_source = src)
return BULLET_ACT_HIT
/obj/projectile/ion/weak
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 30be06bf74b..b5538de6484 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -267,6 +267,8 @@
.["displayedUnits"] = cell.charge ? (cell.charge / power_cost) : 0
.["displayedMaxUnits"] = cell.maxcharge / power_cost
.["showpH"] = isnull(recording_recipe) ? show_ph : FALSE //virtual beakers have no ph to compute & display
+ var/obj/item/held_item = user.get_active_held_item()
+ .["hasBeakerInHand"] = held_item?.is_chem_container() || FALSE
var/list/chemicals = list()
var/is_hallucinating = FALSE
@@ -359,6 +361,13 @@
replace_beaker(ui.user)
return TRUE
+ if("insert")
+ var/obj/item/reagent_containers/container = ui.user.get_active_held_item()
+ if(container?.can_insert_container(ui.user, src))
+ replace_beaker(ui.user, container)
+
+ return TRUE
+
if("dispense_recipe")
if(!is_operational || QDELETED(cell))
return
@@ -464,20 +473,19 @@
return ITEM_INTERACT_BLOCKING
/obj/machinery/chem_dispenser/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- if(is_reagent_container(tool) && !(tool.item_flags & ABSTRACT) && tool.is_open_container())
- //SKYRAT EDIT ADDITION START - CHEMISTRY QOL
- var/obj/item/reagent_containers/container = tool
- if(customTransferAmount)
- transferAmounts -= customTransferAmount
- transferAmounts = container.possible_transfer_amounts
- //SKYRAT EDIT ADDITION END
- if(!user.transferItemToLoc(tool, src))
- return ITEM_INTERACT_BLOCKING
- replace_beaker(user, tool)
- ui_interact(user)
- return ITEM_INTERACT_SUCCESS
+ if(!tool.can_insert_container(user, src))
+ return NONE
+ //SKYRAT EDIT ADDITION START - CHEMISTRY QOL
+ var/obj/item/reagent_containers/container = tool
+ if(customTransferAmount)
+ transferAmounts -= customTransferAmount
+ transferAmounts = container.possible_transfer_amounts
+ //SKYRAT EDIT ADDITION END
+ if(!replace_beaker(user, tool))
+ return ITEM_INTERACT_BLOCKING
- return NONE
+ ui_interact(user)
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/chem_dispenser/get_cell()
return cell
@@ -541,15 +549,25 @@
parts_rating += servo.tier
power_cost = max(new_power_cost, 0.1 KILO WATTS)
+/**
+ * Insert, remove, replace the existig beaker. Returns TRUE on success.
+ * Arguments:
+ *
+ * * mob/living/user - the player trying to replace the beaker
+ * * obj/item/reagent_containers/new_beaker - the beaker we are trying to insert, swap with existing or remove if null
+ */
/obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
- if(!user)
- return FALSE
- if(beaker)
+ if(!QDELETED(beaker))
try_put_in_hand(beaker, user)
- beaker = null
- if(new_beaker)
+ if(!QDELETED(new_beaker))
+ if(!user.transferItemToLoc(new_beaker, src))
+ update_appearance(UPDATE_OVERLAYS)
+ return FALSE
+
beaker = new_beaker
- update_appearance()
+
+ update_appearance(UPDATE_OVERLAYS)
+
return TRUE
/obj/machinery/chem_dispenser/on_deconstruction(disassembled)
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 963e33b25ff..f3432ccb936 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -46,10 +46,10 @@
if(istype(held_item, /obj/item/reagent_containers/dropper) || istype(held_item, /obj/item/reagent_containers/syringe))
context[SCREENTIP_CONTEXT_LMB] = "Inject"
return CONTEXTUAL_SCREENTIP_SET
- if(is_reagent_container(held_item) && held_item.is_open_container())
+ if(held_item.is_chem_container())
context[SCREENTIP_CONTEXT_LMB] = "Replace beaker"
return CONTEXTUAL_SCREENTIP_SET
- else if(is_reagent_container(held_item) && held_item.is_open_container())
+ else if(held_item.is_chem_container())
context[SCREENTIP_CONTEXT_LMB] = "Insert beaker"
return CONTEXTUAL_SCREENTIP_SET
@@ -90,22 +90,22 @@
heater_coefficient *= micro_laser.tier
/obj/machinery/chem_heater/item_interaction(mob/living/user, obj/item/held_item, list/modifiers)
- if(user.combat_mode && !is_reagent_container(held_item) && !held_item.is_open_container() || (held_item.item_flags & ABSTRACT) || (held_item.flags_1 & HOLOGRAM_1) || !user.can_perform_action(src, ALLOW_SILICON_REACH | FORBID_TELEKINESIS_REACH))
- return NONE
-
if(!QDELETED(beaker))
if(istype(held_item, /obj/item/reagent_containers/dropper) || istype(held_item, /obj/item/reagent_containers/syringe))
var/obj/item/reagent_containers/injector = held_item
injector.interact_with_atom(beaker, user, modifiers)
return ITEM_INTERACT_SUCCESS
- if(is_reagent_container(held_item) && held_item.is_open_container())
- if(replace_beaker(user, held_item))
- ui_interact(user)
- balloon_alert(user, "beaker added")
- return ITEM_INTERACT_SUCCESS
+ if(!held_item.can_insert_container(user, src))
+ return NONE
- return NONE
+ if(!replace_beaker(user, held_item))
+ return ITEM_INTERACT_BLOCKING
+
+ ui_interact(user)
+ balloon_alert(user, "beaker added")
+
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/chem_heater/wrench_act(mob/living/user, obj/item/tool)
if(user.combat_mode)
@@ -147,7 +147,7 @@
return attack_hand_secondary(user, modifiers)
/**
- * Replace or eject the beaker inside this machine
+ * Replace or eject the beaker inside this machine. Returns TRUE on success.
* Arguments
* * mob/living/user - the player operating this machine
* * obj/item/reagent_containers/new_beaker - the new beaker to replace the current one if not null else it will just eject
@@ -160,12 +160,12 @@
if(!QDELETED(new_beaker))
if(!user.transferItemToLoc(new_beaker, src))
- update_appearance()
+ update_appearance(UPDATE_ICON_STATE)
return FALSE
beaker = new_beaker
RegisterSignal(beaker.reagents, COMSIG_REAGENTS_REACTION_STEP, PROC_REF(on_reaction_step))
- update_appearance()
+ update_appearance(UPDATE_ICON_STATE)
return TRUE
@@ -221,6 +221,8 @@
.["targetTemp"] = target_temperature
.["isActive"] = on
.["upgradeLevel"] = heater_coefficient * 10
+ var/obj/item/held_item = user.get_active_held_item()
+ .["hasBeakerInHand"] = held_item?.is_chem_container() || FALSE
var/list/beaker_data = null
var/chem_temp = 0
@@ -322,6 +324,13 @@
//Eject doesn't turn it off, so you can preheat for beaker swapping
return replace_beaker(ui.user)
+ if("insert")
+ var/obj/item/reagent_containers/container = ui.user.get_active_held_item()
+ if(container?.can_insert_container(ui.user, src))
+ replace_beaker(ui.user, container)
+
+ return TRUE
+
if("acidBuffer")
var/target = params["target"]
if(!target)
diff --git a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
index 7cf10157aad..b33016b452a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_mass_spec.dm
@@ -61,7 +61,7 @@
if(isnull(held_item) || (held_item.item_flags & ABSTRACT) || (held_item.flags_1 & HOLOGRAM_1))
return
- if(is_reagent_container(held_item))
+ if(held_item.is_chem_container())
if(QDELETED(beaker1))
context[SCREENTIP_CONTEXT_LMB] = "Insert input beaker"
else
@@ -146,26 +146,22 @@
cms_coefficient /= laser.tier
/obj/machinery/chem_mass_spec/item_interaction(mob/living/user, obj/item/item, list/modifiers)
- if((item.item_flags & ABSTRACT) || (item.flags_1 & HOLOGRAM_1) || !can_interact(user) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
+ if(processing_reagents)
+ balloon_alert(user, "still processing!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(!item.can_insert_container(user, src))
return NONE
- if(is_reagent_container(item) && item.is_open_container())
- if(processing_reagents)
- balloon_alert(user, "still processing!")
- return ITEM_INTERACT_BLOCKING
+ var/is_right_clicking = LAZYACCESS(modifiers, RIGHT_CLICK)
+ if(!replace_beaker(user, !is_right_clicking, item))
+ return ITEM_INTERACT_BLOCKING
- var/obj/item/reagent_containers/beaker = item
- if(!user.transferItemToLoc(beaker, src))
- return ITEM_INTERACT_BLOCKING
+ to_chat(user, span_notice("You add [item] to [is_right_clicking ? "output" : "input"] slot."))
+ update_appearance()
+ ui_interact(user)
- var/is_right_clicking = LAZYACCESS(modifiers, RIGHT_CLICK)
- replace_beaker(user, !is_right_clicking, beaker)
- to_chat(user, span_notice("You add [beaker] to [is_right_clicking ? "output" : "input"] slot."))
- update_appearance()
- ui_interact(user)
- return ITEM_INTERACT_SUCCESS
-
- return NONE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/chem_mass_spec/wrench_act(mob/living/user, obj/item/tool)
. = ITEM_INTERACT_BLOCKING
@@ -222,7 +218,7 @@
return smallest ? FLOOR(result, 50) : CEILING(result, 50)
/*
- * Replaces a beaker in the machine, either input or output
+ * Replaces a beaker in the machine, either input or output. Returns TRUE on success.
* Arguments
*
* * user - The one bonking the machine
@@ -235,17 +231,29 @@
if(is_input) //replace input beaker
if(!QDELETED(beaker1))
try_put_in_hand(beaker1, user)
- beaker1 = new_beaker
- lower_mass_range = calculate_mass(smallest = TRUE)
- upper_mass_range = calculate_mass(smallest = FALSE)
- estimate_time()
+ if(!QDELETED(new_beaker))
+ if(!user.transferItemToLoc(new_beaker, src))
+ update_appearance(UPDATE_OVERLAYS)
+ return FALSE
+
+ beaker1 = new_beaker
+ lower_mass_range = calculate_mass(smallest = TRUE)
+ upper_mass_range = calculate_mass(smallest = FALSE)
+ estimate_time()
else //replace output beaker
if(!QDELETED(beaker2))
try_put_in_hand(beaker2, user)
- beaker2 = new_beaker
- log.Cut()
+ if(!QDELETED(new_beaker))
+ if(!user.transferItemToLoc(new_beaker, src))
+ update_appearance(UPDATE_OVERLAYS)
+ return FALSE
- update_appearance()
+ beaker2 = new_beaker
+ log.Cut()
+
+ update_appearance(UPDATE_OVERLAYS)
+
+ return TRUE
///Computes time to purity reagents
/obj/machinery/chem_mass_spec/proc/estimate_time()
@@ -287,6 +295,8 @@
.["processing"] = processing_reagents
.["eta"] = delay_time - progress_time
.["peakHeight"] = 0
+ var/obj/item/held_item = user.get_active_held_item()
+ .["hasBeakerInHand"] = held_item?.is_chem_container() || FALSE
//input reagents
var/list/beaker1Data = null
@@ -426,6 +436,20 @@
replace_beaker(ui.user, FALSE)
return TRUE
+ if("insert1")
+ var/obj/item/reagent_containers/container = ui.user.get_active_held_item()
+ if(container?.can_insert_container(ui.user, src))
+ replace_beaker(ui.user, TRUE, container)
+
+ return TRUE
+
+ if("insert2")
+ var/obj/item/reagent_containers/container = ui.user.get_active_held_item()
+ if(container?.can_insert_container(ui.user, src))
+ replace_beaker(ui.user, FALSE, container)
+
+ return TRUE
+
/obj/machinery/chem_mass_spec/click_alt(mob/living/user)
if(processing_reagents)
balloon_alert(user, "still processing!")
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index b7204f544fe..ccead379bf7 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -61,7 +61,7 @@
. = CONTEXTUAL_SCREENTIP_SET
return .
- if(is_reagent_container(held_item) && held_item.is_open_container())
+ if(held_item.is_chem_container())
if(!QDELETED(beaker))
context[SCREENTIP_CONTEXT_LMB] = "Replace beaker"
else
@@ -179,18 +179,13 @@
return containers
/obj/machinery/chem_master/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- if(user.combat_mode && !is_reagent_container(tool) && !tool.is_open_container() || (tool.item_flags & ABSTRACT) || (tool.flags_1 & HOLOGRAM_1) || !can_interact(user) || !user.can_perform_action(src, ALLOW_SILICON_REACH | FORBID_TELEKINESIS_REACH))
+ if(!tool.can_insert_container(user, src))
return NONE
+ if(!replace_beaker(user, tool))
+ return ITEM_INTERACT_BLOCKING
- if(is_reagent_container(tool) && tool.is_open_container())
- replace_beaker(user, tool)
- if(!panel_open)
- ui_interact(user)
- return ITEM_INTERACT_SUCCESS
- else
- return ITEM_INTERACT_BLOCKING
-
- return NONE
+ ui_interact(user)
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/chem_master/wrench_act(mob/living/user, obj/item/tool)
if(user.combat_mode)
@@ -230,7 +225,7 @@
return ITEM_INTERACT_SUCCESS
/**
- * Insert, remove, replace the existig beaker
+ * Insert, remove, replace the existig beaker. Returns TRUE on success.
* Arguments
*
* * mob/living/user - the player trying to replace the beaker
@@ -241,10 +236,16 @@
if(!QDELETED(beaker))
try_put_in_hand(beaker, user)
- if(!QDELETED(new_beaker) && user.transferItemToLoc(new_beaker, src))
+ if(!QDELETED(new_beaker))
+ if(!user.transferItemToLoc(new_beaker, src))
+ update_appearance(UPDATE_OVERLAYS)
+ return FALSE
beaker = new_beaker
+
update_appearance(UPDATE_OVERLAYS)
+ return TRUE
+
/obj/machinery/chem_master/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
@@ -302,6 +303,8 @@
.["printingProgress"] = printing_progress
.["printingTotal"] = printing_total
.["selectedPillDuration"] = pill_layers
+ var/obj/item/held_item = user.get_active_held_item()
+ .["hasBeakerInHand"] = held_item?.is_chem_container() || FALSE
//contents of source beaker
var/list/beaker_data = null
@@ -428,6 +431,13 @@
replace_beaker(ui.user)
return TRUE
+ if("insert")
+ var/obj/item/reagent_containers/container = ui.user.get_active_held_item()
+ if(container?.can_insert_container(ui.user, src))
+ replace_beaker(ui.user, container)
+
+ return TRUE
+
if("transfer")
if(is_printing)
say("The buffer is locked while printing.")
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 0d380330700..66f429ac99a 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -333,7 +333,7 @@
/datum/wound/burn/flesh/tea_life_process()
// Sanitizes and heals, but with a limit
flesh_healing = (flesh_healing > 0.1) ? flesh_healing : flesh_healing + 0.02
- infestation_rate = max(infestation_rate - 0.005, 0)
+ infection_rate = max(infection_rate - 0.005, 0)
return TRUE
/datum/reagent/consumable/lemonade
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 6146e6a58f0..c6e04431ca1 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -516,8 +516,8 @@
/datum/wound/burn/flesh/on_salt(reac_volume)
// Slightly sanitizes and disinfects, but also increases infestation rate (some bacteria are aided by salt), and decreases flesh healing (can damage the skin from moisture absorption)
sanitization += VALUE_PER(0.4, 30) * reac_volume
- infestation -= max(VALUE_PER(0.3, 30) * reac_volume, 0)
- infestation_rate += VALUE_PER(0.12, 30) * reac_volume
+ infection -= max(VALUE_PER(0.3, 30) * reac_volume, 0)
+ infection_rate += VALUE_PER(0.12, 30) * reac_volume
flesh_healing -= max(VALUE_PER(5, 30) * reac_volume, 0)
to_chat(victim, span_notice("The salt bits seep in and stick to [LOWER_TEXT(src)], painfully irritating the skin! After a few moments, it feels marginally better."))
@@ -682,7 +682,7 @@
/datum/wound/burn/flesh/on_flour(reac_volume)
to_chat(victim, span_notice("The flour seeps into [LOWER_TEXT(src)], spiking you with intense pain! That probably wasn't a good idea..."))
sanitization -= min(0, 1)
- infestation += 0.2
+ infection += 0.2
return
/datum/reagent/consumable/flour/expose_turf(turf/exposed_turf, reac_volume)
@@ -786,7 +786,7 @@
/datum/wound/burn/flesh/on_starch(reac_volume, mob/living/carbon/carbies)
to_chat(carbies, span_notice("The slimey starch seeps into [LOWER_TEXT(src)], spiking you with intense pain! That probably wasn't a good idea..."))
sanitization -= min(0, 0.5)
- infestation += 0.1
+ infection += 0.1
return
/datum/reagent/consumable/corn_syrup
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index b4a9c7e4e27..a5bff97bf04 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -295,8 +295,8 @@
/datum/wound/burn/flesh/on_saltwater(reac_volume)
// Similar but better stats from normal salt.
sanitization += VALUE_PER(0.6, 30) * reac_volume
- infestation -= max(VALUE_PER(0.5, 30) * reac_volume, 0)
- infestation_rate += VALUE_PER(0.07, 30) * reac_volume
+ infection -= max(VALUE_PER(0.5, 30) * reac_volume, 0)
+ infection_rate += VALUE_PER(0.07, 30) * reac_volume
to_chat(victim, span_notice("The salt water splashes over [LOWER_TEXT(src)], soaking up the... miscellaneous fluids. It feels somewhat better afterwards."))
return
diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm
index a88eddea8ac..823aa1d8a17 100644
--- a/code/modules/reagents/chemistry/recipes/drugs.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs.dm
@@ -77,9 +77,12 @@
e.start(holder.my_atom)
holder.clear_reagents()
+///Amount of meth required to make a crystal
+#define METH_REQUIRED (10)
+
/datum/chemical_reaction/meth_crystal //Since the meth is a cooled pharmaceutical solvent, this precipitates it into a solid.
results = list(/datum/reagent/consumable/ethanol = 1) //we don't care what this reagent is. We only need to record its purity
- required_reagents = list(/datum/reagent/drug/methamphetamine = 10, /datum/reagent/toxin/acid = 2)
+ required_reagents = list(/datum/reagent/drug/methamphetamine = METH_REQUIRED, /datum/reagent/toxin/acid = 2)
mob_react = FALSE
reaction_flags = REACTION_INSTANT
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING
@@ -94,15 +97,18 @@
new_crystal.pixel_y = rand(-6, 6)
new_crystal.color = gradient("#FAFAFA", "#78C8FA", dummy_reagent.creation_purity)
- var/meth_amt = 10
- new_crystal.reagents.add_reagent(/datum/reagent/drug/methamphetamine, meth_amt)
- var/imp_amt = round(meth_amt * (1 - dummy_reagent.creation_purity) * 0.25, 0.1)
+ var/datum/reagents/crystal_reagents = new_crystal.reagents
+ crystal_reagents.clear_reagents()
+ crystal_reagents.add_reagent(/datum/reagent/drug/methamphetamine, METH_REQUIRED)
+ var/imp_amt = METH_REQUIRED * (1 - dummy_reagent.creation_purity) * 0.25
if(imp_amt > 0)
- new_crystal.reagents.add_reagent(/datum/reagent/consumable/failed_reaction, imp_amt)
+ crystal_reagents.add_reagent(/datum/reagent/consumable/failed_reaction, imp_amt)
dummy_reagent.volume = 0
holder.update_total()
+#undef METH_REQUIRED
+
/datum/chemical_reaction/bath_salts
results = list(/datum/reagent/drug/bath_salts = 7)
required_reagents = list(/datum/reagent/toxin/bad_food = 1, /datum/reagent/saltpetre = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/space_cleaner = 1, /datum/reagent/consumable/enzyme = 1, /datum/reagent/consumable/tea = 1, /datum/reagent/mercury = 1)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index c891b012d56..fdeb4d111ac 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -212,12 +212,19 @@
/datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
//pretending this reaction took two ingredients and not three for its effects
+ var/turf/turf = get_turf(holder.my_atom)
var/two_thirds = created_volume / 1.5
var/location = get_turf(holder.my_atom)
+ var/lastkey = holder.my_atom.fingerprintslast
// 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
// 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
- empulse(location, round(two_thirds / 12), round(two_thirds / 7), 1)
+ empulse(location, round(two_thirds / 12), round(two_thirds / 7), 1, emp_source = src)
holder.clear_reagents()
+ if(lastkey)
+ var/mob/toucher = get_mob_by_key(lastkey)
+ toucher.log_message("triggered EMP reaction at [AREACOORD(turf)].", LOG_GAME, log_globally = FALSE)
+ ..()
+
/datum/chemical_reaction/beesplosion
required_reagents = list(/datum/reagent/consumable/honey = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/uranium/radium = 1)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 8299bcb5221..e7a0ede2234 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -264,7 +264,12 @@
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_SLIME | REACTION_TAG_DANGEROUS
/datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
- empulse(get_turf(holder.my_atom), 3, 5)
+ var/turf/turf = get_turf(holder.my_atom)
+ var/lastkey = holder.my_atom.fingerprintslast
+ empulse(get_turf(holder.my_atom), 3, 5, emp_source = src)
+ if(lastkey)
+ var/mob/toucher = get_mob_by_key(lastkey)
+ toucher.log_message("triggered EMP reaction at [AREACOORD(turf)].", LOG_GAME, log_globally = FALSE)
..()
/datum/chemical_reaction/slime/slimecell
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index b1e15dc1efb..11a64616524 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -430,3 +430,6 @@
SEND_SIGNAL(src, COMSIG_REAGENTS_CUP_TRANSFER_FROM, target)
target.update_appearance()
return ITEM_INTERACT_SUCCESS
+
+/obj/item/reagent_containers/is_chem_container()
+ return is_open_container() && !(item_flags & ABSTRACT) && !(flags_1 & HOLOGRAM_1)
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 4d0e4537f52..e40bf4299c5 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -339,7 +339,7 @@
throwSmoke(loc)
else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] melts [exp_on], ionizing the air around it!"))
- empulse(loc, 4, 6)
+ empulse(loc, 4, 6, emp_source = src)
investigate_log("Experimentor has generated an Electromagnetic Pulse.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/modules/research/ordnance/_scipaper.dm b/code/modules/research/ordnance/_scipaper.dm
index f1d94af7631..7d3ea79b332 100644
--- a/code/modules/research/ordnance/_scipaper.dm
+++ b/code/modules/research/ordnance/_scipaper.dm
@@ -102,12 +102,12 @@
if(!tier || !experiment_path || !tracked_variable)
return FALSE
var/gain = calculate_gains(tier)
- for (var/gain_type in 1 to gains.len)
- gains[gain_type] = gain
+ for (var/gain_index in gains)
+ gains[gain_index] = gain
if(!partner_path)
continue
var/datum/scientific_partner/partner = locate(partner_path) in SSresearch.scientific_partners
- gains[gain_type] *= partner.multipliers[gain_type]
+ gains[gain_index] *= partner.multipliers[gain_index]
/** Fully check if our paper have all the required variables, and prevent duplicate papers being published in the same tier.
* Things to check: tier, gain, and partner here. ex_path and record datums in subtypes.
@@ -151,23 +151,23 @@
/datum/scientific_paper/proc/return_gist()
var/list/gist = list()
var/list/transcripted_gains = list(SCIPAPER_COOPERATION_INDEX, SCIPAPER_FUNDING_INDEX)
- for (var/index in 1 to transcripted_gains.len)
+ for (var/gain_index in transcripted_gains)
if (!gains)
- transcripted_gains[index] = "None"
+ transcripted_gains[gain_index] = "None"
continue
- switch (round(gains[index]))
+ switch (round(gains[gain_index]))
if(-INFINITY to 0)
- transcripted_gains[index] = "None"
+ transcripted_gains[gain_index] = "None"
if(1 to 24)
- transcripted_gains[index] = "Little"
+ transcripted_gains[gain_index] = "Little"
if(25 to 49)
- transcripted_gains[index] = "Moderate"
+ transcripted_gains[gain_index] = "Moderate"
if(50 to 99)
- transcripted_gains[index] = "Significant"
+ transcripted_gains[gain_index] = "Significant"
if(100 to INFINITY)
- transcripted_gains[index] = "Huge"
+ transcripted_gains[gain_index] = "Huge"
else
- transcripted_gains[index] = "Undefined"
+ transcripted_gains[gain_index] = "Undefined"
gist["gains"] = transcripted_gains
gist["title"] = title
gist["author"] = author
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index f3b4801f54b..8ed179a3207 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -715,12 +715,12 @@
if(healthcheck && (healthcheck - owner.health) > 5)
owner.visible_message(span_warning("[linked_extract] notices the sudden change in [owner]'s physical health, and activates!"))
do_sparks(5,FALSE,owner)
- var/F = find_safe_turf(zlevel = owner.z, extended_safety_checks = TRUE)
+ var/turf/emergency_turf = find_safe_turf(owner.z, extended_safety_checks = TRUE)
var/range = 0
- if(!F)
- F = get_turf(owner)
+ if(!emergency_turf)
+ emergency_turf = get_turf(owner)
range = 50
- if(do_teleport(owner, F, range, channel = TELEPORT_CHANNEL_BLUESPACE))
+ if(do_teleport(owner, emergency_turf, range, channel = TELEPORT_CHANNEL_BLUESPACE))
to_chat(owner, span_notice("[linked_extract] will take some time to re-align you on the bluespace axis."))
do_sparks(5,FALSE,owner)
owner.apply_status_effect(/datum/status_effect/bluespacestabilization)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 960fa43a61c..ffe23c8e5b4 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -199,7 +199,7 @@
/// Validates whether the target turf can be interacted with.
/obj/machinery/computer/camera_advanced/xenobio/proc/validate_turf(mob/living/user, turf/open/target_turf)
- if(!GLOB.cameranet.checkTurfVis(target_turf))
+ if(!SScameras.is_visible_by_cameras(target_turf))
target_turf.balloon_alert(user, "outside of view!")
return FALSE
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index e01e08f3373..38ae5ae2fb9 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -325,7 +325,8 @@ GLOBAL_LIST_INIT(slime_extract_auto_activate_reactions, init_slime_auto_activate
if(SLIME_ACTIVATE_MAJOR)
user.visible_message(span_warning("[user]'s skin starts flashing intermittently..."), span_warning("Your skin starts flashing intermittently..."))
if(do_after(user, 2.5 SECONDS, target = user))
- empulse(user, 1, 2)
+ empulse(user, 1, 2, emp_source = src)
+ user.log_message("triggered EMP using [src] in [AREACOORD(src)]", LOG_GAME)
user.visible_message(span_warning("[user]'s skin flashes!"), span_warning("Your skin flashes as you emit an electromagnetic pulse!"))
return 600
diff --git a/code/modules/shuttle/misc/special.dm b/code/modules/shuttle/misc/special.dm
index a7f97136382..c38e4c40a38 100644
--- a/code/modules/shuttle/misc/special.dm
+++ b/code/modules/shuttle/misc/special.dm
@@ -7,8 +7,6 @@
name = "Energy Cannon"
desc = "A heavy duty industrial laser."
icon = 'icons/obj/machines/engine/singularity.dmi'
- icon_state = "emitter_+a"
- base_icon_state = "emitter_+a"
anchored = TRUE
density = TRUE
resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | ACID_PROOF
diff --git a/code/modules/shuttle/mobile_port/shuttle_move_callbacks.dm b/code/modules/shuttle/mobile_port/shuttle_move_callbacks.dm
index 25cb748cd94..bb4d69365f3 100644
--- a/code/modules/shuttle/mobile_port/shuttle_move_callbacks.dm
+++ b/code/modules/shuttle/mobile_port/shuttle_move_callbacks.dm
@@ -238,11 +238,11 @@ All ShuttleMove procs go here
. = ..()
if(. & MOVE_AREA)
. |= MOVE_CONTENTS
- GLOB.cameranet.removeCamera(src)
+ SScameras.remove_camera_from_chunk(src)
/obj/machinery/camera/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
- GLOB.cameranet.addCamera(src)
+ SScameras.add_camera_to_chunk(src)
/obj/machinery/mech_bay_recharge_port/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
. = ..()
diff --git a/code/modules/spells/spell_types/cone/cone_of_cold.dm b/code/modules/spells/spell_types/cone/cone_of_cold.dm
index 9327e2c2fad..3b8f880a842 100644
--- a/code/modules/spells/spell_types/cone/cone_of_cold.dm
+++ b/code/modules/spells/spell_types/cone/cone_of_cold.dm
@@ -50,7 +50,7 @@
if(ispath(frozen_status_effect_path) && unfreeze_mob_duration > 0 SECONDS) // 0 duration = don't apply the status effect
var/datum/status_effect/freeze = target_mob.apply_status_effect(frozen_status_effect_path)
if(unfreeze_mob_duration != INFINITY)
- freeze.duration = world.time + unfreeze_mob_duration
+ freeze.duration = unfreeze_mob_duration
if(on_freeze_brute_damage || on_freeze_burn_damage)
target_mob.take_overall_damage(on_freeze_brute_damage, on_freeze_burn_damage)
diff --git a/code/modules/spells/spell_types/conjure_item/_conjure_item.dm b/code/modules/spells/spell_types/conjure_item/_conjure_item.dm
index 3bbdf25fa84..95616c54360 100644
--- a/code/modules/spells/spell_types/conjure_item/_conjure_item.dm
+++ b/code/modules/spells/spell_types/conjure_item/_conjure_item.dm
@@ -72,6 +72,8 @@
if(istype(mob_caster))
mob_caster.put_in_hands(created, del_on_fail = delete_on_failure)
+ post_created(cast_on, created)
+
return ..()
/// Instantiates the item we're conjuring and returns it.
diff --git a/code/modules/spells/spell_types/self/disable_tech.dm b/code/modules/spells/spell_types/self/disable_tech.dm
index 6eea25d6638..bf0feb031ff 100644
--- a/code/modules/spells/spell_types/self/disable_tech.dm
+++ b/code/modules/spells/spell_types/self/disable_tech.dm
@@ -13,7 +13,7 @@
/datum/action/cooldown/spell/emp/cast(atom/cast_on)
. = ..()
- empulse(get_turf(cast_on), emp_heavy, emp_light)
+ empulse(get_turf(cast_on), emp_heavy, emp_light, emp_source = src)
/datum/action/cooldown/spell/emp/disable_tech
name = "Disable Tech"
diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm
index 2e87d6b51b7..f4bc0d95a98 100644
--- a/code/modules/surgery/burn_dressing.dm
+++ b/code/modules/surgery/burn_dressing.dm
@@ -27,7 +27,7 @@
var/datum/wound/burn/flesh/burn_wound = target.get_bodypart(user.zone_selected).get_wound_type(targetable_wound)
// Should be guaranteed to have the wound by this point
ASSERT(burn_wound, "[type] on [target] has no burn wound when it should have been guaranteed to have one by can_start")
- return burn_wound.infestation > 0
+ return burn_wound.infection > 0
//SURGERY STEPS
@@ -52,9 +52,9 @@
/// To give the surgeon a heads up how much work they have ahead of them
/datum/surgery_step/debride/proc/get_progress(mob/user, mob/living/carbon/target, datum/wound/burn/flesh/burn_wound)
- if(!burn_wound?.infestation || !infestation_removed)
+ if(!burn_wound?.infection || !infestation_removed)
return
- var/estimated_remaining_steps = burn_wound.infestation / infestation_removed
+ var/estimated_remaining_steps = burn_wound.infection / infestation_removed
var/progress_text
switch(estimated_remaining_steps)
@@ -72,7 +72,7 @@
/datum/surgery_step/debride/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(surgery.operated_wound)
var/datum/wound/burn/flesh/burn_wound = surgery.operated_wound
- if(burn_wound.infestation <= 0)
+ if(burn_wound.infection <= 0)
to_chat(user, span_notice("[target]'s [target.parse_zone_with_bodypart(user.zone_selected)] has no infected flesh to remove!"))
surgery.status++
repeatable = FALSE
@@ -101,9 +101,9 @@
)
log_combat(user, target, "excised infected flesh in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
target.apply_damage(3, BRUTE, surgery.operated_bodypart, wound_bonus = CANT_WOUND, sharpness = SHARP_EDGED, attacking_item = tool)
- burn_wound.infestation -= infestation_removed
+ burn_wound.infection -= infestation_removed
burn_wound.sanitization += sanitization_added
- if(burn_wound.infestation <= 0)
+ if(burn_wound.infection <= 0)
repeatable = FALSE
else
to_chat(user, span_warning("[target] has no infected flesh there!"))
@@ -124,7 +124,7 @@
if(!..())
return
var/datum/wound/burn/flesh/burn_wound = surgery.operated_wound
- while(burn_wound && burn_wound.infestation > 0.25)
+ while(burn_wound && burn_wound.infection > 0.25)
if(!..())
break
diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm
index 9ff1968395a..b03fa221e3a 100644
--- a/code/modules/surgery/organs/internal/stomach/_stomach.dm
+++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm
@@ -334,7 +334,7 @@
if (isliving(nomnom)) // NO VORE ALLOWED
return 0
// Yeah maybe don't, if something edible ended up here it should either handle itself or not be digested
- if (IsEdible(nomnom))
+ if (IS_EDIBLE(nomnom))
return 0
if (HAS_TRAIT(owner, TRAIT_STRONG_STOMACH))
return 10
@@ -523,7 +523,7 @@
/obj/item/organ/stomach/cybernetic/tier2/stomach_acid_power(atom/movable/nomnom)
if (isliving(nomnom))
return 0
- if (IsEdible(nomnom))
+ if (IS_EDIBLE(nomnom))
return 0
return 20
@@ -539,7 +539,7 @@
/obj/item/organ/stomach/cybernetic/tier3/stomach_acid_power(atom/movable/nomnom)
if (isliving(nomnom))
return 0
- if (IsEdible(nomnom))
+ if (IS_EDIBLE(nomnom))
return 0
return 35
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index b75524bbdf9..b1fe6820609 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -160,6 +160,24 @@
background-color: #282831;
}
+ .clockwork .wrap {
+ border-color: #cfbc47;
+ }
+ .clockwork .content {
+ color: #b18e25;
+ border-color: #cfbc47;
+ background-color: #523c15;
+ }
+
+ .glass .wrap {
+ border-color: #344b58;
+ }
+ .glass .content {
+ color: #75a4c4;
+ border-color: #344b58;
+ background-color: #1f252b;
+ }
+
.trasen-knox .wrap {
border-color: #998e81;
}
@@ -172,7 +190,7 @@
.detective .wrap {
border-color: #2c0f0c;
}
- .detective .wrap {
+ .detective .content {
color: #c7b08b;
border-color: #2c0f0c;
background-color: #221c1a;
diff --git a/code/modules/transport/elevator/elev_music_zone.dm b/code/modules/transport/elevator/elev_music_zone.dm
index a4223bc33c2..78549534e8a 100644
--- a/code/modules/transport/elevator/elev_music_zone.dm
+++ b/code/modules/transport/elevator/elev_music_zone.dm
@@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(elevator_music)
/// Sound loop type to use
var/soundloop_type = /datum/looping_sound/local_forecast
/// Proximity monitor which handles playing sounds to clients
- var/datum/proximity_monitor/advanced/elevator_music_area/sound_player
+ var/datum/proximity_monitor/elevator_music_area/sound_player
/obj/effect/abstract/elevator_music_zone/Initialize(mapload)
. = ..()
@@ -27,6 +27,7 @@ GLOBAL_LIST_EMPTY(elevator_music)
/obj/effect/abstract/elevator_music_zone/Destroy(force)
GLOB.elevator_music -= src
+ QDEL_NULL(sound_player)
return ..()
/obj/effect/abstract/elevator_music_zone/proc/link_to_panel(atom/elevator_panel)
@@ -50,8 +51,7 @@ GLOBAL_LIST_EMPTY(elevator_music)
qdel(src)
/// Load or unload a looping sound when mobs enter or exit the area
-/datum/proximity_monitor/advanced/elevator_music_area
- edge_is_a_field = TRUE
+/datum/proximity_monitor/elevator_music_area
/// Are we currently playing sounds?
var/enabled = TRUE
/// Looping sound datum type to play
@@ -59,15 +59,16 @@ GLOBAL_LIST_EMPTY(elevator_music)
/// Assoc list of mobs to sound loops currently playing
var/list/tracked_mobs = list()
-/datum/proximity_monitor/advanced/elevator_music_area/New(atom/_host, range, _ignore_if_not_on_turf, soundloop_type)
+/datum/proximity_monitor/elevator_music_area/New(atom/_host, range, _ignore_if_not_on_turf, soundloop_type)
. = ..()
src.soundloop_type = soundloop_type
-/datum/proximity_monitor/advanced/elevator_music_area/Destroy()
+/datum/proximity_monitor/elevator_music_area/Destroy()
QDEL_LIST_ASSOC_VAL(tracked_mobs)
return ..()
-/datum/proximity_monitor/advanced/elevator_music_area/field_turf_crossed(mob/entered, turf/old_location, turf/new_location)
+/datum/proximity_monitor/elevator_music_area/on_entered(turf/new_location, mob/entered, turf/old_location)
+ . = ..()
if (!istype(entered) || !entered.mind)
return
@@ -82,31 +83,32 @@ GLOBAL_LIST_EMPTY(elevator_music)
tracked_mobs[entered] = null // Still add it to the list so we don't keep making this check
RegisterSignal(entered, COMSIG_QDELETING, PROC_REF(mob_destroyed))
-/datum/proximity_monitor/advanced/elevator_music_area/field_turf_uncrossed(mob/exited, turf/old_location, turf/new_location)
+/datum/proximity_monitor/elevator_music_area/on_uncrossed(turf/old_location, mob/exited, direction)
+ . = ..()
if (!(exited in tracked_mobs))
return
- if ((new_location in field_turfs) || (new_location in edge_turfs))
+ if(get_dist(host, exited) <= current_range)
return
qdel(tracked_mobs[exited])
tracked_mobs -= exited
UnregisterSignal(exited, COMSIG_QDELETING)
/// Remove references on mob deletion
-/datum/proximity_monitor/advanced/elevator_music_area/proc/mob_destroyed(mob/former_mob)
+/datum/proximity_monitor/elevator_music_area/proc/mob_destroyed(mob/former_mob)
SIGNAL_HANDLER
if (former_mob in tracked_mobs)
qdel(tracked_mobs[former_mob])
tracked_mobs -= former_mob
/// Start sound loops playing
-/datum/proximity_monitor/advanced/elevator_music_area/proc/turn_on()
+/datum/proximity_monitor/elevator_music_area/proc/turn_on()
enabled = TRUE
for (var/mob in tracked_mobs)
var/datum/looping_sound/loop = tracked_mobs[mob]
loop.start()
/// Stop active sound loops
-/datum/proximity_monitor/advanced/elevator_music_area/proc/turn_off()
+/datum/proximity_monitor/elevator_music_area/proc/turn_off()
enabled = FALSE
for (var/mob in tracked_mobs)
var/datum/looping_sound/loop = tracked_mobs[mob]
diff --git a/code/modules/transport/tram/tram_doors.dm b/code/modules/transport/tram/tram_doors.dm
index 17173e79cd9..95c1e1c386f 100644
--- a/code/modules/transport/tram/tram_doors.dm
+++ b/code/modules/transport/tram/tram_doors.dm
@@ -54,7 +54,6 @@
set_density(FALSE)
if(!isnull(filler))
filler.set_density(FALSE)
- update_freelook_sight()
flags_1 &= ~PREVENT_CLICK_UNDER_1
air_update_turf(TRUE, FALSE)
var/open_delay = animation_segment_delay(AIRLOCK_OPENING_FINISHED) - passable_delay
@@ -113,7 +112,6 @@
set_density(TRUE)
if(!isnull(filler))
filler.set_density(TRUE)
- update_freelook_sight()
flags_1 |= PREVENT_CLICK_UNDER_1
air_update_turf(TRUE, TRUE)
crush()
diff --git a/code/modules/transport/tram/tram_floors.dm b/code/modules/transport/tram/tram_floors.dm
index 8310507965f..623b13896f7 100644
--- a/code/modules/transport/tram/tram_floors.dm
+++ b/code/modules/transport/tram/tram_floors.dm
@@ -15,7 +15,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- tiled_dirt = FALSE
+ tiled_turf = FALSE
rcd_proof = TRUE
/turf/open/floor/tram/examine(mob/user)
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 1fb321b60b2..79f308073fe 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -87,6 +87,7 @@
#define EASY_ALLOCATE(arguments...) allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left, ##arguments)
// BEGIN_INCLUDE
+#include "aas_configs.dm"
#include "abductor_baton_spell.dm"
#include "ablative_hud.dm"
#include "achievements.dm"
@@ -261,6 +262,7 @@
#include "reagent_names.dm"
#include "reagent_recipe_collisions.dm"
#include "reagent_transfer.dm"
+#include "recycle_recycling.dm"
#include "required_map_items.dm"
#include "resist.dm"
#include "reta_system.dm"
diff --git a/code/modules/unit_tests/aas_configs.dm b/code/modules/unit_tests/aas_configs.dm
new file mode 100644
index 00000000000..30b82619dd7
--- /dev/null
+++ b/code/modules/unit_tests/aas_configs.dm
@@ -0,0 +1,10 @@
+/datum/unit_test/aas_configs
+
+/datum/unit_test/aas_configs/Run()
+ var/expected_max_length = MAX_AAS_LENGTH
+
+ for(var/config_type in valid_subtypesof(/datum/aas_config_entry))
+ var/datum/aas_config_entry/entry = allocate(config_type)
+ for(var/key, line in entry.announcement_lines_map)
+ if(length_char(line) > expected_max_length)
+ TEST_FAIL("Announcement line '[key]' in config '[config_type]' exceeds max length of [expected_max_length] characters (actual length: [length(line)])")
diff --git a/code/modules/unit_tests/burning.dm b/code/modules/unit_tests/burning.dm
index daf99875f28..a23d5423c27 100644
--- a/code/modules/unit_tests/burning.dm
+++ b/code/modules/unit_tests/burning.dm
@@ -10,8 +10,8 @@
TEST_ASSERT(dummy.on_fire, "Dummy is not on fire despite having 20 fire stacks and being ignited.")
// Manually tick it a few times
var/datum/status_effect/fire_handler/fire_stacks/handler = locate() in dummy.status_effects
+ handler.tick_interval = STATUS_EFFECT_AUTO_TICK
for(var/i in 1 to 5)
- handler.tick_interval = world.time - 1
- handler.process()
+ handler.process(1)
TEST_ASSERT(dummy.fire_stacks < 20, "Dummy should have decayed firestacks, but did not. (Dummy stacks: [dummy.fire_stacks]).")
TEST_ASSERT(dummy.bodytemperature > initial_temp, "Dummy did not heat up despite being on fire. (Dummy temp: [dummy.bodytemperature], initial temp: [initial_temp])")
diff --git a/code/modules/unit_tests/mob_damage.dm b/code/modules/unit_tests/mob_damage.dm
index 1cc63466bc9..5567e3aa454 100644
--- a/code/modules/unit_tests/mob_damage.dm
+++ b/code/modules/unit_tests/mob_damage.dm
@@ -608,7 +608,7 @@
TEST_ASSERT_NOTNULL(tox_effect, "Dummy didn't get tox_vomit status effect despite at [dummy.getToxLoss()] toxin damage (Method: SET)!")
// Clear the toxin damage away, and force a status effect tick: It should delete itself
dummy.setToxLoss(0)
- tox_effect.tick(initial(tox_effect.tick_interval))
+ tox_effect.tick(tox_effect.tick_interval)
TEST_ASSERT(QDELETED(tox_effect), "Dummy still has tox_vomit status effect despite at [dummy.getToxLoss()] toxin damage (Method: SET)!")
// Test another method of gaining tox damage, use an entirely clean slate just to be sure
var/mob/living/carbon/human/dummy_two = allocate(/mob/living/carbon/human/consistent)
diff --git a/code/modules/unit_tests/recycle_recycling.dm b/code/modules/unit_tests/recycle_recycling.dm
new file mode 100644
index 00000000000..38d3ed690c9
--- /dev/null
+++ b/code/modules/unit_tests/recycle_recycling.dm
@@ -0,0 +1,84 @@
+// Unit tests for recycler machine.
+
+/// Tests that holographic item are properly processed - deleted while preserving real contents.
+/datum/unit_test/recycler_hologram
+
+/datum/unit_test/recycler_hologram/Run()
+ var/obj/machinery/recycler/recycler = allocate(/obj/machinery/recycler/deathtrap, get_step(run_loc_floor_bottom_left, EAST))
+ var/obj/structure/closet/hologram_closet = allocate(/obj/structure/closet, run_loc_floor_bottom_left)
+ // Hologram closet that could contain non-holographic objects.
+ hologram_closet.flags_1 |= HOLOGRAM_1
+ // Add real, non-holographic cookie.
+ var/obj/item/food/cookie/real_cookie = allocate(/obj/item/food/cookie, hologram_closet)
+ // And a real human being.
+ var/mob/living/carbon/human/assistant = allocate(/mob/living/carbon/human/consistent, hologram_closet)
+ // Abstract cookie won't be recycled. But will be deleted if the contents of hologram aren't managed.
+ real_cookie.item_flags |= ABSTRACT
+ // Process the hologram through the recycler.
+ hologram_closet.forceMove(get_turf(recycler))
+ // Check that hologram was properly deleted.
+ TEST_ASSERT(QDELETED(hologram_closet), "Hologram item was not deleted after processing")
+ // Check that real items were moved to recycler location (not deleted).
+ TEST_ASSERT(!QDELETED(real_cookie), "Non-holographic contents of holographic object was incorrectly deleted with hologram")
+ // Check that mobs were moved to recycler location (not deleted).
+ TEST_ASSERT(!QDELETED(assistant), "Mob inside of holographic object was incorrectly deleted with hologram")
+ TEST_ASSERT_EQUAL(assistant.loc, get_turf(recycler), "Mob inside of holographic object was not moved to recycler location")
+ TEST_ASSERT_EQUAL(real_cookie.loc, get_turf(recycler), "Non-holographic contents of holographic object was not moved to recycler location")
+
+/// Tests that recycler properly handles indestructible item.
+/datum/unit_test/recycler_indestructible_item
+
+/datum/unit_test/recycler_indestructible_item/Run()
+ var/obj/machinery/recycler/recycler = allocate(/obj/machinery/recycler/deathtrap, get_step(run_loc_floor_bottom_left, EAST))
+ // Create indestructible cookie.
+ var/obj/item/food/cookie/indestructible_cookie = allocate(/obj/item/food/cookie, run_loc_floor_bottom_left)
+ indestructible_cookie.resistance_flags |= INDESTRUCTIBLE
+ // Try to process indestructible cookie.
+ indestructible_cookie.forceMove(get_turf(recycler))
+ // Cookie should still exist.
+ TEST_ASSERT(!QDELETED(indestructible_cookie), "Indestructible item was recycled")
+
+/// Tests that recycler properly handles abstract item.
+/datum/unit_test/recycler_abstract_item
+
+/datum/unit_test/recycler_abstract_item/Run()
+ var/obj/machinery/recycler/recycler = allocate(/obj/machinery/recycler/deathtrap, get_step(run_loc_floor_bottom_left, EAST))
+ // Create abstract cookie.
+ var/obj/item/food/cookie/abstract_cookie = allocate(/obj/item/food/cookie, run_loc_floor_bottom_left)
+ abstract_cookie.item_flags |= ABSTRACT
+ // Try to process abstract cookie.
+ abstract_cookie.forceMove(get_turf(recycler))
+ // Cookie should still exist.
+ TEST_ASSERT(!QDELETED(abstract_cookie), "Abstract item was recycled")
+
+/// Tests that brains trigger safety mode in the recycler.
+/datum/unit_test/recycler_brain_safety
+
+/datum/unit_test/recycler_brain_safety/Run()
+ var/obj/machinery/recycler/recycler = allocate(/obj/machinery/recycler, get_step(run_loc_floor_bottom_left, EAST))
+ var/mob/living/brain/test_brain = allocate(/mob/living/brain, run_loc_floor_bottom_left)
+ // Process brain - should trigger safety mode.
+ test_brain.forceMove(get_turf(recycler))
+ // Should enter safety mode.
+ TEST_ASSERT(recycler.safety_mode, "Recycler did not enter safety mode when processing brain")
+ // Brain should not be deleted.
+ TEST_ASSERT(!QDELETED(test_brain), "Brain was incorrectly deleted in safety mode")
+
+/// Tests that MMI with brain triggers safety mode.
+/datum/unit_test/recycler_mmi_with_brain_safety
+
+/datum/unit_test/recycler_mmi_with_brain_safety/Run()
+ var/obj/machinery/recycler/recycler = allocate(/obj/machinery/recycler, get_step(run_loc_floor_bottom_left, EAST))
+ var/obj/item/mmi/test_mmi = allocate(/obj/item/mmi, run_loc_floor_bottom_left)
+ var/mob/living/brain/test_brain = allocate(/mob/living/brain, run_loc_floor_bottom_left)
+ // Insert brain into MMI.
+ test_mmi.brain = test_brain
+ test_brain.forceMove(test_mmi)
+ // Process MMI with brain - should trigger safety mode.
+ test_mmi.forceMove(get_turf(recycler))
+ // Should enter safety mode.
+ TEST_ASSERT(recycler.safety_mode, "Recycler did not enter safety mode when processing MMI with brain")
+ // MMI should not be deleted.
+ TEST_ASSERT(!QDELETED(test_mmi), "MMI with brain was incorrectly deleted in safety mode")
+ // Brain should still be intact inside MMI.
+ TEST_ASSERT(!QDELETED(test_mmi.brain), "Brain was deleted during safety mode processing")
diff --git a/code/modules/unit_tests/status_effect_validity.dm b/code/modules/unit_tests/status_effect_validity.dm
index 44c7b391610..e9c7cd70c90 100644
--- a/code/modules/unit_tests/status_effect_validity.dm
+++ b/code/modules/unit_tests/status_effect_validity.dm
@@ -8,23 +8,95 @@
var/tick_speed = initial(checking.tick_interval)
if(tick_speed == STATUS_EFFECT_NO_TICK)
continue
+ if(tick_speed < 0)
+ TEST_FAIL("Status effect [checking] has tick_interval set to a negative value other than STATUS_EFFECT_NO_TICK, this is not how you prevent ticks - use tick_interval = STATUS_EFFECT_NO_TICK instead.")
+ continue
if(tick_speed == INFINITY)
TEST_FAIL("Status effect [checking] has tick_interval set to INFINITY, this is not how you prevent ticks - use tick_interval = STATUS_EFFECT_NO_TICK instead.")
continue
switch(initial(checking.processing_speed))
if(STATUS_EFFECT_FAST_PROCESS)
- if(tick_speed < SSfastprocess.wait && tick_speed != STATUS_EFFECT_AUTO_TICK)
- TEST_FAIL("Status effect [checking] has tick_interval set to [tick_speed], which is faster than SSfastprocess can tick ([SSfastprocess.wait]).")
+ if(tick_speed % SSfastprocess.wait != 0 && tick_speed != STATUS_EFFECT_AUTO_TICK)
+ TEST_FAIL("Status effect [checking] has tick_interval set to [tick_speed], which is not a multiple of SSfastprocess wait time ([SSfastprocess.wait]).")
if(STATUS_EFFECT_NORMAL_PROCESS)
- if(tick_speed < SSprocessing.wait && tick_speed != STATUS_EFFECT_AUTO_TICK)
- TEST_FAIL("Status effect [checking] has tick_interval set to [tick_speed], which is faster than SSprocessing can tick ([SSprocessing.wait]).")
+ if(tick_speed % SSprocessing.wait != 0 && tick_speed != STATUS_EFFECT_AUTO_TICK)
+ TEST_FAIL("Status effect [checking] has tick_interval set to [tick_speed], which is not a multiple of SSprocessing wait time ([SSprocessing.wait]).")
if(STATUS_EFFECT_PRIORITY)
var/priority_wait = world.tick_lag * SSpriority_effects.wait // SSpriority_effects has the SS_TICKER flag, so its wait is in ticks, so we have to convert it to deciseconds.
- if(tick_speed < priority_wait && tick_speed != STATUS_EFFECT_AUTO_TICK)
- TEST_FAIL("Status effect [checking] has tick_interval set to [tick_speed], which is faster than SSpriority_effects can tick ([priority_wait]).")
+ if(tick_speed % priority_wait != 0 && tick_speed != STATUS_EFFECT_AUTO_TICK)
+ TEST_FAIL("Status effect [checking] has tick_interval set to [tick_speed], which is not a multiple of SSpriority_effects wait time ([priority_wait]).")
else
TEST_FAIL("Invalid processing speed for status effect [checking] : [initial(checking.processing_speed)]")
+/// Validates status effect duration setup
+/datum/unit_test/status_effect_duration
+
+/datum/unit_test/status_effect_duration/Run()
+ for(var/datum/status_effect/checking as anything in subtypesof(/datum/status_effect))
+ if(initial(checking.id) == STATUS_EFFECT_ID_ABSTRACT)
+ continue
+ var/duration = initial(checking.duration)
+ if(duration == STATUS_EFFECT_PERMANENT)
+ continue
+ if(duration == INFINITY) // for some god forsaken reason, this is allowed
+ continue
+ if(duration < 0)
+ TEST_FAIL("Status effect [checking] has duration set to a negative value other than STATUS_EFFECT_PERMANENT, this is not how you make effects last forever - use duration = STATUS_EFFECT_PERMANENT instead.")
+ continue
+ switch(initial(checking.processing_speed))
+ if(STATUS_EFFECT_FAST_PROCESS)
+ if(duration % SSfastprocess.wait != 0)
+ TEST_FAIL("Status effect [checking] has duration set to [duration], which is not a multiple of SSfastprocess wait time ([SSfastprocess.wait]).")
+ if(STATUS_EFFECT_NORMAL_PROCESS)
+ if(duration % SSprocessing.wait != 0)
+ TEST_FAIL("Status effect [checking] has duration set to [duration], which is not a multiple of SSprocessing wait time ([SSprocessing.wait]).")
+ if(STATUS_EFFECT_PRIORITY)
+ var/priority_wait = world.tick_lag * SSpriority_effects.wait // SSpriority_effects has the SS_TICKER flag, so its wait is in ticks, so we have to convert it to deciseconds.
+ if(duration % priority_wait != 0)
+ TEST_FAIL("Status effect [checking] has duration set to [duration], which is not a multiple of SSpriority_effects wait time ([priority_wait]).")
+ else
+ TEST_FAIL("Invalid processing speed for status effect [checking] : [initial(checking.processing_speed)]")
+
+/// Validates that status effect tick counts are directly proportional to duration, and that seconds_between_ticks added up is equal to duration.
+/datum/unit_test/status_effect_tick_counts
+
+/datum/unit_test/status_effect_tick_counts/Run()
+ var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+
+ var/datum/status_effect/unit_test_tick_counter/counter = user.apply_status_effect(/datum/status_effect/unit_test_tick_counter)
+
+ // The 0.2 here and in the for loop is arbitrary and can be any value that divides evenly into the duration and tick interval of the unit test status effect.
+ // I chose 0.2 specifically because it just happens to be the SSfastprocess.wait in seconds, which basically simulates this status effect running on SSfastprocess.
+ var/ticks_required = counter.duration / 10 / 0.2 + 1
+
+ for (var/i in 1 to ticks_required)
+ if (!QDELETED(counter))
+ counter.process(0.2)
+
+ var/expected_tick_count = initial(counter.duration) / counter.tick_interval
+ if (abs(counter.total_tick_count - expected_tick_count) > 0.01)
+ TEST_FAIL("Status effect tick count is not directly proportional to duration. Expected [expected_tick_count] ticks, got [counter.total_tick_count] ticks.")
+
+ var/expected_seconds = initial(counter.duration) / 10
+ if (abs(counter.total_seconds - expected_seconds) > 0.01)
+ TEST_FAIL("Status effect seconds_between_ticks accumulated together does not equal duration. Expected [expected_seconds] seconds, got [counter.total_seconds] seconds.")
+
+ QDEL_NULL(counter)
+
+/datum/status_effect/unit_test_tick_counter
+ duration = 10 SECONDS
+ tick_interval = 0.4 SECONDS
+
+ id = "unit_test_tick_counter"
+ alert_type = null
+
+ var/total_tick_count = 0
+ var/total_seconds = 0
+
+/datum/status_effect/unit_test_tick_counter/tick(seconds_between_ticks)
+ total_tick_count++
+ total_seconds += seconds_between_ticks
+
/// Validates status effect alert type setup
/datum/unit_test/status_effect_alert
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index ed8cc80d50f..b89fff956df 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -209,7 +209,7 @@
QDEL_NULL(gun_reward.pin)
var/obj/item/firing_pin/pin = new
- pin.gun_insert(new_gun = gun_reward)
+ pin.gun_insert(new_gun = gun_reward, starting = TRUE)
///For special overrides if an item can be bought or not.
/datum/uplink_item/proc/can_be_bought(datum/uplink_handler/source)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index 82b69a43f8b..a418950f1d3 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -249,8 +249,8 @@
log_message("[src.name] created.", LOG_MECHA)
GLOB.mechas_list += src //global mech list
prepare_huds()
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.add_atom_to_hud(src)
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.add_atom_to_hud(src)
diag_hud_set_mechhealth()
diag_hud_set_mechcell()
diag_hud_set_mechstat()
@@ -305,8 +305,8 @@
QDEL_NULL(chassis_camera)
GLOB.mechas_list -= src //global mech list
- for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
- diag_hud.remove_atom_from_hud(src) //YEET
+ var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+ diag_hud.remove_atom_from_hud(src) //YEET
return ..()
///Add parts on mech spawning. Skipped in manual construction.
diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
index f031e06ecf8..f5bf2fed81c 100644
--- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -154,7 +154,7 @@
to_chat(AI, span_danger("ZZUZULU.ERR--ERRR-NEUROLOG-- PERCEP--- DIST-B**@"))
for(var/count in 1 to 5)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(do_sparks), rand(10, 20), FALSE, AI), count SECONDS)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(empulse), get_turf(AI), /*heavy_range = */10, /*light_range = */20), 10 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(empulse), get_turf(AI), /*heavy_range = */10, /*light_range = */20, AI), 10 SECONDS)
return ..()
else if(isliving(M))
mob_container = M
diff --git a/code/modules/vehicles/mecha/mecha_movement.dm b/code/modules/vehicles/mecha/mecha_movement.dm
index b5817d81378..46b49cc2ee5 100644
--- a/code/modules/vehicles/mecha/mecha_movement.dm
+++ b/code/modules/vehicles/mecha/mecha_movement.dm
@@ -205,6 +205,6 @@
*/
/obj/vehicle/sealed/mecha/proc/do_camera_update(oldLoc)
if(oldLoc != get_turf(src))
- GLOB.cameranet.updatePortableCamera(chassis_camera, MECH_CAMERA_BUFFER)
+ SScameras.update_portable_camera(chassis_camera, MECH_CAMERA_BUFFER)
updating = FALSE
#undef MECH_CAMERA_BUFFER
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 437ffe28cc3..41b362917e4 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -52,6 +52,7 @@
/obj/item/clothing/accessory/waistcoat = 4,
/obj/item/clothing/suit/toggle/suspenders = 4,
/obj/item/clothing/neck/tie/horrible = 3,
+ /obj/item/clothing/neck/robe_cape = 3,
/obj/item/clothing/glasses/regular = 3,
/obj/item/clothing/glasses/regular/jamjar = 3,
/obj/item/clothing/glasses/orange = 3,
diff --git a/code/modules/vending/vendor/interaction.dm b/code/modules/vending/vendor/interaction.dm
index 7796545b719..38b3be4ea99 100644
--- a/code/modules/vending/vendor/interaction.dm
+++ b/code/modules/vending/vendor/interaction.dm
@@ -98,7 +98,10 @@
break
/obj/machinery/vending/item_interaction(mob/living/user, obj/item/attack_item, list/modifiers)
- . = NONE
+ . = ..()
+ if(. & ITEM_INTERACT_ANY_BLOCKER)
+ return .
+
if(panel_open && is_wire_tool(attack_item))
wires.interact(user)
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/wiremod/components/atom/remotecam.dm b/code/modules/wiremod/components/atom/remotecam.dm
index bbbab6043af..070d164c01c 100644
--- a/code/modules/wiremod/components/atom/remotecam.dm
+++ b/code/modules/wiremod/components/atom/remotecam.dm
@@ -189,7 +189,7 @@
/obj/item/circuit_component/remotecam/proc/update_camera_location(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
SIGNAL_HANDLER
if(current_camera_state && current_cameranet_state)
- GLOB.cameranet.updatePortableCamera(shell_camera, 0.5 SECONDS)
+ SScameras.update_portable_camera(shell_camera, 0.5 SECONDS)
/**
* Add camera from global cameranet
@@ -197,8 +197,8 @@
/obj/item/circuit_component/remotecam/proc/cameranet_add()
if(current_cameranet_state)
return
- GLOB.cameranet.cameras += shell_camera
- GLOB.cameranet.addCamera(shell_camera)
+ SScameras.cameras += shell_camera
+ SScameras.add_camera_to_chunk(shell_camera)
current_cameranet_state = TRUE
/**
@@ -207,8 +207,8 @@
/obj/item/circuit_component/remotecam/proc/cameranet_remove()
if(!current_cameranet_state)
return
- GLOB.cameranet.removeCamera(shell_camera)
- GLOB.cameranet.cameras -= shell_camera
+ SScameras.remove_camera_from_chunk(shell_camera)
+ SScameras.cameras -= shell_camera
current_cameranet_state = FALSE
/**
diff --git a/config/jukebox_music/README.txt b/config/jukebox_music/README.txt
index 9abe0e3e567..97027c657da 100644
--- a/config/jukebox_music/README.txt
+++ b/config/jukebox_music/README.txt
@@ -1,4 +1,5 @@
-The enclosed /sounds folder holds the sound files used for player selectable songs for an ingame jukebox. OGG and WAV are supported.
+The enclosed /sounds folder holds the sound files used for player selectable songs for an ingame jukebox.
+OGG is the recommended sound format but see code/controllers/subsystem/sounds.dm for the rest of the supported ones.
Using unnecessarily huge sounds can cause client side lag and should be avoided.
diff --git a/config/resources.txt b/config/resources.txt
index 318730caa55..c47aabc67de 100644
--- a/config/resources.txt
+++ b/config/resources.txt
@@ -44,3 +44,12 @@ EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip
#
#
#
+
+# If configured, this allows server operators to define the persistent origin used for clientside
+# storage. This must host the same file as available in tgui/public/iframe.html. This is also hosted
+# on the GitHub Pages site for the /tg/station repository, so does not need to be configured.
+# If multiple servers use the same domain name, clientside features such as message saving
+# and chat tabs will be persistent across both.
+# If this setting is not configured, but the webroot CDN is, that will be used instead of GitHub Pages.
+# If this setting is mpty, and the webroot CDN is disabled, byondstorage will be used.
+# STORAGE_CDN_IFRAME https://tgstation.github.io/byond-client-storage/iframe.html
diff --git a/config/title_music/README.txt b/config/title_music/README.txt
index 42e97970020..48707bfd7b9 100644
--- a/config/title_music/README.txt
+++ b/config/title_music/README.txt
@@ -1,4 +1,5 @@
-The enclosed /sounds folder holds the sound files used as the title music for the game. OGG and WAV are supported.
+The enclosed /sounds folder holds the sound files used as the title music for the game.
+OGG is the recommended sound format but see code/controllers/subsystem/sounds.dm for the rest of the supported ones.
Using unnecessarily huge sounds can cause client side lag and should be avoided.
@@ -23,7 +24,7 @@ Map Title Sounds:
Map sounds are tied to a specific in game map. To make a map title you format the name like this "(name of a map)+(name of your sound)"
-The spelling of the map name is important. It must match exactly the define MAP_NAME found in the relevant .DM file in the /_maps folder in
+The spelling of the map name is important. It must match exactly the define MAP_NAME found in the relevant .DM file in the /_maps folder in
the root directory. It can also be seen in game in the status menu. Note that there are no spaces between the two names.
It is absolutely fine to have more than one sound tied to the same map. It's also fine to have a rare map sound.
diff --git a/html/changelogs/AutoChangeLog-pr-93655.yml b/html/changelogs/AutoChangeLog-pr-93655.yml
new file mode 100644
index 00000000000..c62097b906f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93655.yml
@@ -0,0 +1,4 @@
+author: "necromanceranne"
+delete-after: True
+changes:
+ - qol: "You can now backflip."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93754.yml b/html/changelogs/AutoChangeLog-pr-93754.yml
deleted file mode 100644
index 88be8ac93dc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-93754.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Vishenka0704"
-delete-after: True
-changes:
- - bugfix: "yellow stabilized/regenerative extract, glowshroom cap, voltaic cybernetic heart now recharges cells of mob equipment"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93771.yml b/html/changelogs/AutoChangeLog-pr-93771.yml
deleted file mode 100644
index 71dd3d82f74..00000000000
--- a/html/changelogs/AutoChangeLog-pr-93771.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - bugfix: "Makes sure that Sleeping Carp's harm combos can be properly blocked."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93773.yml b/html/changelogs/AutoChangeLog-pr-93773.yml
deleted file mode 100644
index 87ce860df89..00000000000
--- a/html/changelogs/AutoChangeLog-pr-93773.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - spellcheck: "Krav Maga has been renamed to Kaza Ruk, themed around being a Tiziran martial art."
- - balance: "Kaza Ruk no longer overrides normal punches."
- - balance: "Kaza Ruk now sometimes performs a rapid followup attack after a normal punch, dealing less damage but with decent wounding power."
- - balance: "Kaza Ruk causes more damage when a grabbed target fails to escape their grab, and it is harder to escape their grabs."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93784.yml b/html/changelogs/AutoChangeLog-pr-93784.yml
deleted file mode 100644
index 487daa2869a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-93784.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - bugfix: "You must be adjacent to mirrors to use them"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93837.yml b/html/changelogs/AutoChangeLog-pr-93837.yml
new file mode 100644
index 00000000000..1ac34a122d1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93837.yml
@@ -0,0 +1,6 @@
+author: "paganiy"
+delete-after: True
+changes:
+ - bugfix: "Fixed recycler deconstruction."
+ - bugfix: "Holograms now properly drop their contents when processed in recycler instead of deleting them."
+ - code_imp: "Cleaned up recycler code."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93850.yml b/html/changelogs/AutoChangeLog-pr-93850.yml
new file mode 100644
index 00000000000..c3b8b2b2b84
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93850.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "bridge assistant and veteran advisor PDAs (inside backpack) are now imprinted automatically"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93856.yml b/html/changelogs/AutoChangeLog-pr-93856.yml
new file mode 100644
index 00000000000..a2825e0c980
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93856.yml
@@ -0,0 +1,4 @@
+author: "timothymtorres"
+delete-after: True
+changes:
+ - code_imp: "Add correct code documentation for object flags"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93863.yml b/html/changelogs/AutoChangeLog-pr-93863.yml
new file mode 100644
index 00000000000..6b1a9def68e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93863.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - bugfix: "Luxury paywall lasers no longer drop their pins when spawned"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93883.yml b/html/changelogs/AutoChangeLog-pr-93883.yml
new file mode 100644
index 00000000000..ed399b81e27
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93883.yml
@@ -0,0 +1,4 @@
+author: "RikuTheKiller"
+delete-after: True
+changes:
+ - bugfix: "High-priority status effects like stuns no longer process (and thus expire) twice as quickly as they should."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-93885.yml b/html/changelogs/AutoChangeLog-pr-93885.yml
new file mode 100644
index 00000000000..c2c8e22486e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-93885.yml
@@ -0,0 +1,4 @@
+author: "lelandkemble"
+delete-after: True
+changes:
+ - spellcheck: "Adds self-message to clown pockets spell"
\ No newline at end of file
diff --git a/html/changelogs/archive/2025-11.yml b/html/changelogs/archive/2025-11.yml
index b64a3d338f6..b4969bca907 100644
--- a/html/changelogs/archive/2025-11.yml
+++ b/html/changelogs/archive/2025-11.yml
@@ -176,3 +176,176 @@
vinylspiders:
- admin: added new admin verb, 'Mass Modify Traits', which can be used to add or
remove a trait to/from every living mob.
+2025-11-06:
+ Melbert:
+ - bugfix: You must be adjacent to mirrors to use them
+ Vishenka0704:
+ - bugfix: yellow stabilized/regenerative extract, glowshroom cap, voltaic cybernetic
+ heart now recharges cells of mob equipment
+ necromanceranne:
+ - bugfix: Makes sure that Sleeping Carp's harm combos can be properly blocked.
+ - spellcheck: Krav Maga has been renamed to Kaza Ruk, themed around being a Tiziran
+ martial art.
+ - balance: Kaza Ruk no longer overrides normal punches.
+ - balance: Kaza Ruk now sometimes performs a rapid followup attack after a normal
+ punch, dealing less damage but with decent wounding power.
+ - balance: Kaza Ruk causes more damage when a grabbed target fails to escape their
+ grab, and it is harder to escape their grabs.
+2025-11-07:
+ Aliceee2ch:
+ - bugfix: Added missing gas sensors in SM chamber on WawaStation.
+ - image: Updated old sprites for fauna health huds and spacesuit cell status.
+ Fghj240:
+ - qol: empaths are only scared by evil people the first time they see one
+ - balance: empaths no longer get a mood debuff from seeing an evil person
+ - code_imp: empath is now a component instead of a trait
+ - balance: moon heretic empaths can't be smited or scared by evil people
+ LT3:
+ - bugfix: Fixed Clockwork, Glass, and Detective tooltip styling
+ - bugfix: Fixed Trasen-Knox and Detective UI highlighting
+ hry-gh:
+ - bugfix: you should experience less stutters every 10 seconds
+ - server: server operators can now configure an alternative storage domain for clientside
+ data storage, read the example configuration for more
+2025-11-08:
+ Aliceee2ch:
+ - image: Resprited every food in bowl (salads, soups, martian, moth, etc.).
+ Cat:
+ - bugfix: Plasmaman EVA suits from cargo can have their extinguisher refueled fully
+ now
+ L0pz:
+ - qol: Messages in drone comms appear with their own color in chat
+ - rscadd: Roman skeletons now have Roman swords.
+ LT3:
+ - qol: Airlock RETA status is now shown on examine
+ LemonInTheDark:
+ - bugfix: Changing your species from vampire to not vampire will no longer brick
+ your plane masters/rendering after 3 minutes or so.
+ - bugfix: Fixed a timing issue with SS_KEEP_TIMING subsystems, which impacts exactly
+ SSticker. TLDR is roundstart will now actually take the time it says it does,
+ instead of 75% of it.
+ - config: The roundstart delay config is now accurate, so you may want to decrease
+ it to not overlengthen lobby time. IDK you decide.
+ Melbert:
+ - bugfix: Fishing hooks will no longer hook even though the hook failed
+ RikuTheKiller:
+ - bugfix: Status effects now tick consistently, with Fleshmend and such giving a
+ consistent total healing amount. Report any oddities.
+ - refactor: Status effect code is now easier to read and makes more sense. Again,
+ report any oddities, the changes are major.
+ TealSeer:
+ - bugfix: fixed RaptorDex PDA app having no close button
+ - bugfix: fixed elevator music starting every time you took a step
+ - bugfix: fixed elevator music not stopping when you left the elevator
+ lelandkemble:
+ - bugfix: prevents runtime when hovering over plumbing iv drip
+ - bugfix: prevents retrying making a fake wall from range
+ mcbalaam:
+ - bugfix: Turret controls are visible again
+ paganiy:
+ - qol: ' Added Insert beaker buttons to chemistry machines.'
+ - code_imp: Minor code update for interacting with chemical machines
+ theselfish:
+ - rscadd: Clown Ops now have a unique SecHud icon.
+ timothymtorres:
+ - bugfix: Fix locked secure safes not showing correct UI
+ vinylspiders:
+ - bugfix: fixes an oversight where the wardrobe system tries to delete modsuit parts
+ when stashing the modsuit
+2025-11-09:
+ Cirrial:
+ - bugfix: Extreme Medicine Allergy quirk will no longer lead to you being allergic
+ to nothing
+ Melbert:
+ - rscadd: Added a new easy difficulty bitrunning domain, "Heretical Hunt"
+ - rscadd: Digital mobs receive positive moodlets for killing people rather than
+ negative
+ - bugfix: Madness Mask no longer affects corpses
+ - bugfix: Fixed some heretic runtimes
+ - refactor: Refactored the way camera updates are handled to hopefully reduce some
+ lag. Report any oddities
+ - rscadd: If the bartender is absent, PunPun will serve filled drink glasses to
+ patrons that don't have one.
+ - rscadd: PunPun will now ignore filled drinks and items being held when looking
+ for stuff to eat.
+ - rscadd: Monkeys can eat soup.
+ - rscadd: Monkeys will no longer seek out food if they are not hungry.
+ - rscadd: Hungry monkeys might fight you over the food you are holding. The hungrier
+ the monkey, the angrier the monkey.
+ - bugfix: Monkeys can no longer teleport items out of your hands to eat.
+ TealSeer:
+ - refactor: rewrote all cases of numbers being used as keys in non-alist associative
+ lists
+ necromanceranne:
+ - bugfix: Vending machines acknowledge when something would block an interaction
+ with that vendor.
+ - bugfix: Grasp of Lock can no longer yank down your jumpsuit unless it is capable
+ of being adjusted.
+ - code_imp: Cleans up some leftover mentions of 'knock' in Lock code.
+2025-11-11:
+ Aliceee2ch:
+ - map: Removed two over-strong turrets on interdyne pirate ship.
+ - admin: EMP logs are improved, additionally chemical EMP reactions are now logged.
+ - bugfix: Medbay office in Catwalk now connected to powernet.
+ ArcaneMusic:
+ - rscadd: The House Edge sword has a new special attack, allowing you to charge
+ up the blade for either a light (after the first cooldown) or heavy (after both
+ cooldowns) explosive sword slash.
+ - balance: The House Edge can only gain charges when fighting live opponents.
+ FalloutFalcon:
+ - bugfix: stuff like carpet and wood tiles dont use the 2x2 tiled sprite
+ - bugfix: similarly, floors that dont use the tiled sprite now can have permafrost
+ sprites (as they are not tiled)
+ Melbert:
+ - rscdel: 'Caps "Automated Announcement System" messages to 168 characters (was:
+ 1024 characters)'
+ - qol: Accounting console shows paycheck with a % rather than via a vague modifier
+ - bugfix: Accounting console can scroll again
+ MintMetal:
+ - map: No more regular pipes in atmos under layer adaptors on DeltaStation
+ Rhials:
+ - bugfix: Regal rats can now attack FAKEDEATH species mobs, like zombies and skeletons.
+ SyncIt21:
+ - bugfix: internals/externals in humans now protect against all inhalation effects
+ of reagents
+ necromanceranne:
+ - balance: The surplus energy sword and holy energy swords now require throw speed
+ boosters to embed into people.
+ - balance: The surplus energy sword now loses charge whenever it successfully blocks
+ an attack.
+ - qol: Operative lockers come with thermal regulator and plasma stabilizer modules.
+ timothymtorres:
+ - rscadd: Add constructable floor lights by using a small light fixture on the floor.
+ They are constructed the same way as other lights.
+ - qol: Add `/burned` subtype to `/obj/machinery/light` for mapping shenanigans
+ - image: Add floor light construction sprites
+ - map: Converted the `/built` subtype for `/obj/machinery/light` to be `/empty`
+ and added an UpdatePaths script.
+2025-11-12:
+ Aliceee2ch:
+ - map: Repowered mining lounge external airlock.
+ FalloutFalcon:
+ - bugfix: deer now eat* real grass
+ Krysonism:
+ - balance: fly swatter now has bonus damage against all basic bugs.
+ - balance: bug killer reagents now do slightly more damage.
+ - balance: spiders and flesh spiders have greatly increased tox vulnerability.
+ MatrixOne500:
+ - rscadd: Added a recolorable cape to the ClothesMate accessories section
+ Paxilmaniac:
+ - bugfix: fixes pizza slices displaying the wrong message when taken
+ SmArtKar:
+ - bugfix: Spawn Ruin verb no longer "sorts" its ruins alphabetically, instead sorting
+ them within their categories
+ SyncIt21:
+ - bugfix: crystal meth reaction yields correct methamphetamine amounts
+ Time-Green:
+ - qol: Readds nodeath and succumb-blocking for voidwalker victims
+ lelandkemble:
+ - bugfix: Several catwalk apcs are now powered roundstart
+ - qol: Added thermal and plasma stabilizer MODules to catwalk engineering
+ mikederkan:
+ - rscadd: Emitters now change their light color depending on the diode disk inserted.
+ - bugfix: Emitters can light up with their panel open.
+ trazodont:
+ - map: moved metastation security locker room apc
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 4ffaf0bdd22..23560e411ea 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/hud/screen_gen.dmi b/icons/hud/screen_gen.dmi
index da7cba81487..d410fa2e44f 100644
Binary files a/icons/hud/screen_gen.dmi and b/icons/hud/screen_gen.dmi differ
diff --git a/icons/map_icons/clothing/neck.dmi b/icons/map_icons/clothing/neck.dmi
index e11a38a32cb..9adba4c1e50 100644
Binary files a/icons/map_icons/clothing/neck.dmi and b/icons/map_icons/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index b1d374ae7a7..bb070ab3bfe 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 0c57f695f07..a44781036a0 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi
index 9bb48320aac..b99e67e53a0 100644
Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ
diff --git a/icons/mob/inhands/equipment/belt_lefthand.dmi b/icons/mob/inhands/equipment/belt_lefthand.dmi
index e4f8d4bd397..7675b73543b 100644
Binary files a/icons/mob/inhands/equipment/belt_lefthand.dmi and b/icons/mob/inhands/equipment/belt_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/belt_righthand.dmi b/icons/mob/inhands/equipment/belt_righthand.dmi
index 248776ad593..c1cb44abf4a 100644
Binary files a/icons/mob/inhands/equipment/belt_righthand.dmi and b/icons/mob/inhands/equipment/belt_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi
index 3e31f271857..1c025871a3b 100644
Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 58884a25e54..f088ffb739e 100644
Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 6e9c45ff112..39e8daa9742 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index 3a1bd3d2ccf..0b19dff85b0 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/food/martian.dmi b/icons/obj/food/martian.dmi
index 829cf421cfb..fb5528818a1 100644
Binary files a/icons/obj/food/martian.dmi and b/icons/obj/food/martian.dmi differ
diff --git a/icons/obj/food/moth.dmi b/icons/obj/food/moth.dmi
index e3df78e65e6..170d7bc2bc0 100644
Binary files a/icons/obj/food/moth.dmi and b/icons/obj/food/moth.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index 60fd7801778..21f07037540 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 4d5ec832827..0ae2702417c 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machines/engine/singularity.dmi b/icons/obj/machines/engine/singularity.dmi
index 59b8d236484..90a5a355a7b 100644
Binary files a/icons/obj/machines/engine/singularity.dmi and b/icons/obj/machines/engine/singularity.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi
index f7951475d51..3187eb83e86 100644
Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ
diff --git a/icons/obj/weapons/sword.dmi b/icons/obj/weapons/sword.dmi
index ae2fdfabede..b97680adb27 100644
Binary files a/icons/obj/weapons/sword.dmi and b/icons/obj/weapons/sword.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 84dbdefe26e..3077a7ab47b 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -260,7 +260,7 @@ h1.alert, h2.alert {color: #000000;}
.abductor {color: #800080; font-style: italic;}
.mind_control {color: #A00D6F; font-size: 3; font-weight: bold; font-style: italic;}
.slime {color: #00CED1;}
-.drone {color: #848482;}
+.drone {color: #ffff00; background-color: #7c2395; font-style: italic;}
.monkey {color: #975032;}
.swarmer {color: #2C75FF;}
.resonate {color: #298F85;}
diff --git a/strings/modular_maps/safehouse.toml b/strings/modular_maps/safehouse.toml
index 90faf735140..858c9d725a7 100644
--- a/strings/modular_maps/safehouse.toml
+++ b/strings/modular_maps/safehouse.toml
@@ -18,6 +18,9 @@ modules = ["ice.dmm"]
[rooms.lavaland_boss]
modules = ["lavaland_boss.dmm"]
+[rooms.maintsafe]
+modules = ["maintsafe.dmm"]
+
[rooms.mine]
modules = ["mine.dmm"]
diff --git a/tgstation.dme b/tgstation.dme
index 9bc471332bd..a7598363fb3 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -101,6 +101,7 @@
#include "code\__DEFINES\explosions.dm"
#include "code\__DEFINES\external_organs.dm"
#include "code\__DEFINES\fantasy_affixes.dm"
+#include "code\__DEFINES\files.dm"
#include "code\__DEFINES\firealarm.dm"
#include "code\__DEFINES\fish.dm"
#include "code\__DEFINES\font_awesome_icons.dm"
@@ -818,6 +819,7 @@
#include "code\controllers\subsystem\ban_cache.dm"
#include "code\controllers\subsystem\blackbox.dm"
#include "code\controllers\subsystem\blood_drying.dm"
+#include "code\controllers\subsystem\cameras.dm"
#include "code\controllers\subsystem\chat.dm"
#include "code\controllers\subsystem\dbcore.dm"
#include "code\controllers\subsystem\dcs.dm"
@@ -1174,7 +1176,6 @@
#include "code\datums\ai\monkey\monkey_behaviors.dm"
#include "code\datums\ai\monkey\monkey_controller.dm"
#include "code\datums\ai\monkey\monkey_subtrees.dm"
-#include "code\datums\ai\monkey\punpun_subtrees.dm"
#include "code\datums\ai\movement\_ai_movement.dm"
#include "code\datums\ai\movement\ai_movement_basic_avoidance.dm"
#include "code\datums\ai\movement\ai_movement_complete_stop.dm"
@@ -1302,6 +1303,7 @@
#include "code\datums\components\effect_remover.dm"
#include "code\datums\components\egg_layer.dm"
#include "code\datums\components\electrified_buckle.dm"
+#include "code\datums\components\empathy.dm"
#include "code\datums\components\energized.dm"
#include "code\datums\components\engraved.dm"
#include "code\datums\components\evolutionary_leap.dm"
@@ -3951,6 +3953,7 @@
#include "code\modules\bitrunning\virtual_domain\domains\fredingtonfastingbear.dm"
#include "code\modules\bitrunning\virtual_domain\domains\gondola_asteroid.dm"
#include "code\modules\bitrunning\virtual_domain\domains\grassland_hunt.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\heretic_hunt.dm"
#include "code\modules\bitrunning\virtual_domain\domains\hierophant.dm"
#include "code\modules\bitrunning\virtual_domain\domains\island_brawl.dm"
#include "code\modules\bitrunning\virtual_domain\domains\meta_central.dm"
@@ -5666,7 +5669,6 @@
#include "code\modules\mob\living\silicon\ai\robot_control.dm"
#include "code\modules\mob\living\silicon\ai\vox_sounds.dm"
#include "code\modules\mob\living\silicon\ai\ai_actions\remote_power.dm"
-#include "code\modules\mob\living\silicon\ai\freelook\cameranet.dm"
#include "code\modules\mob\living\silicon\ai\freelook\chunk.dm"
#include "code\modules\mob\living\silicon\ai\freelook\eye.dm"
#include "code\modules\mob\living\silicon\robot\death.dm"
diff --git a/tgui/global.d.ts b/tgui/global.d.ts
index cfc7920e820..0579f0d58b8 100644
--- a/tgui/global.d.ts
+++ b/tgui/global.d.ts
@@ -63,6 +63,11 @@ type ByondType = {
*/
strictMode: boolean;
+ /**
+ * The external URL for the IndexedDB IFrame to use as the origin
+ */
+ storageCdn: string;
+
/**
* Makes a BYOND call.
*
diff --git a/tgui/packages/common/storage.ts b/tgui/packages/common/storage.ts
index 427e8b8ffce..a0c3b6f0f30 100644
--- a/tgui/packages/common/storage.ts
+++ b/tgui/packages/common/storage.ts
@@ -8,8 +8,12 @@
export const IMPL_MEMORY = 0;
export const IMPL_HUB_STORAGE = 1;
+export const IMPL_IFRAME_INDEXED_DB = 2;
-type StorageImplementation = typeof IMPL_MEMORY | typeof IMPL_HUB_STORAGE;
+type StorageImplementation =
+ | typeof IMPL_MEMORY
+ | typeof IMPL_HUB_STORAGE
+ | typeof IMPL_IFRAME_INDEXED_DB;
type StorageBackend = {
impl: StorageImplementation;
@@ -85,6 +89,80 @@ class HubStorageBackend implements StorageBackend {
}
}
+class IFrameIndexedDbBackend implements StorageBackend {
+ public impl: StorageImplementation;
+
+ private documentElement: HTMLIFrameElement;
+ private iframeWindow: Window;
+
+ constructor() {
+ this.impl = IMPL_IFRAME_INDEXED_DB;
+ }
+
+ async ready(): Promise
{
+ const iframe = document.createElement('iframe');
+ iframe.style.display = 'none';
+ iframe.src = Byond.storageCdn;
+
+ const completePromise: Promise = new Promise((resolve) => {
+ iframe.onload = () => resolve(true);
+ });
+
+ this.documentElement = document.body.appendChild(iframe);
+ if (!this.documentElement.contentWindow) {
+ return new Promise((res) => res(false));
+ }
+
+ this.iframeWindow = this.documentElement.contentWindow;
+
+ return completePromise;
+ }
+
+ async get(key: string): Promise {
+ const promise = new Promise((resolve) => {
+ window.addEventListener('message', (message) => {
+ if (message.data.key && message.data.key === key) {
+ resolve(message.data.value);
+ }
+ });
+ });
+
+ this.iframeWindow.postMessage({ type: 'get', key: key }, '*');
+ return promise;
+ }
+
+ async set(key: string, value: any): Promise {
+ this.iframeWindow.postMessage({ type: 'set', key: key, value: value }, '*');
+ }
+
+ async remove(key: string): Promise {
+ this.iframeWindow.postMessage({ type: 'remove', key: key }, '*');
+ }
+
+ async clear(): Promise {
+ this.iframeWindow.postMessage({ type: 'clear' }, '*');
+ }
+
+ async ping(): Promise {
+ const promise: Promise = new Promise((resolve) => {
+ window.addEventListener('message', (message) => {
+ if (message.data === true) {
+ resolve(true);
+ }
+ });
+
+ setTimeout(() => resolve(false), 100);
+ });
+
+ this.iframeWindow.postMessage({ type: 'ping' }, '*');
+ return promise;
+ }
+
+ async destroy(): Promise {
+ document.body.removeChild(this.documentElement);
+ }
+}
+
/**
* Web Storage Proxy object, which selects the best backend available
* depending on the environment.
@@ -95,10 +173,53 @@ class StorageProxy implements StorageBackend {
constructor() {
this.backendPromise = (async () => {
- if (testHubStorage()) {
+ if (Byond.storageCdn && !window.hubStorage) {
+ const iframe = new IFrameIndexedDbBackend();
+ await iframe.ready();
+
+ if ((await iframe.ping()) === true) {
+ if (await iframe.get('byondstorage-migrated')) return iframe;
+
+ Byond.winset(null, 'browser-options', '+byondstorage');
+
+ await new Promise((resolve) => {
+ document.addEventListener('byondstorageupdated', async () => {
+ setTimeout(() => {
+ const hub = new HubStorageBackend();
+
+ for (const setting of ['panel-settings', 'chat-state', 'chat-messages']) {
+ hub
+ .get(setting)
+ .then((settings) => iframe.set(setting, settings));
+ }
+
+ iframe.set('byondstorage-migrated', true);
+ Byond.winset(null, 'browser-options', '-byondstorage');
+
+ resolve();
+ }, 1);
+ });
+ });
+
+ return iframe;
+ }
+
+ iframe.destroy();
+
+ if (!testHubStorage()) {
+ Byond.winset(null, 'browser-options', '+byondstorage');
+
+ return new Promise((resolve) => {
+ const listener = () => {
+ document.removeEventListener('byondstorageupdated', listener);
+ resolve(new HubStorageBackend());
+ };
+
+ document.addEventListener('byondstorageupdated', listener);
+ });
+ }
return new HubStorageBackend();
}
-
console.warn(
'No supported storage backend found. Using in-memory storage.',
);
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index bed2304e276..3c931dfc1b4 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -926,7 +926,9 @@ em {
}
.drone {
- color: hsl(60, 0.8%, 51.4%);
+ color: hsl(60, 100%, 50%);
+ background-color: hsl(287 62% 36%);
+ font-style: italic;
}
.monkey {
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index b99bf24adaa..193e1358e33 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -930,7 +930,9 @@ h2.alert {
}
.drone {
- color: hsl(60, 0.8%, 51.4%);
+ color: hsl(60 100% 50%);
+ background-color: hsl(287 62% 36%);
+ font-style: italic;
}
.monkey {
diff --git a/tgui/packages/tgui-setup/helpers.js b/tgui/packages/tgui-setup/helpers.js
index f4965d635b5..61df7146a8f 100644
--- a/tgui/packages/tgui-setup/helpers.js
+++ b/tgui/packages/tgui-setup/helpers.js
@@ -29,6 +29,7 @@
// Expose inlined metadata
Byond.windowId = parseMetaTag('tgui:windowId');
+ Byond.storageCdn = parseMetaTag('tgui:storagecdn');
// Backwards compatibility
window.__windowId__ = Byond.windowId;
diff --git a/tgui/packages/tgui/interfaces/AccountingConsole/AuditScreen.tsx b/tgui/packages/tgui/interfaces/AccountingConsole/AuditScreen.tsx
index d6799d9291f..98a19e308b1 100644
--- a/tgui/packages/tgui/interfaces/AccountingConsole/AuditScreen.tsx
+++ b/tgui/packages/tgui/interfaces/AccountingConsole/AuditScreen.tsx
@@ -8,7 +8,7 @@ export const AuditScreen = () => {
const { crashing, audit_log } = data;
return (
-
+
{!!crashing && (