"
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 4795dd29e5f7..cef23857bc7a 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -1,17 +1,11 @@
-//Returns the world time in english
-/proc/worldtime2text()
- return gameTimestamp("hh:mm:ss", world.time)
-
-/proc/time_stamp(format = "hh:mm:ss", show_ds)
+/proc/time_stamp(format = "YYYY-MM-DD hh:mm:ss", show_ds)
var/time_string = time2text(world.timeofday, format)
return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string
-/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
- if(!wtime)
- wtime = world.time
+/proc/game_timestamp(format = "hh:mm:ss", wtime = world.time)
return time2text(wtime - GLOB.timezoneOffset, format)
-/proc/station_time(display_only = FALSE, wtime=world.time)
+/proc/station_time(display_only = FALSE, wtime = world.time)
return ((((wtime - SSticker.round_start_time) * SSticker.station_time_rate_multiplier) + SSticker.gametime_offset) % 864000) - (display_only? GLOB.timezoneOffset : 0)
/proc/station_time_timestamp(format = "hh:mm:ss", wtime)
@@ -24,15 +18,49 @@
else
. += " AM"
-/proc/station_time_debug(force_set)
- if(isnum(force_set))
- SSticker.gametime_offset = force_set
- return
- SSticker.gametime_offset = rand(0, 864000) //hours in day * minutes in hour * seconds in minute * deciseconds in second
- if(prob(50))
- SSticker.gametime_offset = FLOOR(SSticker.gametime_offset, 3600)
- else
- SSticker.gametime_offset = CEILING(SSticker.gametime_offset, 3600)
+/proc/sector_datestamp(realtime = world.realtime, shortened = FALSE)
+ //International Fixed Calendar format (https://en.wikipedia.org/wiki/International_Fixed_Calendar)
+ var/days_since = round(realtime / (24 HOURS))
+ var/year = round(days_since / 365) + 481
+ var/day_of_year = days_since % 365
+ var/month = round(day_of_year / 28)
+ var/day_of_month = day_of_year % 28 + 1
+
+ if(shortened)
+ return "[year]-[month]-[day_of_month]FSC"
+
+ var/monthname
+ switch(month)
+ if(0)
+ monthname = "January"
+ if(1)
+ monthname = "February"
+ if(2)
+ monthname = "March"
+ if(3)
+ monthname = "April"
+ if(4)
+ monthname = "May"
+ if(5)
+ monthname = "June"
+ if(6)
+ monthname = "Sol"
+ if(7)
+ monthname = "July"
+ if(8)
+ monthname = "August"
+ if(9)
+ monthname = "September"
+ if(10)
+ monthname = "October"
+ if(11)
+ monthname = "November"
+ if(12)
+ monthname = "December"
+ if(13)
+ return "Year Day, [year] FSC"
+
+ return "[monthname] [day_of_month], [year] FSC"
//returns timestamp in a sql and a not-quite-compliant ISO 8601 friendly format
/proc/SQLtime(timevar)
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index efd551badefb..94039f138721 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -32,6 +32,27 @@
else if(dx<0)
.+=360
+
+////Tile coordinates (x, y) to absolute coordinates (in number of pixels). Center of a tile is generally assumed to be (16,16), but can be offset.
+#define ABS_COOR(c) (((c - 1) * 32) + 16)
+#define ABS_COOR_OFFSET(c, o) (((c - 1) * 32) + o)
+
+/proc/get_angle_with_scatter(atom/start, atom/end, scatter, x_offset = 16, y_offset = 16)
+ var/end_apx
+ var/end_apy
+ if(isliving(end)) //Center mass.
+ end_apx = ABS_COOR(end.x)
+ end_apy = ABS_COOR(end.y)
+ else //Exact pixel.
+ end_apx = ABS_COOR_OFFSET(end.x, x_offset)
+ end_apy = ABS_COOR_OFFSET(end.y, y_offset)
+ scatter = ((rand(0, min(scatter, 45))) * (prob(50) ? 1 : -1)) //Up to 45 degrees deviation to either side.
+ . = round((90 - ATAN2(end_apx - ABS_COOR(start.x), end_apy - ABS_COOR(start.y))), 1) + scatter
+ if(. < 0)
+ . += 360
+ else if(. >= 360)
+ . -= 360
+
/proc/Get_Pixel_Angle(y, x)//for getting the angle when animating something's pixel_x and pixel_y
if(!y)
return (x>=0)?90:270
@@ -1391,12 +1412,9 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
. = CB.Invoke()
usr = temp
-//datum may be null, but it does need to be a typed var
-#define NAMEOF(datum, X) (#X || ##datum.##X)
-
-#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##target, ##var_name, ##var_value)
+#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value)
//dupe code because dm can't handle 3 level deep macros
-#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##datum, NAMEOF(##datum, ##var), ##var_value)
+#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value)
/proc/___callbackvarset(list_or_datum, var_name, var_value)
if(length(list_or_datum))
@@ -1408,8 +1426,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
else
D.vars[var_name] = var_value
-#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitAdd, ##target, ##trait, ##source)
-#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitRemove, ##target, ##trait, ##source)
+#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitAdd), ##target, ##trait, ##source)
+#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitRemove), ##target, ##trait, ##source)
///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback.
/proc/___TraitAdd(target,trait,source)
diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm
index d711276efc27..08ca94db6c6a 100644
--- a/code/__byond_version_compat.dm
+++ b/code/__byond_version_compat.dm
@@ -1,7 +1,7 @@
// This file contains defines allowing targeting byond versions newer than the supported
//Update this whenever you need to take advantage of more recent byond features
-/*#define MIN_COMPILER_VERSION 514
+#define MIN_COMPILER_VERSION 514
#define MIN_COMPILER_BUILD 1556
#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM)
//Don't forget to update this part
@@ -12,8 +12,13 @@
#if (DM_VERSION == 514 && DM_BUILD > 1575 && DM_BUILD <= 1577)
#error Your version of BYOND currently has a crashing issue that will prevent you from running Dream Daemon test servers.
#error We require developers to test their content, so an inability to test means we cannot allow the compile.
-#error Please consider downgrading to 514.1575 or lower.
-#endif*/
+#error Please consider upgrading to 514.1577 or above.
+#endif
+
+#if (DM_VERSION == 514 && DM_BUILD == 1589)
+#warn Warning! Byond 514.1589 has been known to be unstable. Use at your own risk.
+#warn Please consider using 514.1588.
+#endif
// Keep savefile compatibilty at minimum supported level
#if DM_VERSION >= 515
@@ -43,3 +48,16 @@
/// Call by name proc reference, checks if the proc is existing global proc
#define GLOBAL_PROC_REF(X) (/proc/##X)
#endif
+
+// I heard that this was fixed in 1609 (not public currently), but that could be wrong, so keep an eye on this
+#if (DM_VERSION == 515 && DM_BUILD < 1609)
+/// fcopy will crash on 515 linux if given a non-existant file, instead of returning 0 like on 514 linux or 515 windows
+/// var case matches documentation for fcopy.
+/world/proc/__fcopy(Src, Dst)
+ if (!fexists(Src))
+ return 0
+ return fcopy(Src, Dst)
+
+#define fcopy(Src, Dst) world.__fcopy(Src, Dst)
+
+#endif
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 0b73aa7172c3..419abcd6be70 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -42,6 +42,7 @@
#endif // REFERENCE_DOING_IT_LIVE
//#define UNIT_TESTS //Enables unit tests via TEST_RUN_PARAMETER
+//#define ALL_TESTS //Enables all tests, including the ones that take a long time to run
#ifndef PRELOAD_RSC //set to:
#define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour;
@@ -52,23 +53,6 @@
/// Prefer the autowiki build target instead.
// #define AUTOWIKI
-//Update this whenever you need to take advantage of more recent byond features
-#define MIN_COMPILER_VERSION 513
-#define MIN_COMPILER_BUILD 1514
-#if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD
-//Don't forget to update this part
-#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update.
-#error You need version 513.1514 or higher
-#endif
-
-//Update this whenever the byond version is stable so people stop updating to hilariously broken versions
-//#define MAX_COMPILER_VERSION 514
-//#define MAX_COMPILER_BUILD 1571
-#ifdef MAX_COMPILER_VERSION
-#if DM_VERSION > MAX_COMPILER_VERSION || DM_BUILD > MAX_COMPILER_BUILD
-#warn WARNING: Your BYOND version is over the recommended version (514.1571)! Stability is not guaranteed.
-#endif
-#endif
//Log the full sendmaps profile on 514.1556+, any earlier and we get bugs or it not existing
#if DM_VERSION >= 514 && DM_BUILD >= 1556
#define SENDMAPS_PROFILE
@@ -95,6 +79,14 @@
#define GC_FAILURE_HARD_LOOKUP
#endif
+#ifdef ALL_TESTS
+#define BASIC_TESTS
+#define CREATE_AND_DESTROY_TEST
+#define PLANET_GEN_TEST
+#define RUIN_PLACEMENT_TEST
+#define SHIP_PLACEMENT_TEST
+#endif
+
// A reasonable number of maximum overlays an object needs
// If you think you need more, rethink it
#define MAX_ATOM_OVERLAYS 100
diff --git a/code/_debugger.dm b/code/_debugger.dm
index dafc759ec563..1518908fa9a0 100644
--- a/code/_debugger.dm
+++ b/code/_debugger.dm
@@ -9,5 +9,5 @@
/datum/debugger/proc/enable_debugger()
var/dll = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (dll)
- call(dll, "auxtools_init")()
+ LIBCALL(dll, "auxtools_init")()
enable_debugging()
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 66196b1a6dd6..aca090086487 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -43,7 +43,6 @@ GLOBAL_LIST_EMPTY(ipc_chassis_list)
GLOBAL_LIST_INIT(ipc_brain_list, list("Posibrain", "Man-Machine Interface"))
GLOBAL_LIST_EMPTY(spider_legs_list)
GLOBAL_LIST_EMPTY(spider_spinneret_list)
-GLOBAL_LIST_EMPTY(spider_mandibles_list)
GLOBAL_LIST_EMPTY(kepori_feathers_list)
GLOBAL_LIST_EMPTY(kepori_body_feathers_list)
GLOBAL_LIST_EMPTY(kepori_tail_feathers_list)
@@ -128,7 +127,7 @@ GLOBAL_LIST_INIT(ai_core_display_screens, sortList(list(
"Helios",
"House",
"Inverted",
- "Lamp", //WS edit, moff ai display
+ "Lamp",
"Matrix",
"Monochrome",
"Murica",
diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
index 7f1e2693f893..ff4237d1e892 100644
--- a/code/_globalvars/lists/mapping.dm
+++ b/code/_globalvars/lists/mapping.dm
@@ -34,6 +34,7 @@ GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
GLOBAL_LIST_EMPTY(deathsquadspawn)
GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)
+GLOBAL_LIST_EMPTY(emergencyresponseteam_outpostspawn)
GLOBAL_LIST_EMPTY(ruin_landmarks)
GLOBAL_LIST_EMPTY(stationroom_landmarks) //List of all spawns for stationrooms
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index 0c28353395d4..fb00d8bdf283 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -35,6 +35,8 @@ GLOBAL_LIST_EMPTY(aiEyes)
///underages who have been reported to security for trying to buy things they shouldn't, so they can't spam
GLOBAL_LIST_EMPTY(narcd_underages)
+GLOBAL_LIST_EMPTY(real_names_joined)
+
GLOBAL_LIST_EMPTY(language_datum_instances)
GLOBAL_LIST_EMPTY(all_languages)
diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
index 0b517e50160c..ecc1acb6f0e1 100644
--- a/code/_globalvars/lists/names.dm
+++ b/code/_globalvars/lists/names.dm
@@ -14,7 +14,6 @@ GLOBAL_LIST_INIT(lizard_names_female, world.file2list("strings/names/lizard_fema
GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
-GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))
diff --git a/code/_globalvars/lists/poll_ignore.dm b/code/_globalvars/lists/poll_ignore.dm
index 674b15ceae2c..e25b0b6e9a87 100644
--- a/code/_globalvars/lists/poll_ignore.dm
+++ b/code/_globalvars/lists/poll_ignore.dm
@@ -11,7 +11,6 @@
#define POLL_IGNORE_CONSTRUCT "construct"
#define POLL_IGNORE_SPIDER "spider"
#define POLL_IGNORE_ASHWALKER "ashwalker"
-#define POLL_IGNORE_GOLEM "golem"
#define POLL_IGNORE_SWARMER "swarmer"
#define POLL_IGNORE_DRONE "drone"
#define POLL_IGNORE_FUGITIVE "fugitive"
@@ -36,7 +35,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
POLL_IGNORE_CONSTRUCT = "Construct",
POLL_IGNORE_SPIDER = "Spiders",
POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
- POLL_IGNORE_GOLEM = "Golems",
POLL_IGNORE_SWARMER = "Swarmer shells",
POLL_IGNORE_DRONE = "Drone shells",
POLL_IGNORE_FUGITIVE = "Fugitive Hunter",
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index 3239cb53b8d0..c91b96db8de9 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -17,7 +17,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_EMOTEMUTE " = TRAIT_EMOTEMUTE,
"TRAIT_DEAF" = TRAIT_DEAF,
"TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT,
- "TRAIT_FAT" = TRAIT_FAT,
"TRAIT_HUSK" = TRAIT_HUSK,
"TRAIT_BADDNA" = TRAIT_BADDNA,
"TRAIT_CLUMSY" = TRAIT_CLUMSY,
diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm
index 00a16eefda33..ac401489f40a 100644
--- a/code/_onclick/drag_drop.dm
+++ b/code/_onclick/drag_drop.dm
@@ -108,7 +108,7 @@
UnregisterSignal(mouseObject, COMSIG_PARENT_QDELETING)
mouseObject = over_object
// register signal to new mouseObject
- RegisterSignal(mouseObject, COMSIG_PARENT_QDELETING, .proc/clear_mouseObject)
+ RegisterSignal(mouseObject, COMSIG_PARENT_QDELETING, PROC_REF(clear_mouseObject))
mouseControlObject = over_control
if(selected_target[1] && over_object && over_object.IsAutoclickable())
selected_target[1] = over_object
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index e8e6daccf45b..43ae8ffbe246 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -65,7 +65,7 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
animate(thealert, transform = matrix(), time = 2.5, easing = CUBIC_EASING)
if(thealert.timeout)
- addtimer(CALLBACK(src, .proc/alert_timeout, thealert, category), thealert.timeout)
+ addtimer(CALLBACK(src, PROC_REF(alert_timeout), thealert, category), thealert.timeout)
thealert.timeout = world.time + thealert.timeout - world.tick_lag
return thealert
@@ -164,11 +164,6 @@ Override makes it so the alert is not replaced until cleared by a clear_alert wi
//End gas alerts
-/atom/movable/screen/alert/fat
- name = "Fat"
- desc = "You ate too much food, lardass. Run around and lose some weight."
- icon_state = "fat"
-
/atom/movable/screen/alert/hungry
name = "Hungry"
desc = "Some food would be good right about now."
@@ -313,7 +308,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
add_overlay(receiving)
src.receiving = receiving
src.offerer = offerer
- RegisterSignal(taker, COMSIG_MOVABLE_MOVED, .proc/check_in_range, override = TRUE) //Override to prevent runtimes when people offer a item multiple times
+ RegisterSignal(taker, COMSIG_MOVABLE_MOVED, PROC_REF(check_in_range), override = TRUE) //Override to prevent runtimes when people offer a item multiple times
/atom/movable/screen/alert/give/proc/removeAlert()
to_chat(owner, "
You moved out of range of [offerer]!")
@@ -341,7 +336,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
. = ..()
name = "[offerer] is offering a high-five!"
desc = "[offerer] is offering a high-five! Click this alert to slap it."
- RegisterSignal(offerer, COMSIG_PARENT_EXAMINE_MORE, .proc/check_fake_out)
+ RegisterSignal(offerer, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(check_fake_out))
/atom/movable/screen/alert/give/highfive/handle_transfer()
var/mob/living/carbon/taker = owner
@@ -359,7 +354,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
offerer.visible_message(span_notice("[rube] rushes in to high-five [offerer], but-"), span_nicegreen("[rube] falls for your trick just as planned, lunging for a high-five that no longer exists! Classic!"), ignored_mobs=rube)
to_chat(rube, span_nicegreen("You go in for [offerer]'s high-five, but-"))
- addtimer(CALLBACK(src, .proc/too_slow_p2, offerer, rube), 0.5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(too_slow_p2), offerer, rube), 0.5 SECONDS)
/// Part two of the ultimate prank
/atom/movable/screen/alert/give/highfive/proc/too_slow_p2()
diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm
index 01e4cd1de1f4..0ee063593a8b 100644
--- a/code/_onclick/hud/credits.dm
+++ b/code/_onclick/hud/credits.dm
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(patrons, world.file2list("[global.config.directory]/patrons.txt
if(!C)
continue
- addtimer(CALLBACK(GLOBAL_PROC, .proc/create_credit, C), CREDIT_SPAWN_SPEED * i + (3 * CREDIT_SPAWN_SPEED), TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(create_credit), C), CREDIT_SPAWN_SPEED * i + (3 * CREDIT_SPAWN_SPEED), TIMER_CLIENT_TIME)
/proc/create_credit(credit)
new /atom/movable/screen/credit(null, credit)
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(patrons, world.file2list("[global.config.directory]/patrons.txt
animate(src, transform = M, time = CREDIT_ROLL_SPEED)
target = M
animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL)
- INVOKE_ASYNC(src, .proc/add_to_clients)
+ INVOKE_ASYNC(src, PROC_REF(add_to_clients))
QDEL_IN(src, CREDIT_ROLL_SPEED)
/atom/movable/screen/credit/proc/add_to_clients()
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index 14b95e421c3d..b286ff28f4c5 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -25,7 +25,7 @@
if(animated)
animate(screen, alpha = 0, time = animated)
- addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(clear_fullscreen_after_animate), screen), animated, TIMER_CLIENT_TIME)
else
if(client)
client.screen -= screen
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index 36d278adac0d..ca383805cc34 100644
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -57,7 +57,7 @@
pref = PARALLAX_HIGH
switch(C.prefs.parallax)
if (PARALLAX_INSANE)
- C.parallax_throttle = FALSE
+ C.parallax_throttle = PARALLAX_DELAY_DEFAULT
C.parallax_layers_max = 5
return TRUE
@@ -133,7 +133,7 @@
C.parallax_movedir = new_parallax_movedir
if (C.parallax_animate_timer)
deltimer(C.parallax_animate_timer)
- var/datum/callback/CB = CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform)
+ var/datum/callback/CB = CALLBACK(src, PROC_REF(update_parallax_motionblur), C, animatedir, new_parallax_movedir, newtransform)
if(skip_windups)
CB.Invoke()
else
@@ -298,13 +298,6 @@
speed = 3
layer = 3
-/atom/movable/screen/parallax_layer/random/space_gas
- icon_state = "space_gas"
-
-/atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
- . = ..()
- src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
-
/atom/movable/screen/parallax_layer/random/asteroids
icon_state = "asteroids"
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index b672b901d086..6bc47aa6bcb8 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
UnregisterSignal(parent, COMSIG_PARENT_QDELETING)
parent = new_value
if(parent)
- RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/handle_parent_del)
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_parent_del))
/atom/movable/screen/radial/proc/handle_parent_del()
SIGNAL_HANDLER
@@ -62,9 +62,18 @@ GLOBAL_LIST_EMPTY(radial_menus)
parent.finished = TRUE
/datum/radial_menu
- var/list/choices = list() //List of choice id's
- var/list/choices_icons = list() //choice_id -> icon
- var/list/choices_values = list() //choice_id -> choice
+ /// List of choice IDs
+ var/list/choices = list()
+
+ /// choice_id -> icon
+ var/list/choices_icons = list()
+
+ /// choice_id -> choice
+ var/list/choices_values = list()
+
+ /// choice_id -> /datum/radial_menu_choice
+ var/list/choice_datums = list()
+
var/list/page_data = list() //list of choices per page
@@ -199,6 +208,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
E.alpha = 255
E.mouse_opacity = MOUSE_OPACITY_ICON
E.cut_overlays()
+ E.vis_contents.Cut()
if(choice_id == NEXT_PAGE_ID)
E.name = "Next Page"
E.next_page = TRUE
@@ -245,11 +255,17 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/I = extract_image(new_choices[E])
if(I)
choices_icons[id] = I
+ if (istype(new_choices[E], /datum/radial_menu_choice))
+ choice_datums[id] = new_choices[E]
setup_menu(use_tooltips)
-/datum/radial_menu/proc/extract_image(E)
- var/mutable_appearance/MA = new /mutable_appearance(E)
+/datum/radial_menu/proc/extract_image(to_extract_from)
+ if (istype(to_extract_from, /datum/radial_menu_choice))
+ var/datum/radial_menu_choice/choice = to_extract_from
+ to_extract_from = choice.image
+
+ var/mutable_appearance/MA = new /mutable_appearance(to_extract_from)
if(MA)
MA.layer = ABOVE_HUD_LAYER
MA.appearance_flags |= RESET_TRANSFORM
@@ -332,3 +348,15 @@ GLOBAL_LIST_EMPTY(radial_menus)
if(!custom_check.Invoke())
return
return answer
+
+/// Can be provided to choices in radial menus if you want to provide more information
+/datum/radial_menu_choice
+ /// Required -- what to display for this button
+ var/image
+
+ /// If provided, will display an info button that will put this text in your chat
+ var/info
+
+/datum/radial_menu_choice/Destroy(force, ...)
+ . = ..()
+ QDEL_NULL(image)
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 557096d83c82..8615b9a9aa6d 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -749,7 +749,7 @@
deltimer(timerid)
if(!streak)
return ..()
- timerid = addtimer(CALLBACK(src, .proc/clear_streak), 20, TIMER_UNIQUE | TIMER_STOPPABLE)
+ timerid = addtimer(CALLBACK(src, PROC_REF(clear_streak)), 20, TIMER_UNIQUE | TIMER_STOPPABLE)
icon_state = "combo"
for(var/i = 1; i <= length(streak); ++i)
var/intent_text = copytext(streak, i, i + 1)
diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
index 22c19f7cf627..8a25babbb010 100644
--- a/code/controllers/configuration/config_entry.dm
+++ b/code/controllers/configuration/config_entry.dm
@@ -42,7 +42,7 @@
. &= !(protection & CONFIG_ENTRY_HIDDEN)
/datum/config_entry/vv_edit_var(var_name, var_value)
- var/static/list/banned_edits = list(NAMEOF(src, name), NAMEOF(src, vv_VAS), NAMEOF(src, default), NAMEOF(src, resident_file), NAMEOF(src, protection), NAMEOF(src, abstract_type), NAMEOF(src, modified), NAMEOF(src, dupes_allowed))
+ var/static/list/banned_edits = list(NAMEOF_STATIC(src, name), NAMEOF_STATIC(src, vv_VAS), NAMEOF_STATIC(src, default), NAMEOF_STATIC(src, resident_file), NAMEOF_STATIC(src, protection), NAMEOF_STATIC(src, abstract_type), NAMEOF_STATIC(src, modified), NAMEOF_STATIC(src, dupes_allowed))
if(var_name == NAMEOF(src, config_entry_value))
if(protection & CONFIG_ENTRY_LOCKED)
return FALSE
@@ -105,7 +105,7 @@
return FALSE
/datum/config_entry/number/vv_edit_var(var_name, var_value)
- var/static/list/banned_edits = list(NAMEOF(src, max_val), NAMEOF(src, min_val), NAMEOF(src, integer))
+ var/static/list/banned_edits = list(NAMEOF_STATIC(src, max_val), NAMEOF_STATIC(src, min_val), NAMEOF_STATIC(src, integer))
return !(var_name in banned_edits) && ..()
/datum/config_entry/flag
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 70fb5d107f3f..c806ec40837a 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -352,4 +352,4 @@ Example config:
//Message admins when you can.
/datum/controller/configuration/proc/DelayedMessageAdmins(text)
- addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), text), 0)
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index 41a470aac610..6a5959574754 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -236,8 +236,8 @@
/datum/config_entry/string/wikiurl
config_entry_value = "https://shiptest.net/wiki/"
-/datum/config_entry/string/forumurl
- config_entry_value = "https://shiptest.net/discord"
+/datum/config_entry/string/loreurl
+ config_entry_value = "https://shiptest.net/wiki/Lore_Primer"
/datum/config_entry/string/rulesurl
config_entry_value = "https://shiptest.net/wiki/Rules"
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index f89030c51842..302c0de4a427 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -343,9 +343,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
queue_tail = null
//these sort by lower priorities first to reduce the number of loops needed to add subsequent SS's to the queue
//(higher subsystems will be sooner in the queue, adding them later in the loop means we don't have to loop thru them next queue add)
- sortTim(tickersubsystems, /proc/cmp_subsystem_priority)
+ sortTim(tickersubsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
for(var/I in runlevel_sorted_subsystems)
- sortTim(runlevel_sorted_subsystems, /proc/cmp_subsystem_priority)
+ sortTim(I, GLOBAL_PROC_REF(cmp_subsystem_priority))
I += tickersubsystems
var/cached_runlevel = current_runlevel
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index e5584df31e5e..0fd7090ff17d 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -192,9 +192,9 @@ SUBSYSTEM_DEF(dbcore)
for (var/thing in querys)
var/datum/DBQuery/query = thing
if (warn)
- INVOKE_ASYNC(query, /datum/DBQuery.proc/warn_execute)
+ INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/DBQuery, warn_execute))
else
- INVOKE_ASYNC(query, /datum/DBQuery.proc/Execute)
+ INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/DBQuery, Execute))
for (var/thing in querys)
var/datum/DBQuery/query = thing
diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm
index 4e8a23b5ba3c..ae0074e9fb5b 100644
--- a/code/controllers/subsystem/explosions.dm
+++ b/code/controllers/subsystem/explosions.dm
@@ -140,7 +140,7 @@ SUBSYSTEM_DEF(explosions)
else
continue
- addtimer(CALLBACK(GLOBAL_PROC, .proc/wipe_color_and_text, wipe_colours), 100)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(wipe_color_and_text), wipe_colours), 100)
/proc/wipe_color_and_text(list/atom/wiping)
for(var/i in wiping)
@@ -216,7 +216,7 @@ SUBSYSTEM_DEF(explosions)
var/y0 = epicenter.y
var/z0 = epicenter.virtual_z()
var/area/areatype = get_area(epicenter)
- SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = areatype.type, "time" = time_stamp("YYYY-MM-DD hh:mm:ss", 1)))
+ SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = areatype.type, "time" = time_stamp(show_ds = TRUE)))
// Play sounds; we want sounds to be different depending on distance so we will manually do it ourselves.
// Stereo users will also hear the direction of the explosion!
@@ -278,7 +278,7 @@ SUBSYSTEM_DEF(explosions)
M.playsound_local(epicenter, null, echo_volume, 1, frequency, S = explosion_echo_sound, distance_multiplier = 0)
if(creaking_explosion) // 5 seconds after the bang, the station begins to creak
- addtimer(CALLBACK(M, /mob/proc/playsound_local, epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), 1, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY)
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, playsound_local), epicenter, null, rand(FREQ_LOWER, FREQ_UPPER), 1, frequency, null, null, FALSE, hull_creaking_sound, 0), CREAK_DELAY)
if(heavy_impact_range > 1)
var/datum/effect_system/explosion/E
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index b362a7ed4e62..da58d4764516 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -209,11 +209,11 @@ SUBSYSTEM_DEF(garbage)
if (GC_QUEUE_CHECK)
#ifdef REFERENCE_TRACKING
if(reference_find_on_fail[refID])
- INVOKE_ASYNC(D, /datum/proc/find_references)
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references))
ref_searching = TRUE
#ifdef GC_FAILURE_HARD_LOOKUP
else
- INVOKE_ASYNC(D, /datum/proc/find_references)
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/datum, find_references))
ref_searching = TRUE
#endif
reference_find_on_fail -= refID
diff --git a/code/controllers/subsystem/lag_switch.dm b/code/controllers/subsystem/lag_switch.dm
index eadf8d219324..631685fe2910 100644
--- a/code/controllers/subsystem/lag_switch.dm
+++ b/code/controllers/subsystem/lag_switch.dm
@@ -23,7 +23,7 @@ SUBSYSTEM_DEF(lag_switch)
if(auto_switch_pop)
auto_switch = TRUE
trigger_pop = auto_switch_pop
- RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, .proc/client_connected)
+ RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(client_connected))
return ..()
/datum/controller/subsystem/lag_switch/proc/client_connected(datum/source, client/connected)
@@ -33,7 +33,7 @@ SUBSYSTEM_DEF(lag_switch)
auto_switch = FALSE
UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT)
- veto_timer_id = addtimer(CALLBACK(src, .proc/set_all_measures, TRUE, TRUE), 20 SECONDS, TIMER_STOPPABLE)
+ veto_timer_id = addtimer(CALLBACK(src, PROC_REF(set_all_measures), TRUE, TRUE), 20 SECONDS, TIMER_STOPPABLE)
message_admins("Lag Switch population threshold reached. Automatic activation of lag mitigation measures occuring in 20 seconds. (
CANCEL)")
log_admin("Lag Switch population threshold reached. Automatic activation of lag mitigation measures occuring in 20 seconds.")
@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(lag_switch)
/datum/controller/subsystem/lag_switch/proc/toggle_auto_enable()
auto_switch = !auto_switch
if(auto_switch)
- RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, .proc/client_connected)
+ RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(client_connected))
else
UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 28ab56d05211..f9c5c9c86399 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -134,17 +134,6 @@ SUBSYSTEM_DEF(mapping)
for(var/datum/planet_type/type as anything in subtypesof(/datum/planet_type))
planet_types[initial(type.planet)] = new type
- // Still supporting bans by filename
- // I hate this so much. I want to kill it because I don't think ANYONE uses this
- // Couldn't you just remove it on a fork or something??? come onnnnnnnnnnnn stop EXISTING already
- var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt")
- banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt")
- banned += generateMapList("[global.config.directory]/iceruinblacklist.txt")
- banned += generateMapList("[global.config.directory]/sandruinblacklist.txt")
- banned += generateMapList("[global.config.directory]/jungleruinblacklist.txt")
- banned += generateMapList("[global.config.directory]/rockruinblacklist.txt")
- banned += generateMapList("[global.config.directory]/wasteruinblacklist.txt")
-
for(var/item in sortList(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority))
var/datum/map_template/ruin/ruin_type = item
// screen out the abstract subtypes
@@ -152,9 +141,6 @@ SUBSYSTEM_DEF(mapping)
continue
var/datum/map_template/ruin/R = new ruin_type()
- if(R.mappath in banned)
- continue
-
map_templates[R.name] = R
ruins_templates[R.name] = R
ruin_types_list[R.ruin_type] += list(R.name = R)
diff --git a/code/controllers/subsystem/overmap.dm b/code/controllers/subsystem/overmap.dm
index eb6ccfa3c7b4..b96a4944c812 100644
--- a/code/controllers/subsystem/overmap.dm
+++ b/code/controllers/subsystem/overmap.dm
@@ -31,6 +31,9 @@ SUBSYSTEM_DEF(overmap)
///The two-dimensional list that contains every single tile in the overmap as a sublist.
var/list/list/overmap_container
+ ///Whether or not a ship is currently being spawned. Used to prevent multiple ships from being spawned at once.
+ var/ship_spawning //TODO: Make a proper queue for this
+
/datum/controller/subsystem/overmap/get_metrics()
. = ..()
var/list/cust = list()
@@ -227,13 +230,18 @@ SUBSYSTEM_DEF(overmap)
* Inteded for ship purchases, etc.
*/
/datum/controller/subsystem/overmap/proc/spawn_ship_at_start(datum/map_template/shuttle/template)
+ //Should never happen, but just in case. This'll delay the next spawn until the current one is done.
+ UNTIL(!ship_spawning)
+
var/ship_loc
if(template.space_spawn)
ship_loc = null
else
ship_loc = SSovermap.outposts[1]
- return new /datum/overmap/ship/controlled(ship_loc, template)
+ ship_spawning = TRUE
+ . = new /datum/overmap/ship/controlled(ship_loc, template) //This statement SHOULDN'T runtime (not counting runtimes actually in the constructor) so ship_spawning should always be toggled.
+ ship_spawning = FALSE
/**
* Creates an overmap object for each ruin level, making them accessible.
@@ -262,7 +270,7 @@ SUBSYSTEM_DEF(overmap)
var/datum/map_template/ruin/used_ruin = ispath(ruin_type) ? (new ruin_type) : ruin_type
// name is random but PROBABLY unique
- var/encounter_name = dynamic_datum.planet_name || "Dynamic Overmap Encounter #[rand(1111,9999)]-[rand(1111,9999)]"
+ var/encounter_name = dynamic_datum.planet_name || "\improper Uncharted Space [dynamic_datum.x]/[dynamic_datum.y]-[rand(1111, 9999)]"
var/datum/map_zone/mapzone = SSmapping.create_map_zone(encounter_name)
var/datum/virtual_level/vlevel = SSmapping.create_virtual_level(
encounter_name,
@@ -318,7 +326,7 @@ SUBSYSTEM_DEF(overmap)
var/obj/docking_port/stationary/primary_dock = new(primary_docking_turf)
primary_dock.dir = NORTH
- primary_dock.name = "\improper Uncharted Space"
+ primary_dock.name = "[encounter_name] docking location #1"
primary_dock.height = RESERVE_DOCK_MAX_SIZE_SHORT
primary_dock.width = RESERVE_DOCK_MAX_SIZE_LONG
primary_dock.dheight = 0
@@ -327,7 +335,7 @@ SUBSYSTEM_DEF(overmap)
var/obj/docking_port/stationary/secondary_dock = new(secondary_docking_turf)
secondary_dock.dir = NORTH
- secondary_dock.name = "\improper Uncharted Space"
+ secondary_dock.name = "[encounter_name] docking location #2"
secondary_dock.height = RESERVE_DOCK_MAX_SIZE_SHORT
secondary_dock.width = RESERVE_DOCK_MAX_SIZE_LONG
secondary_dock.dheight = 0
@@ -350,7 +358,7 @@ SUBSYSTEM_DEF(overmap)
var/obj/docking_port/stationary/tertiary_dock = new(tertiary_docking_turf)
tertiary_dock.dir = NORTH
- tertiary_dock.name = "\improper Uncharted Space"
+ tertiary_dock.name = "[encounter_name] docking location #3"
tertiary_dock.height = RESERVE_DOCK_MAX_SIZE_SHORT
tertiary_dock.width = RESERVE_DOCK_MAX_SIZE_LONG
tertiary_dock.dheight = 0
@@ -359,7 +367,7 @@ SUBSYSTEM_DEF(overmap)
var/obj/docking_port/stationary/quaternary_dock = new(quaternary_docking_turf)
quaternary_dock.dir = NORTH
- quaternary_dock.name = "\improper Uncharted Space"
+ quaternary_dock.name = "[encounter_name] docking location #4"
quaternary_dock.height = RESERVE_DOCK_MAX_SIZE_SHORT
quaternary_dock.width = RESERVE_DOCK_MAX_SIZE_LONG
quaternary_dock.dheight = 0
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
index ae8ca728e9ef..7c2bf71cad6a 100644
--- a/code/controllers/subsystem/pai.dm
+++ b/code/controllers/subsystem/pai.dm
@@ -147,7 +147,7 @@ SUBSYSTEM_DEF(pai)
if(!(ROLE_PAI in G.client.prefs.be_special))
continue
to_chat(G, "
[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.")
- addtimer(CALLBACK(src, .proc/spam_again), spam_delay)
+ addtimer(CALLBACK(src, PROC_REF(spam_again)), spam_delay)
var/list/available = list()
for(var/datum/paiCandidate/c in SSpai.candidates)
available.Add(check_ready(c))
diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
index 3083fcfdaed7..90a6f2cfbbf1 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -8,14 +8,12 @@ SUBSYSTEM_DEF(parallax)
var/planet_x_offset = 128
var/planet_y_offset = 128
var/random_layer
- var/random_parallax_color
//These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
/datum/controller/subsystem/parallax/PreInit()
. = ..()
- if(prob(70)) //70% chance to pick a special extra layer
- random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
- random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
+ if(prob(20)) //20% chance to pick a special extra layer, in this case just asteroids, no space dirt
+ random_layer = /atom/movable/screen/parallax_layer/random/asteroids
planet_y_offset = rand(100, 160)
planet_x_offset = rand(100, 160)
diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm
index ccbea7930663..21ee7ea60b3c 100644
--- a/code/controllers/subsystem/pathfinder.dm
+++ b/code/controllers/subsystem/pathfinder.dm
@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(pathfinder)
while(flow[free])
CHECK_TICK
free = (free % lcount) + 1
- var/t = addtimer(CALLBACK(src, /datum/flowcache.proc/toolong, free), 150, TIMER_STOPPABLE)
+ var/t = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/flowcache, toolong), free), 150, TIMER_STOPPABLE)
flow[free] = t
flow[t] = M
return free
diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm
index 8886a4b61caa..cf99a4fe49c5 100644
--- a/code/controllers/subsystem/ping.dm
+++ b/code/controllers/subsystem/ping.dm
@@ -13,8 +13,8 @@ SUBSYSTEM_DEF(ping)
var/list/currentrun = list()
-/datum/controller/subsystem/ping/stat_entry()
- ..("P:[GLOB.clients.len]")
+/datum/controller/subsystem/ping/stat_entry(msg)
+ return ..("P:[GLOB.clients.len]")
/datum/controller/subsystem/ping/fire(resumed = FALSE)
// Prepare the new batch of clients
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index b5b8113384df..9dc117783af9 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -23,7 +23,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
list("Ageusia","Vegetarian","Deviant Tastes"), \
list("Ananas Affinity","Ananas Aversion"), \
list("Alcohol Tolerance","Light Drinker"), \
- list("Clown Fan","Mime Fan"), \
+ list("Clown Fan","Mime Fan", "RILENA Super Fan"), \
list("Bad Touch", "Friendly"))
species_blacklist = list("Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE))
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 9ec1ce5125b2..90e3f3a73cae 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -71,7 +71,7 @@ SUBSYSTEM_DEF(shuttle)
/// Requests a bluespace jump, which, after jump_request_time deciseconds, will initiate a bluespace jump.
/datum/controller/subsystem/shuttle/proc/request_jump(modifier = 1)
jump_mode = BS_JUMP_CALLED
- jump_timer = addtimer(CALLBACK(src, .proc/initiate_jump), jump_request_time * modifier, TIMER_STOPPABLE)
+ jump_timer = addtimer(CALLBACK(src, PROC_REF(initiate_jump)), jump_request_time * modifier, TIMER_STOPPABLE)
priority_announce("Preparing for jump. ETD: [jump_request_time * modifier / (1 MINUTES)] minutes.", null, null, "Priority")
/// Cancels a currently requested bluespace jump. Can only be done after the jump has been requested but before the jump has actually begun.
diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm
index 1b844f168cf9..95e40bff159f 100644
--- a/code/controllers/subsystem/statpanel.dm
+++ b/code/controllers/subsystem/statpanel.dm
@@ -11,18 +11,17 @@ SUBSYSTEM_DEF(statpanels)
/datum/controller/subsystem/statpanels/fire(resumed = FALSE)
if (!resumed)
- var/actual_round_time = world.timeofday - SSticker.round_start_timeofday
- var/game_round_time = world.time - SSticker.round_start_time
var/list/global_data = list(
"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)",
"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
- "Local Time: [station_time_timestamp()]",
"\n",
- "Internal Round Timer: [SSticker.round_start_time ? time2text(game_round_time, "hh:mm:ss", 0) : "The round hasn't started yet!"]",
- "Actual Round Timer: [SSticker.round_start_timeofday ? time2text(actual_round_time, "hh:mm:ss", 0) : "The round hasn't started yet!"]",
+ "Local Sector Time: [SSticker.round_start_timeofday ? "[station_time_timestamp()] [sector_datestamp()]" : "The round hasn't started yet!"]",
"\n",
- "Playing/Connected: [get_active_player_count()]/[GLOB.clients.len]"
+ "Internal Round Timer: [SSticker.round_start_timeofday ? ROUND_TIME : "The round hasn't started yet!"]",
+ "Actual Round Timer: [SSticker.round_start_timeofday ? ROUND_REALTIMEOFDAY : "The round hasn't started yet!"]",
+ "\n",
+ "Playing/Connected: [get_active_player_count()]/[length(GLOB.clients)]"
)
if(SSshuttle.jump_mode != BS_JUMP_IDLE)
@@ -133,7 +132,7 @@ SUBSYSTEM_DEF(statpanels)
if(length(turfitems) < 30) // only create images for the first 30 items on the turf, for performance reasons
if(!(REF(turf_content) in cached_images))
cached_images += REF(turf_content)
- turf_content.RegisterSignal(turf_content, COMSIG_PARENT_QDELETING, /atom/.proc/remove_from_cache) // we reset cache if anything in it gets deleted
+ turf_content.RegisterSignal(turf_content, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/atom, remove_from_cache)) // we reset cache if anything in it gets deleted
if(ismob(turf_content) || length(turf_content.overlays) > 2)
turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content), costly_icon2html(turf_content, target, sourceonly=TRUE))
else
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 78565227e014..0260e952d10d 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -74,7 +74,7 @@ SUBSYSTEM_DEF(throwing)
/datum/thrownthing/New(thrownthing, target, target_turf, init_dir, maxrange, speed, thrower, diagonals_first, force, gentle, callback, target_zone)
. = ..()
src.thrownthing = thrownthing
- RegisterSignal(thrownthing, COMSIG_PARENT_QDELETING, .proc/on_thrownthing_qdel)
+ RegisterSignal(thrownthing, COMSIG_PARENT_QDELETING, PROC_REF(on_thrownthing_qdel))
src.target = target
src.target_turf = target_turf
src.init_dir = init_dir
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index fabb64505899..0a5c787d3bfd 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -36,10 +36,11 @@ SUBSYSTEM_DEF(ticker)
var/selected_tip // What will be the tip of the day?
var/timeLeft //pregame timer
- //var/start_at WS Edit - Countdown after init
- var/gametime_offset = 432000 //Deciseconds to add to world.time for station time.
- var/station_time_rate_multiplier = 12 //factor of station time progressal vs real time.
+ /// The "start" of the round in station time, for example, 9 HOURS = 9:00 AM
+ var/gametime_offset = 9 HOURS
+ /// Factor of station time progressal vs real time.
+ var/station_time_rate_multiplier = 1
var/totalPlayers = 0 //used for pregame stats on statpanel
var/totalPlayersReady = 0 //used for pregame stats on statpanel
@@ -58,11 +59,6 @@ SUBSYSTEM_DEF(ticker)
var/mode_result = "undefined"
var/end_state = "undefined"
- //Crew Objective stuff
- var/list/successfulCrew = list()
- var/list/crewobjlist = list()
- var/list/crewobjjobs = list()
-
/// Why an emergency shuttle was called
var/emergency_reason
@@ -136,7 +132,6 @@ SUBSYSTEM_DEF(ticker)
GLOB.syndicate_code_response_regex = codeword_match
- //start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) WS Edit - Countdown at init
if(CONFIG_GET(flag/randomize_shift_time))
gametime_offset = rand(0, 23) HOURS
else if(CONFIG_GET(flag/shift_time_realtime))
@@ -280,7 +275,7 @@ SUBSYSTEM_DEF(ticker)
cb.InvokeAsync()
LAZYCLEARLIST(round_start_events)
- log_world("Game start took [(world.timeofday - init_start)/10]s")
+ log_world("Game start took [(REALTIMEOFDAY - init_start)/10]s")
round_start_time = world.time
round_start_timeofday = world.timeofday
SSdbcore.SetRoundStart()
@@ -508,7 +503,7 @@ SUBSYSTEM_DEF(ticker)
var/mob/dead/new_player/player = i
if(player.ready == PLAYER_READY_TO_OBSERVE && player.mind)
//Break chain since this has a sleep input in it
- addtimer(CALLBACK(player, /mob/dead/new_player.proc/make_me_an_observer), 1)
+ addtimer(CALLBACK(player, TYPE_PROC_REF(/mob/dead/new_player, make_me_an_observer)), 1)
/datum/controller/subsystem/ticker/proc/load_mode()
var/mode = trim(file2text("data/mode.txt"))
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 176f91cf5808..68092077d784 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -283,7 +283,7 @@ SUBSYSTEM_DEF(timer)
return
// Sort all timers by time to run
- sortTim(alltimers, .proc/cmp_timer)
+ sortTim(alltimers, PROC_REF(cmp_timer))
// Get the earliest timer, and if the TTR is earlier than the current world.time,
// then set the head offset appropriately to be the earliest time tracked by the
diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
index ab220b4382b4..1e697327c844 100644
--- a/code/controllers/subsystem/traumas.dm
+++ b/code/controllers/subsystem/traumas.dm
@@ -78,8 +78,8 @@ SUBSYSTEM_DEF(traumas)
/obj/item/spear, /obj/item/clothing/mask/gas)),
"lizards" = typecacheof(list(
- /obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail, /obj/item/organ/tail/lizard,
- /obj/item/reagent_containers/food/drinks/bottle/lizardwine, /obj/item/clothing/head/lizard, /obj/item/clothing/shoes/cowboy/lizard)),
+ /obj/item/toy/plush/lizardplushie, /obj/item/organ/tail/lizard,
+ /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
"skeletons" = typecacheof(list(
/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
@@ -156,7 +156,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi,
/obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star,
- /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
+ /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja,
/obj/item/vibro_weapon, /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana,
/obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
@@ -177,7 +177,6 @@ SUBSYSTEM_DEF(traumas)
"skeletons" = typecacheof(list(/datum/species/skeleton, /datum/species/plasmaman)),
"conspiracies" = typecacheof(list(/datum/species/abductor, /datum/species/lizard)),
"robots" = typecacheof(list(/datum/species/android, /datum/species/ipc)),
- "the supernatural" = typecacheof(list(/datum/species/golem/runic)),
"aliens" = typecacheof(list(
/datum/species/abductor, /datum/species/jelly, /datum/species/pod)),
"spiders" = typecacheof(list(/datum/species/spider))
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index ba64c98c56c9..b06baa1c49c2 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -120,7 +120,7 @@ SUBSYSTEM_DEF(vote)
text += "
Vote Result: Inconclusive - No Votes!"
log_vote(text)
remove_action_buttons()
- to_chat(world, "\n
[text]")
+ to_chat(world, span_purple(examine_block(text)))
return .
/datum/controller/subsystem/vote/proc/result()
@@ -218,10 +218,10 @@ SUBSYSTEM_DEF(vote)
log_vote(text)
var/vp = CONFIG_GET(number/vote_period)
- var/vote_message = "\n
[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote."
+ var/vote_message = "
[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote."
if(observer_vote_allowed)
- to_chat(world, vote_message)
- SEND_SOUND(world, sound('sound/misc/vinethud.ogg'))
+ to_chat(world, examine_block(vote_message))
+ SEND_SOUND(world, sound('sound/misc/compiler-stage2.ogg'))
time_remaining = round(vp/10)
for(var/c in GLOB.clients)
var/client/C = c
@@ -240,8 +240,8 @@ SUBSYSTEM_DEF(vote)
valid_clients -= C
for(var/c in valid_clients)
var/client/C = c
- SEND_SOUND(C, sound('sound/misc/vinethud.ogg'))
- to_chat(C.mob, vote_message)
+ SEND_SOUND(C, sound('sound/misc/compiler-stage2.ogg'))
+ to_chat(C.mob, examine_block(vote_message))
var/datum/action/vote/V = new
if(question)
V.name = "Vote: [question]"
diff --git a/code/datums/action.dm b/code/datums/action.dm
index d96e43c08be2..ff03b689085d 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -31,7 +31,7 @@
/datum/action/proc/link_to(Target)
target = Target
- RegisterSignal(Target, COMSIG_ATOM_UPDATED_ICON, .proc/OnUpdatedIcon)
+ RegisterSignal(Target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(OnUpdatedIcon))
/datum/action/Destroy()
if(owner)
@@ -47,7 +47,7 @@
return
Remove(owner)
owner = M
- RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/owner_deleted)
+ RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(owner_deleted))
//button id generation
var/counter = 0
diff --git a/code/datums/aquarium.dm b/code/datums/aquarium.dm
index 2bca6af8c26d..86551b9d25ce 100644
--- a/code/datums/aquarium.dm
+++ b/code/datums/aquarium.dm
@@ -68,7 +68,7 @@
src.animation_getter = animation_getter
src.animation_update_signals = animation_update_signals
if(animation_update_signals)
- RegisterSignal(parent, animation_update_signals, .proc/generate_animation)
+ RegisterSignal(parent, animation_update_signals, PROC_REF(generate_animation))
if(istype(parent,/obj/item/fish))
InitializeFromFish()
@@ -78,7 +78,7 @@
InitializeOther()
ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/enter_aquarium)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium))
//If component is added to something already in aquarium at the time initialize it properly.
var/atom/movable/movable_parent = parent
@@ -160,9 +160,9 @@
/datum/component/aquarium_content/proc/on_inserted(atom/aquarium)
current_aquarium = aquarium
- RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, .proc/on_removed)
- RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, .proc/on_surface_changed)
- RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED,.proc/on_fluid_changed)
+ RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, PROC_REF(on_removed))
+ RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, PROC_REF(on_surface_changed))
+ RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_fluid_changed))
if(processing)
START_PROCESSING(SSobj, src)
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 6e3ce4bb48ae..3044aacddfe7 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -69,8 +69,8 @@
visuals.emissive = emissive
visuals.update_appearance()
Draw()
- RegisterSignal(origin, COMSIG_MOVABLE_MOVED, .proc/redrawing)
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/redrawing)
+ RegisterSignal(origin, COMSIG_MOVABLE_MOVED, PROC_REF(redrawing))
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(redrawing))
/**
* Triggered by signals set up when the beam is set up. If it's still sane to create a beam, it removes the old beam, creates a new one. Otherwise it kills the beam.
@@ -84,7 +84,7 @@
SIGNAL_HANDLER
if(origin && target && get_dist(origin,target)
[pick("You have a coughing fit!", "You can't stop coughing!")]")
owner.Immobilize(20)
owner.emote("cough")
- addtimer(CALLBACK(owner, /mob/.proc/emote, "cough"), 6)
- addtimer(CALLBACK(owner, /mob/.proc/emote, "cough"), 12)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, emote), "cough"), 6)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, emote), "cough"), 12)
owner.emote("cough")
..()
diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm
index c2446f882b60..00ecd3a49c48 100644
--- a/code/datums/brain_damage/phobia.dm
+++ b/code/datums/brain_damage/phobia.dm
@@ -83,7 +83,7 @@
if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return
if(trigger_regex.Find(hearing_args[HEARING_RAW_MESSAGE]) != 0)
- addtimer(CALLBACK(src, .proc/freak_out, null, trigger_regex.group[2]), 10) //to react AFTER the chat message
+ addtimer(CALLBACK(src, PROC_REF(freak_out), null, trigger_regex.group[2]), 10) //to react AFTER the chat message
hearing_args[HEARING_RAW_MESSAGE] = trigger_regex.Replace(hearing_args[HEARING_RAW_MESSAGE], "$2$3")
/datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm
index 4e7563c5fb81..979c43e8e13e 100644
--- a/code/datums/brain_damage/severe.dm
+++ b/code/datums/brain_damage/severe.dm
@@ -185,7 +185,7 @@
to_chat(owner, "You feel sick...")
else
to_chat(owner, "You feel really sick at the thought of being alone!")
- addtimer(CALLBACK(owner, /mob/living/carbon.proc/vomit, high_stress), 50) //blood vomit if high stress
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living/carbon, vomit), high_stress), 50) //blood vomit if high stress
if(2)
if(!high_stress)
to_chat(owner, "You can't stop shaking...")
@@ -292,7 +292,7 @@
var/regex/reg = new("(\\b[REGEX_QUOTE(trigger_phrase)]\\b)","ig")
if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
- addtimer(CALLBACK(src, .proc/hypnotrigger), 10) //to react AFTER the chat message
+ addtimer(CALLBACK(src, PROC_REF(hypnotrigger)), 10) //to react AFTER the chat message
hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "*********")
/datum/brain_trauma/severe/hypnotic_trigger/proc/hypnotrigger()
diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm
index 68dae74b1f8c..9c447f4ab10a 100644
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -186,7 +186,7 @@
to_chat(owner, "Your connection to [linked_target] suddenly feels extremely strong... you can feel it pulling you!")
owner.playsound_local(owner, 'sound/magic/lightning_chargeup.ogg', 75, FALSE)
returning = TRUE
- addtimer(CALLBACK(src, .proc/snapback), 100)
+ addtimer(CALLBACK(src, PROC_REF(snapback)), 100)
/datum/brain_trauma/special/quantum_alignment/proc/snapback()
returning = FALSE
@@ -262,7 +262,7 @@
/datum/brain_trauma/special/death_whispers/proc/whispering()
ADD_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
active = TRUE
- addtimer(CALLBACK(src, .proc/cease_whispering), rand(50, 300))
+ addtimer(CALLBACK(src, PROC_REF(cease_whispering)), rand(50, 300))
/datum/brain_trauma/special/death_whispers/proc/cease_whispering()
REMOVE_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
@@ -306,7 +306,7 @@
var/atom/movable/AM = thing
SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION)
next_crisis = world.time + 600
- addtimer(CALLBACK(src, .proc/fade_in), duration)
+ addtimer(CALLBACK(src, PROC_REF(fade_in)), duration)
/datum/brain_trauma/special/existential_crisis/proc/fade_in()
QDEL_NULL(veil)
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index 78eb23a85b0b..ab391202a9d3 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -198,7 +198,7 @@
var/message = hearing_args[HEARING_RAW_MESSAGE]
if(findtext(message, codeword))
hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, "[codeword]")
- addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/brain_trauma/severe/split_personality, switch_personalities)), 10)
/datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
if(findtext(speech_args[SPEECH_MESSAGE], codeword))
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index c6d98adb0c0d..6aba94212699 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -17,7 +17,7 @@
/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null)
user = nuser
- RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/user_deleted)
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(user_deleted))
window_id = nwindow_id
if (ntitle)
title = format_text(ntitle)
@@ -236,7 +236,7 @@
winset(user, "mapwindow", "focus=true")
break
if (timeout)
- addtimer(CALLBACK(src, .proc/close), timeout)
+ addtimer(CALLBACK(src, PROC_REF(close)), timeout)
/datum/browser/modal/proc/wait()
while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time))
@@ -399,7 +399,7 @@
if ("color")
settings["mainsettings"][setting]["value"] = input(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]", settings["mainsettings"][setting]["value"]) as color
if ("boolean")
- settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("Yes","No")
+ settings["mainsettings"][setting]["value"] = (settings["mainsettings"][setting]["value"] == "Yes") ? "No" : "Yes"
if ("ckey")
settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("none") + GLOB.directory
if (settings["mainsettings"][setting]["callback"])
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index 76de87bef7a5..4fa2078f152b 100644
--- a/code/datums/callback.dm
+++ b/code/datums/callback.dm
@@ -37,14 +37,14 @@
* `CALLBACK(src, .some_proc_here)`
*
* ### when the above doesn't apply:
- *.proc/procname
+ * PROC_REF(procname)
*
- * `CALLBACK(src, .proc/some_proc_here)`
+ * `CALLBACK(src, PROC_REF(some_proc_here))`
*
*
* proc defined on a parent of a some type
*
- * `/some/type/.proc/some_proc_here`
+ * `TYPE_PROC_REF(/some/type, some_proc_here)`
*
* Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname)
*/
@@ -117,6 +117,12 @@
if (!object)
return
+#if DM_VERSION <= 514
+ if(istext(object) && object != GLOBAL_PROC)
+ to_chat(usr, "[object] may be an external library. Calling external libraries is disallowed.", confidential = TRUE)
+ return
+#endif
+
var/list/calling_arguments = arguments
if (length(args))
if (length(arguments))
@@ -152,6 +158,12 @@
if (!object)
return
+#if DM_VERSION <= 514
+ if(istext(object) && object != GLOBAL_PROC)
+ to_chat(usr, "[object] may be an external library. Calling external libraries is disallowed.", confidential = TRUE)
+ return
+#endif
+
var/list/calling_arguments = arguments
if (length(args))
if (length(arguments))
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 0b4b33ce5942..c27e0bd1b7ae 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -65,7 +65,7 @@
stack_trace("/datum/chatmessage created with [isnull(owner) ? "null" : "invalid"] mob owner")
qdel(src)
return
- INVOKE_ASYNC(src, .proc/generate_image, text, target, owner, extra_classes, lifespan)
+ INVOKE_ASYNC(src, PROC_REF(generate_image), text, target, owner, extra_classes, lifespan)
/datum/chatmessage/Destroy()
if (owned_by)
@@ -99,7 +99,7 @@
/datum/chatmessage/proc/generate_image(text, atom/target, mob/owner, list/extra_classes, lifespan)
// Register client who owns this message
owned_by = owner.client
- RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, .proc/on_parent_qdel)
+ RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel))
// Clip message
var/maxlen = owned_by.prefs.max_chat_length
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index 883e9fb99dee..c36fb3961664 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -66,7 +66,7 @@
//We are now playing this cinematic
//Handle what happens when a different cinematic tries to play over us
- RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, .proc/replacement_cinematic)
+ RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, PROC_REF(replacement_cinematic))
//Pause OOC
var/ooc_toggled = FALSE
@@ -78,7 +78,7 @@
for(var/MM in watchers)
var/mob/M = MM
show_to(M, M.client)
- RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, .proc/show_to)
+ RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(show_to))
//Close watcher ui's
SStgui.close_user_uis(M)
diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm
index 65b97e09b1a2..88ef0d97fabf 100644
--- a/code/datums/components/admin_popup.dm
+++ b/code/datums/components/admin_popup.dm
@@ -23,7 +23,7 @@
COMSIG_ADMIN_HELP_REPLIED,
COMSIG_PARENT_QDELETING,
),
- .proc/delete_self,
+ PROC_REF(delete_self),
)
/datum/component/admin_popup/Destroy(force, silent)
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index eede283e8b81..7cdb1db8f152 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -10,10 +10,10 @@
/datum/component/anti_magic/Initialize(_magic = FALSE, _holy = FALSE, _psychic = FALSE, _allowed_slots, _charges, _blocks_self = TRUE, datum/callback/_reaction, datum/callback/_expire)
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
else if(ismob(parent))
- RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect)
+ RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect))
else
return COMPONENT_INCOMPATIBLE
@@ -34,7 +34,7 @@
if(!(allowed_slots & slot)) //Check that the slot is valid for antimagic
UnregisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC)
return
- RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect, TRUE)
+ RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect), TRUE)
/datum/component/anti_magic/proc/on_drop(datum/source, mob/user)
SIGNAL_HANDLER
diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm
index 2bca6af8c26d..86551b9d25ce 100644
--- a/code/datums/components/aquarium.dm
+++ b/code/datums/components/aquarium.dm
@@ -68,7 +68,7 @@
src.animation_getter = animation_getter
src.animation_update_signals = animation_update_signals
if(animation_update_signals)
- RegisterSignal(parent, animation_update_signals, .proc/generate_animation)
+ RegisterSignal(parent, animation_update_signals, PROC_REF(generate_animation))
if(istype(parent,/obj/item/fish))
InitializeFromFish()
@@ -78,7 +78,7 @@
InitializeOther()
ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, src)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/enter_aquarium)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium))
//If component is added to something already in aquarium at the time initialize it properly.
var/atom/movable/movable_parent = parent
@@ -160,9 +160,9 @@
/datum/component/aquarium_content/proc/on_inserted(atom/aquarium)
current_aquarium = aquarium
- RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, .proc/on_removed)
- RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, .proc/on_surface_changed)
- RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED,.proc/on_fluid_changed)
+ RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, PROC_REF(on_removed))
+ RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, PROC_REF(on_surface_changed))
+ RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_fluid_changed))
if(processing)
START_PROCESSING(SSobj, src)
diff --git a/code/datums/components/archaeology.dm b/code/datums/components/archaeology.dm
index 3be37b94db69..c4f0d7dc3d59 100644
--- a/code/datums/components/archaeology.dm
+++ b/code/datums/components/archaeology.dm
@@ -15,9 +15,9 @@
archdrops[i][ARCH_PROB] = 100
stack_trace("ARCHAEOLOGY WARNING: [parent] contained a null probability value in [i].")
callback = _callback
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/Dig)
- RegisterSignal(parent, COMSIG_ATOM_EX_ACT, .proc/BombDig)
- RegisterSignal(parent, COMSIG_ATOM_SING_PULL, .proc/SingDig)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(Dig))
+ RegisterSignal(parent, COMSIG_ATOM_EX_ACT, PROC_REF(BombDig))
+ RegisterSignal(parent, COMSIG_ATOM_SING_PULL, PROC_REF(SingDig))
/datum/component/archaeology/InheritComponent(datum/component/archaeology/A, i_am_original)
var/list/other_archdrops = A.archdrops
diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm
index 49f79930352c..d90da9ee24a3 100644
--- a/code/datums/components/armor_plate.dm
+++ b/code/datums/components/armor_plate.dm
@@ -9,11 +9,11 @@
if(!isobj(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate)
- RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(applyplate))
+ RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(dropplates))
if(istype(parent, /obj/mecha/working/ripley))
- RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays)
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_mech_overlays))
if(_maxamount)
maxamount = _maxamount
diff --git a/code/datums/components/art.dm b/code/datums/components/art.dm
index 13249a19e736..e00261b6d9b3 100644
--- a/code/datums/components/art.dm
+++ b/code/datums/components/art.dm
@@ -4,13 +4,13 @@
/datum/component/art/Initialize(impress)
impressiveness = impress
if(isobj(parent))
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_obj_examine)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_obj_examine))
else
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_other_examine)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_other_examine))
if(isstructure(parent))
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/apply_moodlet)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(apply_moodlet))
/datum/component/art/proc/apply_moodlet(mob/M, impress)
SIGNAL_HANDLER
@@ -43,7 +43,7 @@
/datum/component/art/proc/on_attack_hand(datum/source, mob/M)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/examine, source, M)
+ INVOKE_ASYNC(src, PROC_REF(examine), source, M)
/datum/component/art/proc/examine(datum/source, mob/M)
@@ -51,3 +51,17 @@
if(!do_after(M, 20, target = parent))
return
on_obj_examine(source, M)
+
+/datum/component/art/rilena
+
+/datum/component/art/rilena/apply_moodlet(mob/living/user, impress)
+ var/msg
+ if(HAS_TRAIT(user, TRAIT_FAN_RILENA))
+ SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
+ msg = "You love this franchise!"
+ else
+ msg = "You don't get it. At least it's not ugly."
+ user.visible_message(
+ "[user] stops and looks intently at [parent].",
+ "You stop to take in [parent]. [msg]"
+ )
diff --git a/code/datums/components/bane.dm b/code/datums/components/bane.dm
index 4ac2c77525a6..8d7c7a08a65f 100644
--- a/code/datums/components/bane.dm
+++ b/code/datums/components/bane.dm
@@ -20,9 +20,9 @@
/datum/component/bane/RegisterWithParent()
if(speciestype)
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/speciesCheck)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(speciesCheck))
else
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/mobCheck)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(mobCheck))
/datum/component/bane/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK)
diff --git a/code/datums/components/beauty.dm b/code/datums/components/beauty.dm
index 9b3398b4ce96..fe3c06e3ad5a 100644
--- a/code/datums/components/beauty.dm
+++ b/code/datums/components/beauty.dm
@@ -8,8 +8,8 @@
beauty = beautyamount
if(ismovable(parent))
- RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/enter_area)
- RegisterSignal(parent, COMSIG_EXIT_AREA, .proc/exit_area)
+ RegisterSignal(parent, COMSIG_ENTER_AREA, PROC_REF(enter_area))
+ RegisterSignal(parent, COMSIG_EXIT_AREA, PROC_REF(exit_area))
var/area/A = get_area(parent)
if(A)
diff --git a/code/datums/components/beetlejuice.dm b/code/datums/components/beetlejuice.dm
index c8b4b53c26ba..1b7bc8b3afc9 100644
--- a/code/datums/components/beetlejuice.dm
+++ b/code/datums/components/beetlejuice.dm
@@ -23,7 +23,7 @@
keyword = M.real_name
update_regex()
- RegisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL, .proc/say_react)
+ RegisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL, PROC_REF(say_react))
/datum/component/beetlejuice/proc/update_regex()
R = regex("[REGEX_QUOTE(keyword)]","g[case_sensitive ? "" : "i"]")
diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm
index 5f16085b7927..03afc96182dc 100644
--- a/code/datums/components/bloodysoles.dm
+++ b/code/datums/components/bloodysoles.dm
@@ -26,9 +26,9 @@
return COMPONENT_INCOMPATIBLE
parent_atom = parent
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean))
//Unregisters from the wielder if necessary
@@ -96,8 +96,8 @@ Used to register our wielder
equipped_slot = slot
wielder = equipper
- RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(wielder, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood)
+ RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(wielder, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood))
/*
Called when the parent item has been dropped
@@ -224,11 +224,11 @@ Like its parent but can be applied to carbon mobs instead of clothing items
if(!bloody_feet)
bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood)
- RegisterSignal(parent, COMSIG_CARBON_UNEQUIP_SHOECOVER, .proc/unequip_shoecover)
- RegisterSignal(parent, COMSIG_CARBON_EQUIP_SHOECOVER, .proc/equip_shoecover)
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood))
+ RegisterSignal(parent, COMSIG_CARBON_UNEQUIP_SHOECOVER, PROC_REF(unequip_shoecover))
+ RegisterSignal(parent, COMSIG_CARBON_EQUIP_SHOECOVER, PROC_REF(equip_shoecover))
/datum/component/bloodysoles/feet/update_icon()
. = list()
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
index 9195d425b342..6923760a7705 100644
--- a/code/datums/components/butchering.dm
+++ b/code/datums/components/butchering.dm
@@ -26,7 +26,7 @@
if(_can_be_blunt)
can_be_blunt = _can_be_blunt
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/onItemAttack)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(onItemAttack))
/datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user)
SIGNAL_HANDLER
@@ -35,7 +35,7 @@
return
if(M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it?
if(butchering_enabled && (can_be_blunt || source.get_sharpness()))
- INVOKE_ASYNC(src, .proc/startButcher, source, M, user)
+ INVOKE_ASYNC(src, PROC_REF(startButcher), source, M, user)
return COMPONENT_ITEM_NO_ATTACK
if(ishuman(M) && source.force && source.get_sharpness())
@@ -45,7 +45,7 @@
user.show_message("[H]'s neck has already been already cut, you can't make the bleeding any worse!", MSG_VISUAL, \
"Their neck has already been already cut, you can't make the bleeding any worse!")
return COMPONENT_ITEM_NO_ATTACK
- INVOKE_ASYNC(src, .proc/startNeckSlice, source, H, user)
+ INVOKE_ASYNC(src, PROC_REF(startNeckSlice), source, H, user)
return COMPONENT_ITEM_NO_ATTACK
/datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user)
@@ -122,7 +122,7 @@
return
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections)
diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm
index aac5f65a3956..33706c7c6d68 100644
--- a/code/datums/components/caltrop.dm
+++ b/code/datums/components/caltrop.dm
@@ -8,7 +8,7 @@
///given to connect_loc to listen for something moving over target
var/static/list/crossed_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
/datum/component/caltrop/Initialize(_min_damage = 0, _max_damage = 0, _probability = 100, _flags = NONE)
@@ -24,7 +24,7 @@
if(ismovable(parent))
AddComponent(/datum/component/connect_loc_behalf, parent, crossed_connections)
else
- RegisterSignal(get_turf(parent), COMSIG_ATOM_ENTERED, .proc/on_entered)
+ RegisterSignal(get_turf(parent), COMSIG_ATOM_ENTERED, PROC_REF(on_entered))
// Inherit the new values passed to the component
/datum/component/caltrop/InheritComponent(datum/component/caltrop/new_comp, original, min_damage, max_damage, probability, flags, soundfile)
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index dfb3bafbfb0e..f18002a05bd3 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -27,7 +27,7 @@
))
/datum/component/chasm/Initialize(turf/target)
- RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/Entered)
+ RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(Entered))
target_turf = target
START_PROCESSING(SSobj, src) // process on create, in case stuff is still there
@@ -61,7 +61,7 @@
for (var/thing in to_check)
if (droppable(thing))
. = TRUE
- INVOKE_ASYNC(src, .proc/drop, thing)
+ INVOKE_ASYNC(src, PROC_REF(drop), thing)
/datum/component/chasm/proc/droppable(atom/movable/AM)
var/datum/weakref/falling_ref = WEAKREF(AM)
diff --git a/code/datums/components/connect_containers.dm b/code/datums/components/connect_containers.dm
index d8a3ac8fbd3e..fe957e3b94a3 100644
--- a/code/datums/components/connect_containers.dm
+++ b/code/datums/components/connect_containers.dm
@@ -37,8 +37,8 @@
tracked = new_tracked
if(!tracked)
return
- RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel)
+ RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel))
update_signals(tracked)
/datum/component/connect_containers/proc/handle_tracked_qdel()
@@ -50,7 +50,7 @@
return
for(var/atom/movable/container as anything in get_nested_locs(listener))
- RegisterSignal(container, COMSIG_MOVABLE_MOVED, .proc/on_moved)
+ RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
for(var/signal in connections)
parent.RegisterSignal(container, signal, connections[signal])
diff --git a/code/datums/components/connect_loc_behalf.dm b/code/datums/components/connect_loc_behalf.dm
index b758b6ad5f32..297227e2aedd 100644
--- a/code/datums/components/connect_loc_behalf.dm
+++ b/code/datums/components/connect_loc_behalf.dm
@@ -20,8 +20,8 @@
src.tracked = tracked
/datum/component/connect_loc_behalf/RegisterWithParent()
- RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel)
+ RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel))
update_signals()
/datum/component/connect_loc_behalf/UnregisterFromParent()
diff --git a/code/datums/components/connect_range.dm b/code/datums/components/connect_range.dm
index 5642b2ed4e2d..093841833d8c 100644
--- a/code/datums/components/connect_range.dm
+++ b/code/datums/components/connect_range.dm
@@ -58,8 +58,8 @@
if(!tracked)
return
//Register signals on the new tracked atom and its surroundings.
- RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel)
+ RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel))
update_signals(tracked)
/datum/component/connect_range/proc/handle_tracked_qdel()
@@ -79,7 +79,7 @@
return
//Keep track of possible movement of all movables the target is in.
for(var/atom/movable/container as anything in get_nested_locs(target))
- RegisterSignal(container, COMSIG_MOVABLE_MOVED, .proc/on_moved)
+ RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
if(on_same_turf && !forced)
return
diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm
index ad1392c116d5..640aea796518 100644
--- a/code/datums/components/construction.dm
+++ b/code/datums/components/construction.dm
@@ -15,8 +15,8 @@
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/action)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(action))
update_parent(index)
/datum/component/construction/proc/examine(datum/source, mob/user, list/examine_list)
@@ -34,7 +34,7 @@
/datum/component/construction/proc/action(datum/source, obj/item/I, mob/living/user)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/check_step, I, user)
+ INVOKE_ASYNC(src, PROC_REF(check_step), I, user)
/datum/component/construction/proc/update_index(diff)
index += diff
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index a804ec657526..df5ae1319c2e 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -1,6 +1,6 @@
/datum/component/personal_crafting/Initialize()
if(ismob(parent))
- RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, .proc/create_mob_button)
+ RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(create_mob_button))
/datum/component/personal_crafting/proc/create_mob_button(mob/user, client/CL)
SIGNAL_HANDLER
@@ -10,7 +10,7 @@
C.icon = H.ui_style
H.static_inventory += C
CL.screen += C
- RegisterSignal(C, COMSIG_CLICK, .proc/component_ui_interact)
+ RegisterSignal(C, COMSIG_CLICK, PROC_REF(component_ui_interact))
/datum/component/personal_crafting
var/busy
@@ -318,7 +318,7 @@
SIGNAL_HANDLER
if(user == parent)
- INVOKE_ASYNC(src, .proc/ui_interact, user)
+ INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
/datum/component/personal_crafting/ui_state(mob/user)
return GLOB.not_incapacitated_turf_state
diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm
index 96a013df406a..9ec90bf09eac 100644
--- a/code/datums/components/crafting/recipes.dm
+++ b/code/datums/components/crafting/recipes.dm
@@ -113,35 +113,6 @@
category= CAT_WEAPONRY
subcategory = CAT_WEAPON
-/datum/crafting_recipe/tailclub
- name = "Tail Club"
- result = /obj/item/tailclub
- reqs = list(/obj/item/organ/tail/lizard = 1,
- /obj/item/stack/sheet/metal = 1)
- blacklist = list(/obj/item/organ/tail/lizard/fake)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/tailwhip
- name = "Liz O' Nine Tails"
- result = /obj/item/melee/chainofcommand/tailwhip
- reqs = list(/obj/item/organ/tail/lizard = 1,
- /obj/item/stack/cable_coil = 1)
- blacklist = list(/obj/item/organ/tail/lizard/fake)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/catwhip
- name = "Cat O' Nine Tails"
- result = /obj/item/melee/chainofcommand/tailwhip/kitty
- reqs = list(/obj/item/organ/tail/cat = 1,
- /obj/item/stack/cable_coil = 1)
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
/datum/crafting_recipe/ed209
name = "ED209"
result = /mob/living/simple_animal/bot/secbot/ed209
@@ -372,28 +343,6 @@
parts = list(/obj/item/camera = 1)
category = CAT_MISC
-/datum/crafting_recipe/lizardhat
- name = "lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
- time = 10
- reqs = list(/obj/item/organ/tail/lizard = 1)
- category = CAT_CLOTHING
-
-/datum/crafting_recipe/lizardhat_alternate
- name = "lizard Cloche Hat"
- result = /obj/item/clothing/head/lizard
- time = 10
- reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1)
- category = CAT_CLOTHING
-
-/datum/crafting_recipe/kittyears
- name = "Kitty Ears"
- result = /obj/item/clothing/head/kitty/genuine
- time = 10
- reqs = list(/obj/item/organ/tail/cat = 1,
- /obj/item/organ/ears/cat = 1)
- category = CAT_CLOTHING
-
/datum/crafting_recipe/skateboard
name = "Skateboard"
result = /obj/vehicle/ridden/scooter/skateboard
@@ -1164,9 +1113,23 @@
/datum/crafting_recipe/breakawayflask
name = "Breakaway Flask"
- result = /obj/item/reagent_containers/food/drinks/drinkingglass/breakawayflask
+ result = /obj/item/reagent_containers/food/drinks/breakawayflask
time = 5 SECONDS
reqs = list(/obj/item/stack/sheet/glass = 5,
/obj/item/stack/sheet/mineral/plasma = 1)
tools = list(TOOL_WELDER)
- category = CAT_MISC
+ category = CAT_DRINK
+
+/datum/crafting_recipe/fermenting_barrel
+ name = "Wooden Barrel"
+ result = /obj/structure/fermenting_barrel
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 8)
+ time = 50
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/distiller
+ name = "Distiller"
+ result = /obj/structure/fermenting_barrel/distiller
+ reqs = list(/obj/item/stack/sheet/mineral/wood = 8, /obj/item/stack/sheet/metal = 5, /datum/reagent/srm_bacteria = 30)
+ time = 50
+ category = CAT_PRIMAL
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index d02a60c0178f..4caaa55ded29 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -236,13 +236,3 @@
reqs = list(/obj/item/stack/sheet/leather = 2)
time = 45
category = CAT_CLOTHING
-
-/datum/crafting_recipe/lizardboots
- name = "lizard Skin Boots"
- result = /obj/effect/spawner/lootdrop/lizardboots
- reqs = list(
- /obj/item/stack/sheet/animalhide/lizard = 1,
- /obj/item/stack/sheet/leather = 1
- )
- time = 60
- category = CAT_CLOTHING
diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm
index fcd1f1b8cc74..019bb7362bd2 100644
--- a/code/datums/components/creamed.dm
+++ b/code/datums/components/creamed.dm
@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list(
RegisterSignal(parent, list(
COMSIG_COMPONENT_CLEAN_ACT,
COMSIG_COMPONENT_CLEAN_FACE_ACT),
- .proc/clean_up)
+ PROC_REF(clean_up))
/datum/component/creamed/UnregisterFromParent()
UnregisterSignal(parent, list(
diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm
index e48651ea7d86..f34960db1072 100644
--- a/code/datums/components/deadchat_control.dm
+++ b/code/datums/components/deadchat_control.dm
@@ -14,13 +14,13 @@
/datum/component/deadchat_control/Initialize(_deadchat_mode, _inputs, _input_cooldown = 12 SECONDS)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, .proc/orbit_begin)
- RegisterSignal(parent, COMSIG_ATOM_ORBIT_STOP, .proc/orbit_stop)
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, PROC_REF(orbit_begin))
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_STOP, PROC_REF(orbit_stop))
deadchat_mode = _deadchat_mode
inputs = _inputs
input_cooldown = _input_cooldown
if(deadchat_mode == DEMOCRACY_MODE)
- timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP)
+ timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP)
notify_ghosts("[parent] is now deadchat controllable!", source = parent, action = NOTIFY_ORBIT, header="Something Interesting!")
@@ -42,7 +42,7 @@
return MOB_DEADSAY_SIGNAL_INTERCEPT
inputs[message].Invoke()
ckey_to_cooldown[source.ckey] = TRUE
- addtimer(CALLBACK(src, .proc/remove_cooldown, source.ckey), input_cooldown)
+ addtimer(CALLBACK(src, PROC_REF(remove_cooldown), source.ckey), input_cooldown)
else if(deadchat_mode == DEMOCRACY_MODE)
ckey_to_cooldown[source.ckey] = message
return MOB_DEADSAY_SIGNAL_INTERCEPT
@@ -94,14 +94,14 @@
return
ckey_to_cooldown = list()
if(var_value == DEMOCRACY_MODE)
- timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP)
+ timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP)
else
deltimer(timerid)
/datum/component/deadchat_control/proc/orbit_begin(atom/source, atom/orbiter)
SIGNAL_HANDLER
- RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, .proc/deadchat_react)
+ RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, PROC_REF(deadchat_react))
orbiters |= orbiter
/datum/component/deadchat_control/proc/orbit_stop(atom/source, atom/orbiter)
diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm
index 19e41148d3bd..b2a2cddf9c9b 100644
--- a/code/datums/components/dejavu.dm
+++ b/code/datums/components/dejavu.dm
@@ -42,22 +42,22 @@
tox_loss = L.getToxLoss()
oxy_loss = L.getOxyLoss()
brain_loss = L.getOrganLoss(ORGAN_SLOT_BRAIN)
- rewind_type = .proc/rewind_living
+ rewind_type = PROC_REF(rewind_living)
if(iscarbon(parent))
var/mob/living/carbon/C = parent
saved_bodyparts = C.save_bodyparts()
- rewind_type = .proc/rewind_carbon
+ rewind_type = PROC_REF(rewind_carbon)
else if(isanimal(parent))
var/mob/living/simple_animal/M = parent
brute_loss = M.bruteloss
- rewind_type = .proc/rewind_animal
+ rewind_type = PROC_REF(rewind_animal)
else if(isobj(parent))
var/obj/O = parent
integrity = O.obj_integrity
- rewind_type = .proc/rewind_obj
+ rewind_type = PROC_REF(rewind_obj)
addtimer(CALLBACK(src, rewind_type), rewind_interval)
diff --git a/code/datums/components/deployable.dm b/code/datums/components/deployable.dm
index efb19f9246af..0e38fa84e236 100644
--- a/code/datums/components/deployable.dm
+++ b/code/datums/components/deployable.dm
@@ -27,8 +27,8 @@
src.thing_to_be_deployed = thing_to_be_deployed
src.delete_on_use = delete_on_use
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_hand)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_hand))
var/obj/item/typecast = thing_to_be_deployed
deployed_name = initial(typecast.name)
@@ -40,7 +40,7 @@
/datum/component/deployable/proc/on_attack_hand(datum/source, mob/user, location, direction)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/deploy, source, user, location, direction)
+ INVOKE_ASYNC(src, PROC_REF(deploy), source, user, location, direction)
/datum/component/deployable/proc/deploy(obj/source, mob/user, location, direction) //If there's no user, location and direction are used
var/obj/deployed_object //Used for spawning the deployed object
diff --git a/code/datums/components/dooropendeathproc.dm b/code/datums/components/dooropendeathproc.dm
index cda6a31f270d..0f90bf623aac 100644
--- a/code/datums/components/dooropendeathproc.dm
+++ b/code/datums/components/dooropendeathproc.dm
@@ -11,7 +11,7 @@
src.door_id = door_id
/datum/component/poddoor_on_death/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/open_doors)
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(open_doors))
/datum/component/poddoor_on_death/proc/open_doors()
for(var/obj/machinery/door/poddoor/D in GLOB.machines)
diff --git a/code/datums/components/earprotection.dm b/code/datums/components/earprotection.dm
index 9256c4310a70..6439e49b831f 100644
--- a/code/datums/components/earprotection.dm
+++ b/code/datums/components/earprotection.dm
@@ -1,7 +1,7 @@
/datum/component/wearertargeting/earprotection
signals = list(COMSIG_CARBON_SOUNDBANG)
mobtype = /mob/living/carbon
- proctype = .proc/reducebang
+ proctype = PROC_REF(reducebang)
/datum/component/wearertargeting/earprotection/Initialize(_valid_slots)
. = ..()
diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm
index b9a89ad9de90..3a047d082868 100644
--- a/code/datums/components/edible.dm
+++ b/code/datums/components/edible.dm
@@ -38,12 +38,12 @@ Behavior that's still missing from this component that original food items had t
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, .proc/UseByAnimal)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(UseByAnimal))
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/UseFromHand)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand))
else if(isturf(parent))
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/TryToEatTurf)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(TryToEatTurf))
src.bite_consumption = bite_consumption
src.food_flags = food_flags
diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm
index da801bc9e0bb..fb69b67a5e9d 100644
--- a/code/datums/components/edit_complainer.dm
+++ b/code/datums/components/edit_complainer.dm
@@ -16,10 +16,10 @@
)
say_lines = text || default_lines
- RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react)
+ RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, PROC_REF(var_edit_react))
/datum/component/edit_complainer/proc/var_edit_react(datum/source, list/arguments)
SIGNAL_HANDLER
var/atom/movable/master = parent
- master.say(pick(say_lines))
+ master.visible_message(pick(say_lines))
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index dcb4aff50bdf..ee789d3f9829 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -99,12 +99,12 @@
/datum/component/embedded/RegisterWithParent()
if(iscarbon(parent))
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/jostleCheck)
- RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, .proc/ripOutCarbon)
- RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, .proc/safeRemoveCarbon)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(jostleCheck))
+ RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, PROC_REF(ripOutCarbon))
+ RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, PROC_REF(safeRemoveCarbon))
else if(isclosedturf(parent))
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examineTurf)
- RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/itemMoved)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examineTurf))
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(itemMoved))
/datum/component/embedded/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_EXAMINE))
@@ -136,7 +136,7 @@
limb.embedded_objects |= weapon // on the inside... on the inside...
weapon.forceMove(victim)
- RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/byeItemCarbon)
+ RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(byeItemCarbon))
if(harmful)
victim.visible_message("[weapon] embeds itself in [victim]'s [limb.name]!",ignored_mobs=victim)
@@ -192,7 +192,7 @@
var/mob/living/carbon/victim = parent
var/time_taken = rip_time * weapon.w_class
- INVOKE_ASYNC(src, .proc/complete_rip_out, victim, I, limb, time_taken)
+ INVOKE_ASYNC(src, PROC_REF(complete_rip_out), victim, I, limb, time_taken)
/// everything async that ripOut used to do
/datum/component/embedded/proc/complete_rip_out(mob/living/carbon/victim, obj/item/I, obj/item/bodypart/limb, time_taken)
@@ -239,7 +239,7 @@
return
if(to_hands)
- INVOKE_ASYNC(victim, /mob.proc/put_in_hands, weapon)
+ INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, put_in_hands), weapon)
else
weapon.forceMove(get_turf(victim))
@@ -305,7 +305,7 @@
// we can't store the item IN the turf (cause turfs are just kinda... there), so we fake it by making the item invisible and bailing if it moves due to a blast
weapon.forceMove(hit)
weapon.invisibility = INVISIBILITY_ABSTRACT
- RegisterSignal(weapon, COMSIG_MOVABLE_MOVED, .proc/itemMoved)
+ RegisterSignal(weapon, COMSIG_MOVABLE_MOVED, PROC_REF(itemMoved))
var/pixelX = rand(-2, 2)
var/pixelY = rand(-1, 3) // bias this upwards since in-hands are usually on the lower end of the sprite
@@ -328,7 +328,7 @@
var/matrix/M = matrix()
M.Translate(pixelX, pixelY)
overlay.transform = M
- RegisterSignal(hit,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/apply_overlay)
+ RegisterSignal(hit,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay))
hit.update_appearance()
if(harmful)
diff --git a/code/datums/components/empprotection.dm b/code/datums/components/empprotection.dm
index 513370f3d5fa..bb94b08e55a9 100644
--- a/code/datums/components/empprotection.dm
+++ b/code/datums/components/empprotection.dm
@@ -5,7 +5,7 @@
if(!istype(parent, /atom))
return COMPONENT_INCOMPATIBLE
flags = _flags
- RegisterSignal(parent, list(COMSIG_ATOM_EMP_ACT), .proc/getEmpFlags)
+ RegisterSignal(parent, list(COMSIG_ATOM_EMP_ACT), PROC_REF(getEmpFlags))
/datum/component/empprotection/proc/getEmpFlags(datum/source, severity)
SIGNAL_HANDLER
diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm
index 360ab1dca847..abf16ecd4be5 100644
--- a/code/datums/components/explodable.dm
+++ b/code/datums/components/explodable.dm
@@ -12,16 +12,16 @@
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/explodable_attack)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, .proc/explodable_insert_item)
- RegisterSignal(parent, COMSIG_ATOM_EX_ACT, .proc/detonate)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(explodable_attack))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, PROC_REF(explodable_insert_item))
+ RegisterSignal(parent, COMSIG_ATOM_EX_ACT, PROC_REF(detonate))
if(ismovable(parent))
- RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/explodable_impact)
- RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/explodable_bump)
+ RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(explodable_impact))
+ RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(explodable_bump))
if(isitem(parent))
- RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/explodable_attack)
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), PROC_REF(explodable_attack))
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
@@ -71,7 +71,7 @@
/datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot)
SIGNAL_HANDLER
- RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMGE, .proc/explodable_attack_zone, TRUE)
+ RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMGE, PROC_REF(explodable_attack_zone), TRUE)
/datum/component/explodable/proc/on_drop(datum/source, mob/user)
SIGNAL_HANDLER
diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm
index 78b9d64cbd20..585c98c59171 100644
--- a/code/datums/components/fishing_spot.dm
+++ b/code/datums/components/fishing_spot.dm
@@ -17,8 +17,8 @@
stack_trace("Invalid fishing spot configuration \"[configuration]\" passed down to fishing spot component.")
return COMPONENT_INCOMPATIBLE
fish_source = preset_configuration
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/handle_attackby)
- RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, .proc/handle_cast)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attackby))
+ RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast))
/datum/component/fishing_spot/proc/handle_cast(datum/source, obj/item/fishing_rod/rod, mob/user)
@@ -54,7 +54,7 @@
var/datum/fishing_challenge/challenge = new(parent, result, rod, user)
challenge.background = fish_source.background
challenge.difficulty = fish_source.calculate_difficulty(result, rod, user)
- RegisterSignal(challenge, COMSIG_FISHING_CHALLENGE_COMPLETED, .proc/fishing_completed)
+ RegisterSignal(challenge, COMSIG_FISHING_CHALLENGE_COMPLETED, PROC_REF(fishing_completed))
challenge.start(user)
/datum/component/fishing_spot/proc/fishing_completed(datum/fishing_challenge/source, mob/user, success, perfect)
diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm
index 95099164eec2..2e5533023ac8 100644
--- a/code/datums/components/footstep.dm
+++ b/code/datums/components/footstep.dm
@@ -23,7 +23,7 @@
if(FOOTSTEP_MOB_HUMAN)
if(!ishuman(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_humanstep)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), PROC_REF(play_humanstep))
return
if(FOOTSTEP_MOB_CLAW)
footstep_sounds = GLOB.clawfootstep
@@ -35,7 +35,7 @@
footstep_sounds = GLOB.footstep
if(FOOTSTEP_MOB_SLIME)
footstep_sounds = 'sound/effects/footstep/slime1.ogg'
- RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_simplestep) //Note that this doesn't get called for humans.
+ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), PROC_REF(play_simplestep)) //Note that this doesn't get called for humans.
///Prepares a footstep. Determines if it should get played. Returns the turf it should get played on. Note that it is always a /turf/open
/datum/component/footstep/proc/prepare_step()
diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm
index cac8fb8eb42b..3c006073304c 100644
--- a/code/datums/components/forensics.dm
+++ b/code/datums/components/forensics.dm
@@ -25,7 +25,7 @@
/datum/component/forensics/RegisterWithParent()
check_blood()
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_act)
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_act))
/datum/component/forensics/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT))
@@ -190,4 +190,6 @@
return
if(!length(blood_DNA))
return
- parent.AddElement(/datum/element/decal/blood, _color = get_blood_dna_color(blood_DNA))
+ if(isitem(parent))
+ var/obj/item/I = parent
+ I.AddElement(/datum/element/decal/blood, initial(I.icon) || I.icon, initial(I.icon_state) || I.icon_state, _color = get_blood_dna_color(blood_DNA))
diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm
index bc55b9b76fc9..177093a49fef 100644
--- a/code/datums/components/fullauto.dm
+++ b/code/datums/components/fullauto.dm
@@ -10,6 +10,7 @@
var/mouse_parameters
var/autofire_shot_delay = 0.3 SECONDS //Time between individual shots.
var/mouse_status = AUTOFIRE_MOUSEUP //This seems hacky but there can be two MouseDown() without a MouseUp() in between if the user holds click and uses alt+tab, printscreen or similar.
+ var/enabled = TRUE
COOLDOWN_DECLARE(next_shot_cd)
@@ -18,7 +19,9 @@
if(!isgun(parent))
return COMPONENT_INCOMPATIBLE
var/obj/item/gun = parent
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/wake_up)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up))
+ RegisterSignal(parent, COMSIG_GUN_DISABLE_AUTOFIRE, PROC_REF(disable_autofire))
+ RegisterSignal(parent, COMSIG_GUN_ENABLE_AUTOFIRE, PROC_REF(enable_autofire))
if(_autofire_shot_delay)
autofire_shot_delay = _autofire_shot_delay
if(autofire_stat == AUTOFIRE_STAT_IDLE && ismob(gun.loc))
@@ -61,13 +64,13 @@
if(!QDELETED(usercli))
clicker = usercli
shooter = clicker.mob
- RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, .proc/on_mouse_down)
+ RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(on_mouse_down))
if(!QDELETED(shooter))
- RegisterSignal(shooter, COMSIG_MOB_LOGOUT, .proc/autofire_off)
+ RegisterSignal(shooter, COMSIG_MOB_LOGOUT, PROC_REF(autofire_off))
UnregisterSignal(shooter, COMSIG_MOB_LOGIN)
- RegisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), .proc/autofire_off)
- parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, /obj/item/gun/.proc/autofire_bypass_check)
- parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, /obj/item/gun/.proc/do_autofire)
+ RegisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(autofire_off))
+ parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, TYPE_PROC_REF(/obj/item/gun, autofire_bypass_check))
+ parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, TYPE_PROC_REF(/obj/item/gun, do_autofire))
/datum/component/automatic_fire/proc/autofire_off(datum/source)
SIGNAL_HANDLER
@@ -83,7 +86,7 @@
mouse_status = AUTOFIRE_MOUSEUP //In regards to the component there's no click anymore to care about.
clicker = null
if(!QDELETED(shooter))
- RegisterSignal(shooter, COMSIG_MOB_LOGIN, .proc/on_client_login)
+ RegisterSignal(shooter, COMSIG_MOB_LOGIN, PROC_REF(on_client_login))
UnregisterSignal(shooter, COMSIG_MOB_LOGOUT)
UnregisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED))
shooter = null
@@ -101,6 +104,8 @@
SIGNAL_HANDLER
var/list/modifiers = params2list(params) //If they're shift+clicking, for example, let's not have them accidentally shoot.
+ if(!enabled)
+ return
if(LAZYACCESS(modifiers, SHIFT_CLICK))
return
if(LAZYACCESS(modifiers, CTRL_CLICK))
@@ -136,7 +141,7 @@
target = _target
target_loc = get_turf(target)
mouse_parameters = params
- INVOKE_ASYNC(src, .proc/start_autofiring)
+ INVOKE_ASYNC(src, PROC_REF(start_autofiring))
//Dakka-dakka
@@ -149,10 +154,10 @@
clicker.mouse_pointer_icon = clicker.mouse_override_icon
if(mouse_status == AUTOFIRE_MOUSEUP) //See mouse_status definition for the reason for this.
- RegisterSignal(clicker, COMSIG_CLIENT_MOUSEUP, .proc/on_mouse_up)
+ RegisterSignal(clicker, COMSIG_CLIENT_MOUSEUP, PROC_REF(on_mouse_up))
mouse_status = AUTOFIRE_MOUSEDOWN
- RegisterSignal(shooter, COMSIG_MOB_SWAP_HANDS, .proc/stop_autofiring)
+ RegisterSignal(shooter, COMSIG_MOB_SWAP_HANDS, PROC_REF(stop_autofiring))
if(isgun(parent))
var/obj/item/gun/shoota = parent
@@ -166,7 +171,7 @@
return //If it fails, such as when the gun is empty, then there's no need to schedule a second shot.
START_PROCESSING(SSprojectiles, src)
- RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDRAG, .proc/on_mouse_drag)
+ RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDRAG, PROC_REF(on_mouse_drag))
/datum/component/automatic_fire/proc/on_mouse_up(datum/source, atom/object, turf/location, control, params)
@@ -243,9 +248,8 @@
if(!can_shoot())
shoot_with_empty_chamber(shooter)
return FALSE
- var/obj/item/bodypart/other_hand = shooter.has_hand_for_held_index(shooter.get_inactive_hand_index())
- if(weapon_weight == WEAPON_HEAVY && (shooter.get_inactive_held_item() || !other_hand))
- to_chat(shooter, "You need two hands to fire [src]!")
+ if(weapon_weight == WEAPON_HEAVY && (!wielded))
+ to_chat(shooter, "You need a more secure grip to fire [src]!")
return FALSE
return TRUE
@@ -260,10 +264,13 @@
SIGNAL_HANDLER
if(semicd || shooter.incapacitated())
return NONE
+ if(weapon_weight == WEAPON_HEAVY && (!wielded))
+ to_chat(shooter, "You need a more secure grip to fire [src]!")
+ return NONE
if(!can_shoot())
shoot_with_empty_chamber(shooter)
return NONE
- INVOKE_ASYNC(src, .proc/do_autofire_shot, source, target, shooter, params)
+ INVOKE_ASYNC(src, PROC_REF(do_autofire_shot), source, target, shooter, params)
return COMPONENT_AUTOFIRE_SHOT_SUCCESS //All is well, we can continue shooting.
@@ -273,8 +280,14 @@
if(istype(akimbo_gun) && weapon_weight < WEAPON_MEDIUM)
if(akimbo_gun.weapon_weight < WEAPON_MEDIUM && akimbo_gun.can_trigger_gun(shooter))
bonus_spread = dual_wield_spread
- addtimer(CALLBACK(akimbo_gun, /obj/item/gun.proc/process_fire, target, shooter, TRUE, params, null, bonus_spread), 1)
+ addtimer(CALLBACK(akimbo_gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, shooter, TRUE, params, null, bonus_spread), 1)
process_fire(target, shooter, TRUE, params, null, bonus_spread)
+/datum/component/automatic_fire/proc/disable_autofire()
+ enabled = FALSE
+
+/datum/component/automatic_fire/proc/enable_autofire()
+ enabled = TRUE
+
#undef AUTOFIRE_MOUSEUP
#undef AUTOFIRE_MOUSEDOWN
diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm
index 97d1962fe1bc..5fc6eb9d88ed 100644
--- a/code/datums/components/gps.dm
+++ b/code/datums/components/gps.dm
@@ -28,18 +28,18 @@ GLOBAL_LIST_EMPTY(GPS_list)
var/atom/A = parent
A.add_overlay("working")
A.name = "[initial(A.name)] ([gpstag])"
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
if(!emp_proof)
- RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_AltClick)
+ RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_AltClick))
///Called on COMSIG_ITEM_ATTACK_SELF
/datum/component/gps/item/proc/interact(datum/source, mob/user)
SIGNAL_HANDLER
if(user)
- INVOKE_ASYNC(src, .proc/ui_interact, user)
+ INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
///Called on COMSIG_PARENT_EXAMINE
/datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list)
@@ -55,7 +55,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
var/atom/A = parent
A.cut_overlay("working")
A.add_overlay("emp")
- addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
+ addtimer(CALLBACK(src, PROC_REF(reboot)), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
SStgui.close_uis(src) //Close the UI control if it is open.
///Restarts the GPS after getting turned off by an EMP.
diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm
index 19dc09464134..05809b5d2dd5 100644
--- a/code/datums/components/gunpoint.dm
+++ b/code/datums/components/gunpoint.dm
@@ -25,16 +25,16 @@
var/mob/living/shooter = parent
target = targ
weapon = wep
- RegisterSignal(targ, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK, COMSIG_MOVABLE_MOVED, COMSIG_MOB_FIRED_GUN), .proc/trigger_reaction)
+ RegisterSignal(targ, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK, COMSIG_MOVABLE_MOVED, COMSIG_MOB_FIRED_GUN), PROC_REF(trigger_reaction))
- RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), .proc/cancel)
+ RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), PROC_REF(cancel))
shooter.visible_message("[shooter] aims [weapon] point blank at [target]!", \
"You aim [weapon] point blank at [target]!", target)
to_chat(target, "[shooter] aims [weapon] point blank at you!")
- shooter.apply_status_effect(STATUS_EFFECT_HOLDUP)
- target.apply_status_effect(STATUS_EFFECT_HELDUP)
+ shooter.apply_status_effect(/datum/status_effect/holdup, shooter)
+ target.apply_status_effect(/datum/status_effect/grouped/heldup, shooter)
if(target.job == "Captain" && target.stat == CONSCIOUS && is_nuclear_operative(shooter))
if(istype(weapon, /obj/item/gun/ballistic/rocketlauncher) && weapon.chambered)
@@ -44,19 +44,20 @@
target.playsound_local(target.loc, 'sound/machines/chime.ogg', 50, TRUE)
SEND_SIGNAL(target, COMSIG_ADD_MOOD_EVENT, "gunpoint", /datum/mood_event/gunpoint)
- addtimer(CALLBACK(src, .proc/update_stage, 2), GUNPOINT_DELAY_STAGE_2)
+ addtimer(CALLBACK(src, PROC_REF(update_stage), 2), GUNPOINT_DELAY_STAGE_2)
/datum/component/gunpoint/Destroy(force, silent)
var/mob/living/shooter = parent
- shooter.remove_status_effect(STATUS_EFFECT_HOLDUP)
- target.remove_status_effect(STATUS_EFFECT_HELDUP)
+ shooter.remove_status_effect(/datum/status_effect/holdup)
+ target.remove_status_effect(/datum/status_effect/grouped/heldup, shooter)
+ SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint")
return ..()
/datum/component/gunpoint/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_deescalate)
- RegisterSignal(parent, COMSIG_MOB_APPLY_DAMGE, .proc/flinch)
- RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, .proc/check_shove)
- RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), .proc/check_bump)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_deescalate))
+ RegisterSignal(parent, COMSIG_MOB_APPLY_DAMGE, PROC_REF(flinch))
+ RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, PROC_REF(check_shove))
+ RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), PROC_REF(check_bump))
/datum/component/gunpoint/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
@@ -91,7 +92,7 @@
to_chat(parent, "You steady [weapon] on [target].")
to_chat(target, "[parent] has steadied [weapon] on you!")
damage_mult = GUNPOINT_MULT_STAGE_2
- addtimer(CALLBACK(src, .proc/update_stage, 3), GUNPOINT_DELAY_STAGE_3)
+ addtimer(CALLBACK(src, PROC_REF(update_stage), 3), GUNPOINT_DELAY_STAGE_3)
else if(stage == 3)
to_chat(parent, "You have fully steadied [weapon] on [target].")
to_chat(target, "[parent] has fully steadied [weapon] on you!")
@@ -105,17 +106,17 @@
/datum/component/gunpoint/proc/trigger_reaction()
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/async_trigger_reaction)
+ INVOKE_ASYNC(src, PROC_REF(async_trigger_reaction))
/datum/component/gunpoint/proc/async_trigger_reaction()
-
+ var/mob/living/shooter = parent
+ shooter.remove_status_effect(/datum/status_effect/holdup) // try doing these before the trigger gets pulled since the target (or shooter even) may not exist after pulling the trigger, dig?
+ target.remove_status_effect(/datum/status_effect/grouped/heldup, shooter)
SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint")
if(point_of_no_return)
return
point_of_no_return = TRUE
- var/mob/living/shooter = parent
-
if(!weapon.can_shoot() || !weapon.can_trigger_gun(shooter) || (weapon.weapon_weight == WEAPON_HEAVY && shooter.get_inactive_held_item()))
shooter.visible_message("[shooter] fumbles [weapon]!", \
"You fumble [weapon] and fail to fire at [target]!", target)
diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm
index d1a9bc753ef9..fc9983934ca6 100644
--- a/code/datums/components/heirloom.dm
+++ b/code/datums/components/heirloom.dm
@@ -9,7 +9,7 @@
owner = new_owner
family_name = new_family_name
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
/datum/component/heirloom/proc/examine(datum/source, mob/user, list/examine_list)
SIGNAL_HANDLER
diff --git a/code/datums/components/honkspam.dm b/code/datums/components/honkspam.dm
index 73b5e3335aad..ee457b4d967e 100644
--- a/code/datums/components/honkspam.dm
+++ b/code/datums/components/honkspam.dm
@@ -9,7 +9,7 @@
/datum/component/honkspam/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
/datum/component/honkspam/proc/reset_spamflag()
spam_flag = FALSE
@@ -19,4 +19,4 @@
spam_flag = TRUE
var/obj/item/parent_item = parent
playsound(parent_item.loc, 'sound/items/bikehorn.ogg', 50, TRUE)
- addtimer(CALLBACK(src, .proc/reset_spamflag), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reset_spamflag)), 2 SECONDS)
diff --git a/code/datums/components/hot_ice.dm b/code/datums/components/hot_ice.dm
index 018dfe800d1d..6192dc3256f8 100644
--- a/code/datums/components/hot_ice.dm
+++ b/code/datums/components/hot_ice.dm
@@ -9,8 +9,8 @@
src.gas_amount = gas_amount
src.temp_amount = temp_amount
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react)
- RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react))
+ RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(flame_react))
/datum/component/hot_ice/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY)
diff --git a/code/datums/components/igniter.dm b/code/datums/components/igniter.dm
index 152a325e92ee..270ff8b09857 100644
--- a/code/datums/components/igniter.dm
+++ b/code/datums/components/igniter.dm
@@ -9,11 +9,11 @@
/datum/component/igniter/RegisterWithParent()
if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
- RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+ RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit))
else if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack))
else if(ishostile(parent))
- RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/igniter/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index 3e2c8aab80c6..ceea1b3087a5 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -17,22 +17,22 @@
return COMPONENT_INCOMPATIBLE
var/static/list/disease_connections = list(
- COMSIG_ATOM_ENTERED = .proc/try_infect_crossed,
+ COMSIG_ATOM_ENTERED = PROC_REF(try_infect_crossed),
)
AddComponent(/datum/component/connect_loc_behalf, parent, disease_connections)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean)
- RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/try_infect_buckle)
- RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/try_infect_collide)
- RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, .proc/try_infect_impact_zone)
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean))
+ RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(try_infect_buckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(try_infect_collide))
+ RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(try_infect_impact_zone))
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, .proc/try_infect_attack_zone)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_infect_attack)
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/try_infect_equipped)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(try_infect_attack_zone))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack))
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped))
if(istype(parent, /obj/item/reagent_containers/food/snacks))
- RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/try_infect_eat)
+ RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat))
else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs))
- RegisterSignal(parent, COMSIG_GIBS_STREAK, .proc/try_infect_streak)
+ RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak))
/datum/component/infective/proc/try_infect_eat(datum/source, mob/living/eater, mob/living/feeder)
SIGNAL_HANDLER
diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm
index fcecf89f1d0c..034c37efd826 100644
--- a/code/datums/components/jousting.dm
+++ b/code/datums/components/jousting.dm
@@ -18,14 +18,14 @@
/datum/component/jousting/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack))
/datum/component/jousting/proc/on_equip(datum/source, mob/user, slot)
SIGNAL_HANDLER
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(mob_move), TRUE)
current_holder = user
/datum/component/jousting/proc/on_drop(datum/source, mob/user)
@@ -76,7 +76,7 @@
current_tile_charge++
if(current_timerid)
deltimer(current_timerid)
- current_timerid = addtimer(CALLBACK(src, .proc/reset_charge), movement_reset_tolerance, TIMER_STOPPABLE)
+ current_timerid = addtimer(CALLBACK(src, PROC_REF(reset_charge)), movement_reset_tolerance, TIMER_STOPPABLE)
/datum/component/jousting/proc/reset_charge()
current_tile_charge = 0
diff --git a/code/datums/components/knockback.dm b/code/datums/components/knockback.dm
index 1c572573ff7c..d07b2a8028dc 100644
--- a/code/datums/components/knockback.dm
+++ b/code/datums/components/knockback.dm
@@ -11,11 +11,11 @@
/datum/component/knockback/RegisterWithParent()
if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
- RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+ RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit))
else if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack))
else if(ishostile(parent))
- RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/knockback/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm
index 770f72cfea5b..f7809baf3d1e 100644
--- a/code/datums/components/knockoff.dm
+++ b/code/datums/components/knockoff.dm
@@ -7,8 +7,8 @@
/datum/component/knockoff/Initialize(knockoff_chance,zone_override,slots_knockoffable)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED,.proc/OnEquipped)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED,.proc/OnDropped)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(OnEquipped))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(OnDropped))
src.knockoff_chance = knockoff_chance
@@ -42,7 +42,7 @@
if(slots_knockoffable && !(slot in slots_knockoffable))
UnregisterSignal(H, COMSIG_HUMAN_DISARM_HIT)
return
- RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE)
+ RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, PROC_REF(Knockoff), TRUE)
/datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M)
SIGNAL_HANDLER
diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm
index f93e2d931470..4f3128ca6cd6 100644
--- a/code/datums/components/label.dm
+++ b/code/datums/components/label.dm
@@ -22,8 +22,8 @@
apply_label()
/datum/component/label/RegisterWithParent()
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackby)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/Examine)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackby))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(Examine))
/datum/component/label/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE))
diff --git a/code/datums/components/largeobjecttransparency.dm b/code/datums/components/largeobjecttransparency.dm
index 55819d4eef9a..cccb05b39ad9 100644
--- a/code/datums/components/largeobjecttransparency.dm
+++ b/code/datums/components/largeobjecttransparency.dm
@@ -36,7 +36,7 @@
return ..()
/datum/component/largetransparency/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_move)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
register_with_turfs()
/datum/component/largetransparency/UnregisterFromParent()
@@ -54,9 +54,9 @@
for(var/regist_tu in registered_turfs)
if(!regist_tu)
continue
- RegisterSignal(regist_tu, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_CREATED), .proc/object_enter)
- RegisterSignal(regist_tu, COMSIG_ATOM_EXITED, .proc/object_leave)
- RegisterSignal(regist_tu, COMSIG_TURF_CHANGE, .proc/on_turf_change)
+ RegisterSignal(regist_tu, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_CREATED), PROC_REF(object_enter))
+ RegisterSignal(regist_tu, COMSIG_ATOM_EXITED, PROC_REF(object_leave))
+ RegisterSignal(regist_tu, COMSIG_TURF_CHANGE, PROC_REF(on_turf_change))
for(var/thing in regist_tu)
var/atom/check_atom = thing
if(!(check_atom.flags_1 & SHOW_BEHIND_LARGE_ICONS_1))
@@ -80,7 +80,7 @@
/datum/component/largetransparency/proc/on_turf_change()
SIGNAL_HANDLER
- addtimer(CALLBACK(src, .proc/on_move), 1, TIMER_UNIQUE|TIMER_OVERRIDE) //*pain
+ addtimer(CALLBACK(src, PROC_REF(on_move)), 1, TIMER_UNIQUE|TIMER_OVERRIDE) //*pain
/datum/component/largetransparency/proc/object_enter(datum/source, atom/enterer)
SIGNAL_HANDLER
diff --git a/code/datums/components/lifesteal.dm b/code/datums/components/lifesteal.dm
index 6bbb1f4b7fbe..ed847477e076 100644
--- a/code/datums/components/lifesteal.dm
+++ b/code/datums/components/lifesteal.dm
@@ -10,11 +10,11 @@
/datum/component/lifesteal/RegisterWithParent()
if(isgun(parent))
- RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+ RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit))
else if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack))
else if(ishostile(parent))
- RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/lifesteal/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm
index af15ffe992a8..c9a5345db12c 100644
--- a/code/datums/components/lockon_aiming.dm
+++ b/code/datums/components/lockon_aiming.dm
@@ -26,7 +26,7 @@
if(target_callback)
can_target_callback = target_callback
else
- can_target_callback = CALLBACK(src, .proc/can_target)
+ can_target_callback = CALLBACK(src, PROC_REF(can_target))
if(range)
lock_cursor_range = range
if(typecache)
diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm
index aa986672189b..d97e88ca8fe9 100644
--- a/code/datums/components/manual_blinking.dm
+++ b/code/datums/components/manual_blinking.dm
@@ -29,11 +29,11 @@
return ..()
/datum/component/manual_blinking/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote)
- RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, .proc/check_added_organ)
- RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, .proc/check_removed_organ)
- RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/restart)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/pause)
+ RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote))
+ RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ))
+ RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ))
+ RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(restart))
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(pause))
/datum/component/manual_blinking/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_MOB_EMOTE)
diff --git a/code/datums/components/manual_breathing.dm b/code/datums/components/manual_breathing.dm
index 9fba5b46b83a..bcae15536ca7 100644
--- a/code/datums/components/manual_breathing.dm
+++ b/code/datums/components/manual_breathing.dm
@@ -29,11 +29,11 @@
return ..()
/datum/component/manual_breathing/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote)
- RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, .proc/check_added_organ)
- RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, .proc/check_removed_organ)
- RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/restart)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/pause)
+ RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote))
+ RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ))
+ RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ))
+ RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(restart))
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(pause))
/datum/component/manual_breathing/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_MOB_EMOTE)
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index 5b43b0f78a33..a1cc816fc5f0 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -38,8 +38,8 @@
precondition = _precondition
after_insert = _after_insert
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine))
for(var/mat in mat_list) //Make the assoc list ref | amount
var/datum/material/M = SSmaterials.GetMaterialRef(mat)
diff --git a/code/datums/components/mirv.dm b/code/datums/components/mirv.dm
index b30ce2c05b7e..260c12f49da9 100644
--- a/code/datums/components/mirv.dm
+++ b/code/datums/components/mirv.dm
@@ -16,7 +16,7 @@
/datum/component/mirv/RegisterWithParent()
if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
- RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+ RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit))
/datum/component/mirv/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_PROJECTILE_ON_HIT))
@@ -24,7 +24,7 @@
/datum/component/mirv/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/do_shrapnel, firer, target)
+ INVOKE_ASYNC(src, PROC_REF(do_shrapnel), firer, target)
/datum/component/mirv/proc/do_shrapnel(mob/firer, atom/target)
if(radius < 1)
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index d3a4ec9c30b2..64fc96146527 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -18,13 +18,13 @@
START_PROCESSING(SSmood, src)
- RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
- RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
- RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/check_area_mood)
- RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
+ RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, PROC_REF(add_event))
+ RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, PROC_REF(clear_event))
+ RegisterSignal(parent, COMSIG_ENTER_AREA, PROC_REF(check_area_mood))
+ RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(on_revive))
- RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
- RegisterSignal(parent, COMSIG_JOB_RECEIVED, .proc/register_job_signals)
+ RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, PROC_REF(modify_hud))
+ RegisterSignal(parent, COMSIG_JOB_RECEIVED, PROC_REF(register_job_signals))
var/mob/living/owner = parent
if(owner.hud_used)
@@ -41,7 +41,7 @@
SIGNAL_HANDLER
if(job in list("Research Director", "Scientist", "Roboticist"))
- RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT_RND, .proc/add_event) //Mood events that are only for RnD members
+ RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT_RND, PROC_REF(add_event)) //Mood events that are only for RnD members
/datum/component/mood/proc/print_mood(mob/user)
var/msg = "[span_info("My current mental status:")]\n"
@@ -250,7 +250,7 @@
clear_event(null, category)
else
if(the_event.timeout)
- addtimer(CALLBACK(src, .proc/clear_event, null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(clear_event), null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE)
return 0 //Don't have to update the event.
var/list/params = args.Copy(4)
params.Insert(1, parent)
@@ -261,7 +261,7 @@
update_mood()
if(the_event.timeout)
- addtimer(CALLBACK(src, .proc/clear_event, null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(clear_event), null, category), the_event.timeout, TIMER_UNIQUE|TIMER_OVERRIDE)
/datum/component/mood/proc/clear_event(datum/source, category)
SIGNAL_HANDLER
@@ -294,8 +294,8 @@
screen_obj = new
screen_obj.color = "#4b96c4"
hud.infodisplay += screen_obj
- RegisterSignal(hud, COMSIG_PARENT_QDELETING, .proc/unmodify_hud)
- RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click)
+ RegisterSignal(hud, COMSIG_PARENT_QDELETING, PROC_REF(unmodify_hud))
+ RegisterSignal(screen_obj, COMSIG_CLICK, PROC_REF(hud_click))
/datum/component/mood/proc/unmodify_hud(datum/source)
SIGNAL_HANDLER
@@ -322,12 +322,7 @@
if(HAS_TRAIT(L, TRAIT_NOHUNGER))
return FALSE //no mood events for nutrition
switch(L.nutrition)
- if(NUTRITION_LEVEL_FULL to INFINITY)
- if (!HAS_TRAIT(L, TRAIT_VORACIOUS))
- add_event(null, "nutrition", /datum/mood_event/fat)
- else
- add_event(null, "nutrition", /datum/mood_event/wellfed) // round and full
- if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
+ if(NUTRITION_LEVEL_WELL_FED to INFINITY)
add_event(null, "nutrition", /datum/mood_event/wellfed)
if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
add_event(null, "nutrition", /datum/mood_event/fed)
diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm
index e8f9befd9fee..93fc561bb677 100644
--- a/code/datums/components/nanites.dm
+++ b/code/datums/components/nanites.dm
@@ -42,31 +42,31 @@
cloud_sync()
/datum/component/nanites/RegisterWithParent()
- RegisterSignal(parent, COMSIG_HAS_NANITES, .proc/confirm_nanites)
- RegisterSignal(parent, COMSIG_NANITE_IS_STEALTHY, .proc/check_stealth)
- RegisterSignal(parent, COMSIG_NANITE_DELETE, .proc/delete_nanites)
- RegisterSignal(parent, COMSIG_NANITE_UI_DATA, .proc/nanite_ui_data)
- RegisterSignal(parent, COMSIG_NANITE_GET_PROGRAMS, .proc/get_programs)
- RegisterSignal(parent, COMSIG_NANITE_SET_VOLUME, .proc/set_volume)
- RegisterSignal(parent, COMSIG_NANITE_ADJUST_VOLUME, .proc/adjust_nanites)
- RegisterSignal(parent, COMSIG_NANITE_SET_MAX_VOLUME, .proc/set_max_volume)
- RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD, .proc/set_cloud)
- RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD_SYNC, .proc/set_cloud_sync)
- RegisterSignal(parent, COMSIG_NANITE_SET_SAFETY, .proc/set_safety)
- RegisterSignal(parent, COMSIG_NANITE_SET_REGEN, .proc/set_regen)
- RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, .proc/add_program)
- RegisterSignal(parent, COMSIG_NANITE_SCAN, .proc/nanite_scan)
- RegisterSignal(parent, COMSIG_NANITE_SYNC, .proc/sync)
+ RegisterSignal(parent, COMSIG_HAS_NANITES, PROC_REF(confirm_nanites))
+ RegisterSignal(parent, COMSIG_NANITE_IS_STEALTHY, PROC_REF(check_stealth))
+ RegisterSignal(parent, COMSIG_NANITE_DELETE, PROC_REF(delete_nanites))
+ RegisterSignal(parent, COMSIG_NANITE_UI_DATA, PROC_REF(nanite_ui_data))
+ RegisterSignal(parent, COMSIG_NANITE_GET_PROGRAMS, PROC_REF(get_programs))
+ RegisterSignal(parent, COMSIG_NANITE_SET_VOLUME, PROC_REF(set_volume))
+ RegisterSignal(parent, COMSIG_NANITE_ADJUST_VOLUME, PROC_REF(adjust_nanites))
+ RegisterSignal(parent, COMSIG_NANITE_SET_MAX_VOLUME, PROC_REF(set_max_volume))
+ RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD, PROC_REF(set_cloud))
+ RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD_SYNC, PROC_REF(set_cloud_sync))
+ RegisterSignal(parent, COMSIG_NANITE_SET_SAFETY, PROC_REF(set_safety))
+ RegisterSignal(parent, COMSIG_NANITE_SET_REGEN, PROC_REF(set_regen))
+ RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, PROC_REF(add_program))
+ RegisterSignal(parent, COMSIG_NANITE_SCAN, PROC_REF(nanite_scan))
+ RegisterSignal(parent, COMSIG_NANITE_SYNC, PROC_REF(sync))
if(isliving(parent))
- RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/on_death)
- RegisterSignal(parent, COMSIG_MOB_ALLOWED, .proc/check_access)
- RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_shock)
- RegisterSignal(parent, COMSIG_LIVING_MINOR_SHOCK, .proc/on_minor_shock)
- RegisterSignal(parent, COMSIG_SPECIES_GAIN, .proc/check_viable_biotype)
- RegisterSignal(parent, COMSIG_NANITE_SIGNAL, .proc/receive_signal)
- RegisterSignal(parent, COMSIG_NANITE_COMM_SIGNAL, .proc/receive_comm_signal)
+ RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp))
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(on_death))
+ RegisterSignal(parent, COMSIG_MOB_ALLOWED, PROC_REF(check_access))
+ RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_shock))
+ RegisterSignal(parent, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(on_minor_shock))
+ RegisterSignal(parent, COMSIG_SPECIES_GAIN, PROC_REF(check_viable_biotype))
+ RegisterSignal(parent, COMSIG_NANITE_SIGNAL, PROC_REF(receive_signal))
+ RegisterSignal(parent, COMSIG_NANITE_COMM_SIGNAL, PROC_REF(receive_comm_signal))
/datum/component/nanites/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_HAS_NANITES,
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index 2c2d0acf71af..faf61f803fa2 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -22,9 +22,9 @@
target.orbiters = src
if(ismovable(target))
- tracker = new(target, CALLBACK(src, .proc/move_react))
+ tracker = new(target, CALLBACK(src, PROC_REF(move_react)))
- RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/orbiter_glide_size_update)
+ RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(orbiter_glide_size_update))
/datum/component/orbiter/UnregisterFromParent()
var/atom/target = parent
@@ -59,7 +59,7 @@
orbiter.orbiting.end_orbit(orbiter)
orbiters[orbiter] = TRUE
orbiter.orbiting = src
- RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react)
+ RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react))
SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter)
diff --git a/code/datums/components/outline.dm b/code/datums/components/outline.dm
index 7aa719d38a61..2a4a9daa4ba4 100644
--- a/code/datums/components/outline.dm
+++ b/code/datums/components/outline.dm
@@ -7,9 +7,9 @@
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
src.permanent = perm
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/OnClean)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(OnClean))
var/atom/movable/A = parent
A.add_filter("sprite-bane", 2, list("type"="outline", "color"="#000000", "size"=1))
@@ -50,3 +50,4 @@
playsound(A, 'sound/effects/slosh.ogg', 50, TRUE)
A.visible_message("The outline around [A] is washed away!")
qdel(src)
+
diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm
index 4e36391d3914..d4b40bdb7187 100644
--- a/code/datums/components/overlay_lighting.dm
+++ b/code/datums/components/overlay_lighting.dm
@@ -105,14 +105,14 @@
/datum/component/overlay_lighting/RegisterWithParent()
. = ..()
if(directional)
- RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/on_parent_dir_change)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_parent_moved)
- RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_RANGE, .proc/set_range)
- RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_POWER, .proc/set_power)
- RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_COLOR, .proc/set_color)
- RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_ON, .proc/on_toggle)
- RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_FLAGS, .proc/on_light_flags_change)
- RegisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT, .proc/on_parent_crafted)
+ RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_parent_dir_change))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_moved))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_RANGE, PROC_REF(set_range))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_POWER, PROC_REF(set_power))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_COLOR, PROC_REF(set_color))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_ON, PROC_REF(on_toggle))
+ RegisterSignal(parent, COMSIG_ATOM_SET_LIGHT_FLAGS, PROC_REF(on_light_flags_change))
+ RegisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(on_parent_crafted))
var/atom/movable/movable_parent = parent
if(movable_parent.light_flags & LIGHT_ATTACHED)
overlay_lighting_flags |= LIGHTING_ATTACHED
@@ -215,13 +215,13 @@
var/atom/movable/old_parent_attached_to = .
UnregisterSignal(old_parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
if(old_parent_attached_to == current_holder)
- RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel)
- RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved)
+ RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel))
+ RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
if(parent_attached_to)
if(parent_attached_to == current_holder)
UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED))
- RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, .proc/on_parent_attached_to_qdel)
- RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, .proc/on_parent_attached_to_moved)
+ RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_attached_to_qdel))
+ RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_attached_to_moved))
check_holder()
@@ -241,10 +241,10 @@
clean_old_turfs()
return
if(new_holder != parent && new_holder != parent_attached_to)
- RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel)
- RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved)
+ RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel))
+ RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
if(directional)
- RegisterSignal(new_holder, COMSIG_ATOM_DIR_CHANGE, .proc/on_holder_dir_change)
+ RegisterSignal(new_holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_holder_dir_change))
if(overlay_lighting_flags & LIGHTING_ON)
make_luminosity_update()
add_dynamic_lumi()
@@ -461,7 +461,7 @@
return
UnregisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT)
- RegisterSignal(new_craft, COMSIG_ATOM_USED_IN_CRAFT, .proc/on_parent_crafted)
+ RegisterSignal(new_craft, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(on_parent_crafted))
set_parent_attached_to(new_craft)
#undef LIGHTING_ON
diff --git a/code/datums/components/paintable.dm b/code/datums/components/paintable.dm
index a0ed2873c90a..72472d41686d 100644
--- a/code/datums/components/paintable.dm
+++ b/code/datums/components/paintable.dm
@@ -2,7 +2,7 @@
var/current_paint
/datum/component/spraycan_paintable/Initialize()
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/Repaint)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(Repaint))
/datum/component/spraycan_paintable/Destroy()
RemoveCurrentCoat()
diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm
index fc2ae4c058dc..ae90dae17c55 100644
--- a/code/datums/components/pellet_cloud.dm
+++ b/code/datums/components/pellet_cloud.dm
@@ -69,16 +69,16 @@
return ..()
/datum/component/pellet_cloud/RegisterWithParent()
- RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/nullspace_parent)
+ RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(nullspace_parent))
if(isammocasing(parent))
- RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, .proc/create_casing_pellets)
+ RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, PROC_REF(create_casing_pellets))
else if(isgrenade(parent))
- RegisterSignal(parent, COMSIG_GRENADE_ARMED, .proc/grenade_armed)
- RegisterSignal(parent, COMSIG_GRENADE_PRIME, .proc/create_blast_pellets)
+ RegisterSignal(parent, COMSIG_GRENADE_ARMED, PROC_REF(grenade_armed))
+ RegisterSignal(parent, COMSIG_GRENADE_PRIME, PROC_REF(create_blast_pellets))
else if(islandmine(parent))
- RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets)
+ RegisterSignal(parent, COMSIG_MINE_TRIGGERED, PROC_REF(create_blast_pellets))
else if(issupplypod(parent))
- RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, .proc/create_blast_pellets)
+ RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, PROC_REF(create_blast_pellets))
/datum/component/pellet_cloud/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED))
@@ -103,8 +103,8 @@
else //Smart spread
spread = round((i / num_pellets - 0.5) * distro)
- RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)
- RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range)
+ RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit))
+ RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range))
pellets += shell.BB
if(!shell.throw_proj(target, targloc, shooter, params, spread))
return
@@ -180,7 +180,7 @@
if(martyr.stat != DEAD && martyr.client)
LAZYADD(purple_hearts, martyr)
- RegisterSignal(martyr, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE)
+ RegisterSignal(martyr, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE)
for(var/i in 1 to round(pellets_absorbed * 0.5))
pew(martyr)
@@ -195,7 +195,7 @@
hits++
targets_hit[target]++
if(targets_hit[target] == 1)
- RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE)
UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT))
if(terminated == num_pellets)
finalize()
@@ -220,8 +220,8 @@
LAZYSET(P.impacted, parent, TRUE) // don't hit the target we hit already with the flak
P.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message
P.preparePixelProjectile(target, parent)
- RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)
- RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range)
+ RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit))
+ RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range))
pellets += P
P.fire()
@@ -254,10 +254,10 @@
if(ismob(nade.loc))
shooter = nade.loc
LAZYINITLIST(bodies)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/grenade_dropped)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/grenade_moved)
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(grenade_dropped))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(grenade_moved))
var/static/list/loc_connections = list(
- COMSIG_ATOM_EXITED =.proc/grenade_uncrossed,
+ COMSIG_ATOM_EXITED = PROC_REF(grenade_uncrossed),
)
AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections)
@@ -270,7 +270,7 @@
/datum/component/pellet_cloud/proc/grenade_moved()
LAZYCLEARLIST(bodies)
for(var/mob/living/new_mob in get_turf(parent))
- RegisterSignal(new_mob, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE)
+ RegisterSignal(new_mob, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE)
LAZYADD(bodies, new_mob)
/// Someone who was originally "under" the grenade has moved off the tile and is now eligible for being a martyr and "covering" it
diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm
index 8512e46c361d..80c956a0031b 100644
--- a/code/datums/components/plumbing/_plumbing.dm
+++ b/code/datums/components/plumbing/_plumbing.dm
@@ -26,16 +26,16 @@
reagents = AM.reagents
turn_connects = _turn_connects
- RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/on_parent_moved)
- RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED), .proc/disable)
- RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), .proc/toggle_active)
- RegisterSignal(parent, list(COMSIG_OBJ_HIDE), .proc/hide)
- RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), .proc/create_overlays) //called by lateinit on startup
+ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), PROC_REF(on_parent_moved))
+ RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED), PROC_REF(disable))
+ RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), PROC_REF(toggle_active))
+ RegisterSignal(parent, list(COMSIG_OBJ_HIDE), PROC_REF(hide))
+ RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), PROC_REF(create_overlays)) //called by lateinit on startup
if(start)
//timer 0 so it can finish returning initialize, after which we're added to the parent.
//Only then can we tell the duct next to us they can connect, because only then is the component really added. this was a fun one
- addtimer(CALLBACK(src, .proc/enable), 0)
+ addtimer(CALLBACK(src, PROC_REF(enable)), 0)
/datum/component/plumbing/process()
if(!demand_connects || !reagents)
diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm
index 9cf6a6e4f16a..bf81a595c2be 100644
--- a/code/datums/components/pricetag.dm
+++ b/code/datums/components/pricetag.dm
@@ -8,9 +8,9 @@
owner = _owner
if(_profit_ratio)
profit_ratio = _profit_ratio
- RegisterSignal(parent, list(COMSIG_ITEM_SOLD), .proc/split_profit)
- RegisterSignal(parent, list(COMSIG_STRUCTURE_UNWRAPPED, COMSIG_ITEM_UNWRAPPED), .proc/Unwrapped)
- RegisterSignal(parent, list(COMSIG_ITEM_SPLIT_PROFIT, COMSIG_ITEM_SPLIT_PROFIT_DRY), .proc/return_ratio)
+ RegisterSignal(parent, list(COMSIG_ITEM_SOLD), PROC_REF(split_profit))
+ RegisterSignal(parent, list(COMSIG_STRUCTURE_UNWRAPPED, COMSIG_ITEM_UNWRAPPED), PROC_REF(Unwrapped))
+ RegisterSignal(parent, list(COMSIG_ITEM_SPLIT_PROFIT, COMSIG_ITEM_SPLIT_PROFIT_DRY), PROC_REF(return_ratio))
/datum/component/pricetag/proc/Unwrapped()
SIGNAL_HANDLER
diff --git a/code/datums/components/punchcooldown.dm b/code/datums/components/punchcooldown.dm
index 5aacf49fd2d2..19aa8c8cd20d 100644
--- a/code/datums/components/punchcooldown.dm
+++ b/code/datums/components/punchcooldown.dm
@@ -2,7 +2,7 @@
/datum/component/wearertargeting/punchcooldown
signals = list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK)
mobtype = /mob/living/carbon
- proctype = .proc/reducecooldown
+ proctype = PROC_REF(reducecooldown)
valid_slots = list(ITEM_SLOT_GLOVES)
///The warcry this generates
var/warcry = "AT"
@@ -11,7 +11,7 @@
. = ..()
if(. == COMPONENT_INCOMPATIBLE)
return
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/changewarcry)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(changewarcry))
///Called on COMSIG_HUMAN_MELEE_UNARMED_ATTACK. Yells the warcry and and reduces punch cooldown.
/datum/component/wearertargeting/punchcooldown/proc/reducecooldown(mob/living/carbon/M, atom/target)
@@ -24,7 +24,7 @@
/datum/component/wearertargeting/punchcooldown/proc/changewarcry(datum/source, mob/user)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/changewarcry_async, user)
+ INVOKE_ASYNC(src, PROC_REF(changewarcry_async), user)
/datum/component/wearertargeting/punchcooldown/proc/changewarcry_async(mob/user)
var/input = stripped_input(user,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
diff --git a/code/datums/components/rad_insulation.dm b/code/datums/components/rad_insulation.dm
index d06cb1e18799..6ee306b28215 100644
--- a/code/datums/components/rad_insulation.dm
+++ b/code/datums/components/rad_insulation.dm
@@ -6,11 +6,11 @@
return COMPONENT_INCOMPATIBLE
if(protects) // Does this protect things in its contents from being affected?
- RegisterSignal(parent, COMSIG_ATOM_RAD_PROBE, .proc/rad_probe_react)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_PROBE, PROC_REF(rad_probe_react))
if(contamination_proof) // Can this object be contaminated?
- RegisterSignal(parent, COMSIG_ATOM_RAD_CONTAMINATING, .proc/rad_contaminating)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_CONTAMINATING, PROC_REF(rad_contaminating))
if(_amount != 1) // If it's 1 it wont have any impact on radiation passing through anyway
- RegisterSignal(parent, COMSIG_ATOM_RAD_WAVE_PASSING, .proc/rad_pass)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_WAVE_PASSING, PROC_REF(rad_pass))
amount = _amount
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index a1d0553f3b1d..a6c67af2d3cd 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -18,11 +18,11 @@
hl3_release_date = _half_life
can_contaminate = _can_contaminate
if(istype(parent, /atom))
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/rad_examine)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/rad_clean)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(rad_examine))
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(rad_clean))
if(istype(parent, /obj/item))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/rad_attack)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(rad_attack))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(rad_attack))
else
return COMPONENT_INCOMPATIBLE
if(strength > RAD_MINIMUM_CONTAMINATION)
@@ -31,7 +31,7 @@
//This relies on parent not being a turf or something. IF YOU CHANGE THAT, CHANGE THIS
var/atom/movable/master = parent
master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2))
- addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1,19))//Things should look uneven
+ addtimer(CALLBACK(src, PROC_REF(glow_loop), master), rand(1,19))//Things should look uneven
START_PROCESSING(SSradiation, src)
/datum/component/radioactive/Destroy()
diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm
index 4bd3d1b82e43..de61c13ae295 100644
--- a/code/datums/components/remote_materials.dm
+++ b/code/datums/components/remote_materials.dm
@@ -23,8 +23,8 @@ handles linking back and forth.
src.category = category
src.allow_standalone = allow_standalone
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
- RegisterSignal(parent, COMSIG_ATOM_MULTITOOL_ACT, .proc/OnMultitool)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
+ RegisterSignal(parent, COMSIG_ATOM_MULTITOOL_ACT, PROC_REF(OnMultitool))
if (allow_standalone)
_MakeLocal()
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 3f56735a493c..7d3bf028d796 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -28,10 +28,10 @@
/datum/component/riding/Initialize()
if(!ismovable(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/vehicle_turned)
- RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle)
- RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
+ RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(vehicle_turned))
+ RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(vehicle_mob_buckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, PROC_REF(vehicle_mob_unbuckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(vehicle_moved))
/datum/component/riding/proc/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
SIGNAL_HANDLER
@@ -217,7 +217,7 @@
to_chat(user, "You'll need a special item in one of your hands to [drive_verb] [AM].")
/datum/component/riding/proc/Unbuckle(atom/movable/M)
- addtimer(CALLBACK(parent, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE)
+ addtimer(CALLBACK(parent, TYPE_PROC_REF(/atom/movable, unbuckle_mob), M), 0, TIMER_UNIQUE)
/datum/component/riding/proc/Process_Spacemove(direction)
var/atom/movable/AM = parent
@@ -237,7 +237,7 @@
/datum/component/riding/human/Initialize()
. = ..()
- RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
+ RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_host_unarmed_melee))
/datum/component/riding/human/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
unequip_buckle_inhands(parent)
diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm
index 7f0e230845f8..506d744d6c8c 100644
--- a/code/datums/components/rotation.dm
+++ b/code/datums/components/rotation.dm
@@ -26,17 +26,17 @@
if(can_user_rotate)
src.can_user_rotate = can_user_rotate
else
- src.can_user_rotate = CALLBACK(src,.proc/default_can_user_rotate)
+ src.can_user_rotate = CALLBACK(src, PROC_REF(default_can_user_rotate))
if(can_be_rotated)
src.can_be_rotated = can_be_rotated
else
- src.can_be_rotated = CALLBACK(src,.proc/default_can_be_rotated)
+ src.can_be_rotated = CALLBACK(src, PROC_REF(default_can_be_rotated))
if(after_rotation)
src.after_rotation = after_rotation
else
- src.after_rotation = CALLBACK(src,.proc/default_after_rotation)
+ src.after_rotation = CALLBACK(src, PROC_REF(default_after_rotation))
//Try Clockwise,counter,flip in order
if(src.rotation_flags & ROTATION_FLIP)
@@ -52,10 +52,10 @@
/datum/component/simple_rotation/proc/add_signals()
if(rotation_flags & ROTATION_ALTCLICK)
- RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/HandRot)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/ExamineMessage)
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(HandRot))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(ExamineMessage))
if(rotation_flags & ROTATION_WRENCH)
- RegisterSignal(parent, COMSIG_ATOM_WRENCH_ACT, .proc/WrenchRot)
+ RegisterSignal(parent, COMSIG_ATOM_WRENCH_ACT, PROC_REF(WrenchRot))
/datum/component/simple_rotation/proc/add_verbs()
if(rotation_flags & ROTATION_VERBS)
diff --git a/code/datums/components/sitcomlaughter.dm b/code/datums/components/sitcomlaughter.dm
index 7a31c812749b..8dfef21b749d 100644
--- a/code/datums/components/sitcomlaughter.dm
+++ b/code/datums/components/sitcomlaughter.dm
@@ -1,7 +1,7 @@
/datum/component/wearertargeting/sitcomlaughter
valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE)
signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_ON_VENDOR_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT)
- proctype = .proc/EngageInComedy
+ proctype = PROC_REF(EngageInComedy)
mobtype = /mob/living
///Sounds used for when user has a sitcom action occur
var/list/comedysounds = list('sound/items/SitcomLaugh1.ogg', 'sound/items/SitcomLaugh2.ogg', 'sound/items/SitcomLaugh3.ogg')
@@ -28,6 +28,6 @@
SIGNAL_HANDLER
if(!COOLDOWN_FINISHED(src, laugh_cooldown))
return
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay)
post_comedy_callback?.Invoke(source)
COOLDOWN_START(src, laugh_cooldown, cooldown_time)
diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm
index 64dd511956ce..5c2c88ccfee7 100644
--- a/code/datums/components/slippery.dm
+++ b/code/datums/components/slippery.dm
@@ -11,12 +11,12 @@
///what we give to connect_loc by default, makes slippable mobs moving over us slip
var/static/list/default_connections = list(
- COMSIG_ATOM_ENTERED = .proc/Slip,
+ COMSIG_ATOM_ENTERED = PROC_REF(Slip),
)
///what we give to connect_loc if we're an item and get equipped by a mob. makes slippable mobs moving over our holder slip
var/static/list/holder_connections = list(
- COMSIG_ATOM_ENTERED = .proc/Slip_on_wearer,
+ COMSIG_ATOM_ENTERED = PROC_REF(Slip_on_wearer),
)
/// The connect_loc_behalf component for the holder_connections list.
@@ -32,10 +32,10 @@
if(ismovable(parent))
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
else
- RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/Slip)
+ RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(Slip))
/datum/component/slippery/proc/add_connect_loc_behalf_to_parent()
if(ismovable(parent))
@@ -73,7 +73,7 @@
holder = equipper
qdel(GetComponent(/datum/component/connect_loc_behalf))
AddComponent(/datum/component/connect_loc_behalf, holder, holder_connections)
- RegisterSignal(holder, COMSIG_PARENT_PREQDELETED, .proc/holder_deleted)
+ RegisterSignal(holder, COMSIG_PARENT_PREQDELETED, PROC_REF(holder_deleted))
/datum/component/slippery/proc/holder_deleted(datum/source, datum/possible_holder)
SIGNAL_HANDLER
diff --git a/code/datums/components/soulstoned.dm b/code/datums/components/soulstoned.dm
index 584f76cbc255..04e514062879 100644
--- a/code/datums/components/soulstoned.dm
+++ b/code/datums/components/soulstoned.dm
@@ -17,7 +17,7 @@
S.health = S.maxHealth
S.bruteloss = 0
- RegisterSignal(S, COMSIG_MOVABLE_MOVED, .proc/free_prisoner)
+ RegisterSignal(S, COMSIG_MOVABLE_MOVED, PROC_REF(free_prisoner))
/datum/component/soulstoned/proc/free_prisoner()
SIGNAL_HANDLER
diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm
index 0b2794898e13..42456ccf88e9 100644
--- a/code/datums/components/spawner.dm
+++ b/code/datums/components/spawner.dm
@@ -23,7 +23,7 @@
if(_spawn_sound)
spawn_sound=_spawn_sound
- RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning)
+ RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), PROC_REF(stop_spawning))
START_PROCESSING(SSprocessing, src)
/datum/component/spawner/process()
diff --git a/code/datums/components/spill.dm b/code/datums/components/spill.dm
index 343cdab3f081..1aa652e5106a 100644
--- a/code/datums/components/spill.dm
+++ b/code/datums/components/spill.dm
@@ -27,8 +27,8 @@
return COMPONENT_INCOMPATIBLE
/datum/component/spill/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/equip_react)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/drop_react)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(equip_react))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(drop_react))
var/obj/item/master = parent
preexisting_item_flags = master.item_flags
master.item_flags |= ITEM_SLOT_POCKETS
@@ -43,7 +43,7 @@
SIGNAL_HANDLER
if(slot == ITEM_SLOT_LPOCKET || slot == ITEM_SLOT_RPOCKET)
- RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/knockdown_react, TRUE)
+ RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(knockdown_react), TRUE)
else
UnregisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN)
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index 9e5032ec70f7..9e75259536ef 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -2,12 +2,12 @@
var/too_spooky = TRUE //will it spawn a new instrument?
/datum/component/spooky/Initialize()
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/spectral_attack)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(spectral_attack))
/datum/component/spooky/proc/spectral_attack(datum/source, mob/living/carbon/C, mob/user)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/spectral_attack_async, source, C, user)
+ INVOKE_ASYNC(src, PROC_REF(spectral_attack_async), source, C, user)
/datum/component/spooky/proc/spectral_attack_async(datum/source, mob/living/carbon/C, mob/user)
@@ -31,7 +31,7 @@
H.Paralyze(15) //zombies can't resist the doot
C.Jitter(35)
C.stuttering = 20
- if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+ if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
to_chat(C, "DOOT")
spectral_change(H)
@@ -41,7 +41,7 @@
C.stuttering = 20
/datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
- if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+ if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
H.Paralyze(20)
H.set_species(/datum/species/skeleton)
H.visible_message("[H] has given up on life as a mortal.")
diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm
index fdb95e249f2b..368b70b64c0c 100644
--- a/code/datums/components/squeak.dm
+++ b/code/datums/components/squeak.dm
@@ -22,25 +22,25 @@
///what we set connect_loc to if parent is an item
var/static/list/item_connections = list(
- COMSIG_ATOM_ENTERED = .proc/play_squeak_crossed,
+ COMSIG_ATOM_ENTERED = PROC_REF(play_squeak_crossed),
)
/datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak)
+ RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak))
if(ismovable(parent))
- RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), .proc/play_squeak)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), PROC_REF(play_squeak))
AddComponent(/datum/component/connect_loc_behalf, parent, item_connections)
- RegisterSignal(parent, COMSIG_ITEM_WEARERCROSSED, .proc/play_squeak_crossed)
- RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react)
+ RegisterSignal(parent, COMSIG_ITEM_WEARERCROSSED, PROC_REF(play_squeak_crossed))
+ RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react))
if(isitem(parent))
- RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/play_squeak)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak)
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), PROC_REF(play_squeak))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(use_squeak))
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
if(istype(parent, /obj/item/clothing/shoes))
- RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
+ RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, PROC_REF(step_squeak))
override_squeak_sounds = custom_sounds
if(chance_override)
@@ -103,7 +103,7 @@
/datum/component/squeak/proc/on_equip(datum/source, mob/equipper, slot)
SIGNAL_HANDLER
- RegisterSignal(equipper, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react, TRUE)
+ RegisterSignal(equipper, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react), TRUE)
/datum/component/squeak/proc/on_drop(datum/source, mob/user)
SIGNAL_HANDLER
@@ -115,7 +115,7 @@
SIGNAL_HANDLER
//We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted
- RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, .proc/holder_dir_change)
+ RegisterSignal(holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(holder_dir_change))
/datum/component/squeak/proc/holder_dir_change(datum/source, old_dir, new_dir)
SIGNAL_HANDLER
diff --git a/code/datums/components/stationstuck.dm b/code/datums/components/stationstuck.dm
index 98f12cdc09c1..2f01af2ee6e7 100644
--- a/code/datums/components/stationstuck.dm
+++ b/code/datums/components/stationstuck.dm
@@ -9,7 +9,7 @@
if(!isliving(parent))
return COMPONENT_INCOMPATIBLE
var/mob/living/L = parent
- RegisterSignal(L, list(COMSIG_MOVABLE_Z_CHANGED), .proc/punish)
+ RegisterSignal(L, list(COMSIG_MOVABLE_Z_CHANGED), PROC_REF(punish))
murder = _murder
message = _message
diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm
index 4198ba5b974d..c0a9bd162209 100644
--- a/code/datums/components/storage/concrete/_concrete.dm
+++ b/code/datums/components/storage/concrete/_concrete.dm
@@ -15,8 +15,8 @@
/datum/component/storage/concrete/Initialize()
. = ..()
- RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
- RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
+ RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, PROC_REF(on_contents_del))
+ RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_deconstruct))
/datum/component/storage/concrete/Destroy()
var/atom/real_location = real_location()
diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm
index 7b734d8836cc..9c534ae2fa4d 100644
--- a/code/datums/components/storage/concrete/bag_of_holding.dm
+++ b/code/datums/components/storage/concrete/bag_of_holding.dm
@@ -5,7 +5,7 @@
var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.GetAllContents(), typecacheof(/obj/item/storage/backpack/holding))
matching -= A
if(istype(W, /obj/item/storage/backpack/holding) || matching.len)
- INVOKE_ASYNC(src, .proc/recursive_insertion, W, user)
+ INVOKE_ASYNC(src, PROC_REF(recursive_insertion), W, user)
return
. = ..()
diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm
index 8ef68e3bfd0b..19d092156405 100644
--- a/code/datums/components/storage/concrete/pockets.dm
+++ b/code/datums/components/storage/concrete/pockets.dm
@@ -117,16 +117,6 @@
max_items = 2
max_w_class = WEIGHT_CLASS_BULKY
-/datum/component/storage/concrete/pockets/holster/lt/Initialize()
- original_parent = parent
- . = ..()
- can_hold = typecacheof(list(
- /obj/item/gun/energy/e_gun/adv_stopping,
- /obj/item/gun/energy/e_gun/mini,
- /obj/item/gun/energy/disabler,
- /obj/item/stock_parts/cell/gun
- ))
-
/datum/component/storage/concrete/pockets/holster/nukie/Initialize()
original_parent = parent
. = ..()
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 5acda55b1992..ced0b0e79ff7 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -72,42 +72,42 @@
closer = new(null, src)
orient2hud()
- RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, .proc/on_check)
- RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, .proc/check_locked)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, .proc/signal_show_attempt)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, .proc/signal_insertion_attempt)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, .proc/signal_can_insert)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, .proc/signal_take_type)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, .proc/signal_fill_type)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, .proc/set_locked)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, .proc/signal_take_obj)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, .proc/signal_quick_empty)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, .proc/signal_hide_attempt)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, .proc/close_all)
- RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, .proc/signal_return_inv)
-
- RegisterSignal(parent, COMSIG_TOPIC, .proc/topic_handle)
-
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby)
-
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_hand)
- RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/emp_act)
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/show_to_ghost)
- RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/refresh_mob_views)
- RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/_remove_and_refresh)
- RegisterSignal(parent, COMSIG_ATOM_CANREACH, .proc/canreach_react)
-
- RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/preattack_intercept)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
- RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
-
- RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/close_all)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_move)
-
- RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click)
- RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
- RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive)
+ RegisterSignal(parent, COMSIG_CONTAINS_STORAGE, PROC_REF(on_check))
+ RegisterSignal(parent, COMSIG_IS_STORAGE_LOCKED, PROC_REF(check_locked))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_SHOW, PROC_REF(signal_show_attempt))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_INSERT, PROC_REF(signal_insertion_attempt))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_CAN_INSERT, PROC_REF(signal_can_insert))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE_TYPE, PROC_REF(signal_take_type))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_FILL_TYPE, PROC_REF(signal_fill_type))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_SET_LOCKSTATE, PROC_REF(set_locked))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_TAKE, PROC_REF(signal_take_obj))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_QUICK_EMPTY, PROC_REF(signal_quick_empty))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_FROM, PROC_REF(signal_hide_attempt))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_HIDE_ALL, PROC_REF(close_all))
+ RegisterSignal(parent, COMSIG_TRY_STORAGE_RETURN_INVENTORY, PROC_REF(signal_return_inv))
+
+ RegisterSignal(parent, COMSIG_TOPIC, PROC_REF(topic_handle))
+
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby))
+
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, PROC_REF(on_attack_hand))
+ RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(emp_act))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(show_to_ghost))
+ RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(refresh_mob_views))
+ RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(_remove_and_refresh))
+ RegisterSignal(parent, COMSIG_ATOM_CANREACH, PROC_REF(canreach_react))
+
+ RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(preattack_intercept))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(attack_self))
+ RegisterSignal(parent, COMSIG_ITEM_PICKUP, PROC_REF(signal_on_pickup))
+
+ RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(close_all))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_alt_click))
+ RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, PROC_REF(mousedrop_onto))
+ RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive))
update_actions()
@@ -145,7 +145,7 @@
return
var/obj/item/I = parent
modeswitch_action = new(I)
- RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, .proc/action_trigger)
+ RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, PROC_REF(action_trigger))
if(I.obj_flags & IN_INVENTORY)
var/mob/M = I.loc
if(!istype(M))
@@ -198,7 +198,7 @@
to_chat(M, "[parent] seems to be [locked_flavor]!")
return FALSE
if((M.get_active_held_item() == parent) && allow_quick_empty)
- INVOKE_ASYNC(src, .proc/quick_empty, M)
+ INVOKE_ASYNC(src, PROC_REF(quick_empty), M)
/datum/component/storage/proc/preattack_intercept(datum/source, obj/O, mob/M, params)
SIGNAL_HANDLER
@@ -216,7 +216,7 @@
return
if(!isturf(I.loc))
return
- INVOKE_ASYNC(src, .proc/async_preattack_intercept, I, M)
+ INVOKE_ASYNC(src, PROC_REF(async_preattack_intercept), I, M)
///async functionality from preattack_intercept
/datum/component/storage/proc/async_preattack_intercept(obj/item/I, mob/M)
@@ -229,7 +229,7 @@
return
var/datum/progressbar/progress = new(M, len, I.loc)
var/list/rejections = list()
- while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
+ while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
stoplag(1)
progress.end_progress()
to_chat(M, "You put everything you could [insert_preposition] [parent].")
@@ -287,7 +287,7 @@
var/turf/T = get_turf(A)
var/list/things = contents()
var/datum/progressbar/progress = new(M, length(things), T)
- while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
+ while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things, progress)))
stoplag(1)
progress.end_progress()
@@ -408,7 +408,7 @@
M.client.screen |= real_location.contents
M.set_active_storage(src)
LAZYOR(is_using, M)
- RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/mob_deleted)
+ RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(mob_deleted))
return TRUE
/datum/component/storage/proc/mob_deleted(datum/source)
@@ -593,7 +593,7 @@
if(over_object == M)
user_show_to_mob(M)
if(!istype(over_object, /atom/movable/screen))
- INVOKE_ASYNC(src, .proc/dump_content_at, over_object, M)
+ INVOKE_ASYNC(src, PROC_REF(dump_content_at), over_object, M)
return
if(A.loc != M)
return
@@ -604,7 +604,7 @@
return
A.add_fingerprint(M)
-/datum/component/storage/proc/user_show_to_mob(mob/M, force = FALSE)
+/datum/component/storage/proc/user_show_to_mob(mob/M, force = FALSE, silent = FALSE)
var/atom/A = parent
if(!istype(M))
return FALSE
@@ -613,7 +613,7 @@
to_chat(M, "[parent] seems to be [locked_flavor]!")
return FALSE
if(force || M.CanReach(parent, view_only = TRUE))
- if(use_sound)
+ if(use_sound && !silent)
playsound(A, use_sound, 50, TRUE, -5)
show_to(M)
@@ -739,7 +739,7 @@
/datum/component/storage/proc/show_to_ghost(datum/source, mob/dead/observer/M)
SIGNAL_HANDLER
- return user_show_to_mob(M, TRUE)
+ return user_show_to_mob(M, TRUE, TRUE)
/datum/component/storage/proc/signal_show_attempt(datum/source, mob/showto, force = FALSE)
SIGNAL_HANDLER
@@ -808,12 +808,12 @@
var/mob/living/carbon/human/H = user
if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket.
. = COMPONENT_NO_ATTACK_HAND
- INVOKE_ASYNC(H, /mob.proc/put_in_hands, A)
+ INVOKE_ASYNC(H, TYPE_PROC_REF(/mob, put_in_hands), A)
H.l_store = null
return
if(H.r_store == A && !H.get_active_held_item())
. = COMPONENT_NO_ATTACK_HAND
- INVOKE_ASYNC(H, /mob.proc/put_in_hands, A)
+ INVOKE_ASYNC(H, TYPE_PROC_REF(/mob, put_in_hands), A)
H.r_store = null
return
@@ -853,7 +853,7 @@
/datum/component/storage/proc/on_alt_click(datum/source, mob/user)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/on_alt_click_async, source, user)
+ INVOKE_ASYNC(src, PROC_REF(on_alt_click_async), source, user)
/datum/component/storage/proc/on_alt_click_async(datum/source, mob/user)
if(!isliving(user) || !user.CanReach(parent) || user.incapacitated())
@@ -866,8 +866,6 @@
if(!quickdraw)
A.add_fingerprint(user)
user_show_to_mob(user)
- if(use_sound)
- playsound(A, use_sound, 50, TRUE, -5)
return
var/obj/item/I = locate() in real_location()
diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm
index 9109e26b3003..bd335cbcbaad 100644
--- a/code/datums/components/summoning.dm
+++ b/code/datums/components/summoning.dm
@@ -24,11 +24,11 @@
/datum/component/summoning/RegisterWithParent()
if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
- RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+ RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit))
else if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack))
else if(ishostile(parent))
- RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/summoning/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
@@ -66,7 +66,7 @@
spawned_mobs += L
if(faction != null)
L.faction = faction
- RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses)
+ RegisterSignal(L, COMSIG_MOB_DEATH, PROC_REF(on_spawned_death)) // so we can remove them from the list, etc (for mobs with corpses)
playsound(spawn_location,spawn_sound, 50, TRUE)
spawn_location.visible_message("[L] [spawn_text].")
diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm
index e45c792f433e..1fa269b56f6f 100644
--- a/code/datums/components/swarming.dm
+++ b/code/datums/components/swarming.dm
@@ -4,8 +4,8 @@
var/is_swarming = FALSE
var/list/swarm_members = list()
var/static/list/swarming_loc_connections = list(
- COMSIG_ATOM_EXITED =.proc/leave_swarm, \
- COMSIG_ATOM_ENTERED = .proc/join_swarm \
+ COMSIG_ATOM_EXITED = PROC_REF(leave_swarm), \
+ COMSIG_ATOM_ENTERED = PROC_REF(join_swarm) \
)
/datum/component/swarming/Initialize(max_x = 24, max_y = 24)
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 9edf16e0b634..68c74921b8b7 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -46,7 +46,7 @@
var/mob/P = parent
to_chat(P, "You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.")
- addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
+ addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
/datum/component/tackler/Destroy()
var/mob/P = parent
@@ -54,9 +54,9 @@
return ..()
/datum/component/tackler/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle)
- RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack)
- RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle)
+ RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(checkTackle))
+ RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(sack))
+ RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(registerTackle))
/datum/component/tackler/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW))
@@ -106,7 +106,7 @@
tackling = TRUE
user.throw_mode_off(THROW_MODE_TOGGLE)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle))
playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1)
if(can_see(user, A, 7))
@@ -120,7 +120,7 @@
user.Knockdown(base_knockdown, ignore_canstun = TRUE)
user.adjustStaminaLoss(stamina_cost)
user.throw_at(A, range, speed, user, FALSE)
- addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
+ addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
return(COMSIG_MOB_CANCEL_CLICKON)
/**
@@ -153,7 +153,7 @@
if(!iscarbon(hit))
if(hit.density)
- INVOKE_ASYNC(src, .proc/splat, user, hit)
+ INVOKE_ASYNC(src, PROC_REF(splat), user, hit)
return
var/mob/living/carbon/target = hit
@@ -183,7 +183,7 @@
user.Knockdown(30)
if(ishuman(target) && !T.has_movespeed_modifier(/datum/movespeed_modifier/shove))
T.add_movespeed_modifier(/datum/movespeed_modifier/shove) // maybe define a slightly more severe/longer slowdown for this
- addtimer(CALLBACK(T, /mob/living/carbon/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH)
+ addtimer(CALLBACK(T, TYPE_PROC_REF(/mob/living/carbon, clear_shove_slowdown)), SHOVE_SLOWDOWN_LENGTH)
if(-1 to 0) // decent hit, both parties are about equally inconvenienced
user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target)
@@ -208,26 +208,30 @@
to_chat(target, "[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab!")
user.SetKnockdown(0)
+ user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
target.Paralyze(5)
target.Knockdown(30)
if(ishuman(target) && ishuman(user))
- INVOKE_ASYNC(S.dna.species, /datum/species.proc/grab, S, T)
- S.setGrabState(GRAB_PASSIVE)
+ INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T)
+ if(S.pulling == T)
+ S.setGrabState(GRAB_PASSIVE)
if(5 to INFINITY) // absolutely BODIED
user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target)
to_chat(target, "[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you!")
user.SetKnockdown(0)
+ user.get_up(TRUE)
user.forceMove(get_turf(target))
target.adjustStaminaLoss(40)
target.Paralyze(5)
target.Knockdown(30)
if(ishuman(target) && ishuman(user))
- INVOKE_ASYNC(S.dna.species, /datum/species.proc/grab, S, T)
- S.setGrabState(GRAB_AGGRESSIVE)
+ INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T)
+ if(S.pulling == T)
+ S.setGrabState(GRAB_AGGRESSIVE)
return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH
@@ -255,8 +259,6 @@
defense_mod -= 1
if(HAS_TRAIT(target, TRAIT_CLUMSY))
defense_mod -= 2
- if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over
- defense_mod += 1
if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS))
defense_mod -= 2
if(HAS_TRAIT(target, TRAIT_DWARF))
diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm
index d1941f8a72fd..f673abcf7bb0 100644
--- a/code/datums/components/tactical.dm
+++ b/code/datums/components/tactical.dm
@@ -8,8 +8,8 @@
src.allowed_slot = allowed_slot
/datum/component/tactical/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/modify)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unmodify)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(modify))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(unmodify))
/datum/component/tactical/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
diff --git a/code/datums/components/taped.dm b/code/datums/components/taped.dm
index 32d5120c72e0..fc18ec5fd876 100644
--- a/code/datums/components/taped.dm
+++ b/code/datums/components/taped.dm
@@ -29,8 +29,8 @@
set_tape(added_integrity)
/datum/component/taped/RegisterWithParent()
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/tape_rip)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine_tape)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(tape_rip))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine_tape))
/datum/component/taped/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE))
diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm
index a458db2f2571..c6d9ac02947c 100644
--- a/code/datums/components/tether.dm
+++ b/code/datums/components/tether.dm
@@ -14,7 +14,7 @@
src.tether_name = initial(tmp.name)
else
src.tether_name = tether_name
- RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), .proc/checkTether)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), PROC_REF(checkTether))
/datum/component/tether/proc/checkTether(mob/mover, newloc)
SIGNAL_HANDLER
diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm
index 23f020adb7f0..ac9e468b10ae 100644
--- a/code/datums/components/thermite.dm
+++ b/code/datums/components/thermite.dm
@@ -38,9 +38,9 @@
overlay = mutable_appearance('icons/effects/effects.dmi', "thermite")
master.add_overlay(overlay)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react)
- RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react)
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react))
+ RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(flame_react))
/datum/component/thermite/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT)
@@ -65,7 +65,7 @@
master.cut_overlay(overlay)
playsound(master, 'sound/items/welder.ogg', 100, TRUE)
var/obj/effect/overlay/thermite/fakefire = new(master)
- addtimer(CALLBACK(src, .proc/burn_parent, fakefire, user), min(amount * 0.35 SECONDS, 20 SECONDS))
+ addtimer(CALLBACK(src, PROC_REF(burn_parent), fakefire, user), min(amount * 0.35 SECONDS, 20 SECONDS))
UnregisterFromParent()
/datum/component/thermite/proc/burn_parent(datum/fakefire, mob/user)
diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm
index 88cc0d190014..51c9268d13ab 100644
--- a/code/datums/components/twohanded.dm
+++ b/code/datums/components/twohanded.dm
@@ -69,13 +69,13 @@
// register signals withthe parent item
/datum/component/two_handed/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)
- RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved)
- RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack))
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(on_update_icon))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+ RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(on_sharpen))
// Remove all siginals registered to the parent item
/datum/component/two_handed/UnregisterFromParent()
@@ -145,7 +145,7 @@
if(SEND_SIGNAL(parent, COMSIG_TWOHANDED_WIELD, user) & COMPONENT_TWOHANDED_BLOCK_WIELD)
return // blocked wield from item
wielded = TRUE
- RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands)
+ RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands))
// update item stats and name
var/obj/item/parent_item = parent
@@ -172,7 +172,7 @@
offhand_item.name = "[parent_item.name] - offhand"
offhand_item.desc = "Your second grip on [parent_item]."
offhand_item.wielded = TRUE
- RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
user.put_in_inactive_hand(offhand_item)
/**
diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm
index f954559d9df2..3b47efa3fcd0 100644
--- a/code/datums/components/udder.dm
+++ b/code/datums/components/udder.dm
@@ -17,8 +17,8 @@
src.on_milk_callback = on_milk_callback
/datum/component/udder/RegisterWithParent()
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
/datum/component/udder/UnregisterFromParent()
QDEL_NULL(udder)
@@ -138,7 +138,7 @@
/obj/item/udder/gutlunch/initial_conditions()
if(udder_mob.gender == FEMALE)
START_PROCESSING(SSobj, src)
- RegisterSignal(udder_mob, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/on_mob_attacking)
+ RegisterSignal(udder_mob, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(on_mob_attacking))
/obj/item/udder/gutlunch/Destroy()
if(udder_mob)
diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm
index 8b3e6eb16868..31a9e851a0a1 100644
--- a/code/datums/components/uplink.dm
+++ b/code/datums/components/uplink.dm
@@ -34,20 +34,20 @@
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
if(istype(parent, /obj/item/implant))
- RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, .proc/implant_activation)
- RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, .proc/implanting)
- RegisterSignal(parent, COMSIG_IMPLANT_OTHER, .proc/old_implant)
- RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, .proc/new_implant)
+ RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, PROC_REF(implant_activation))
+ RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, PROC_REF(implanting))
+ RegisterSignal(parent, COMSIG_IMPLANT_OTHER, PROC_REF(old_implant))
+ RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, PROC_REF(new_implant))
else if(istype(parent, /obj/item/pda))
- RegisterSignal(parent, COMSIG_PDA_CHANGE_RINGTONE, .proc/new_ringtone)
- RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, .proc/check_detonate)
+ RegisterSignal(parent, COMSIG_PDA_CHANGE_RINGTONE, PROC_REF(new_ringtone))
+ RegisterSignal(parent, COMSIG_PDA_CHECK_DETONATE, PROC_REF(check_detonate))
else if(istype(parent, /obj/item/radio))
- RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency)
+ RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, PROC_REF(new_frequency))
else if(istype(parent, /obj/item/pen))
- RegisterSignal(parent, COMSIG_PEN_ROTATED, .proc/pen_rotation)
+ RegisterSignal(parent, COMSIG_PEN_ROTATED, PROC_REF(pen_rotation))
uplink_items = get_uplink_items(_gamemode, TRUE, allow_restricted)
@@ -120,7 +120,7 @@
return
active = TRUE
if(user)
- INVOKE_ASYNC(src, .proc/ui_interact, user)
+ INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
// an unlocked uplink blocks also opening the PDA or headset menu
return COMPONENT_NO_INTERACT
diff --git a/code/datums/components/wearertargeting.dm b/code/datums/components/wearertargeting.dm
index cbfec78d11f2..0d94e33c3d76 100644
--- a/code/datums/components/wearertargeting.dm
+++ b/code/datums/components/wearertargeting.dm
@@ -3,14 +3,14 @@
/datum/component/wearertargeting
var/list/valid_slots = list()
var/list/signals = list()
- var/proctype = .proc/pass
+ var/proctype = PROC_REF(pass)
var/mobtype = /mob/living
/datum/component/wearertargeting/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
/datum/component/wearertargeting/proc/on_equip(datum/source, mob/equipper, slot)
SIGNAL_HANDLER
diff --git a/code/datums/components/weatherannouncer.dm b/code/datums/components/weatherannouncer.dm
new file mode 100644
index 000000000000..3821f9a1b559
--- /dev/null
+++ b/code/datums/components/weatherannouncer.dm
@@ -0,0 +1,170 @@
+#define WEATHER_ALERT_CLEAR 0
+#define WEATHER_ALERT_INCOMING 1
+#define WEATHER_ALERT_IMMINENT_OR_ACTIVE 2
+
+/// Component which makes you yell about what the weather is
+/datum/component/weather_announcer
+ /// Currently displayed warning level
+ var/warning_level = WEATHER_ALERT_CLEAR
+ /// Whether the incoming weather is actually going to harm you
+ var/is_weather_dangerous = TRUE
+ /// Are we actually turned on right now?
+ var/enabled = TRUE
+ /// Overlay added when things are alright
+ var/state_normal
+ /// Overlay added when you should start looking for shelter
+ var/state_warning
+ /// Overlay added when you are in danger
+ var/state_danger
+
+/datum/component/weather_announcer/Initialize(
+ state_normal,
+ state_warning,
+ state_danger,
+)
+ . = ..()
+ if (!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ START_PROCESSING(SSprocessing, src)
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays))
+ RegisterSignal(parent, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_powered))
+ RegisterSignal(parent, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_lost))
+
+ src.state_normal = state_normal
+ src.state_warning = state_warning
+ src.state_danger = state_danger
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+ update_light_color()
+
+/datum/component/weather_announcer/Destroy(force, silent)
+ STOP_PROCESSING(SSprocessing, src)
+ return ..()
+
+/// Add appropriate overlays
+/datum/component/weather_announcer/proc/on_update_overlays(atom/parent_atom, list/overlays)
+ SIGNAL_HANDLER
+ if (!enabled || !state_normal || !state_warning || !state_danger)
+ return
+
+ switch (warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ overlays += state_normal
+ if(WEATHER_ALERT_INCOMING)
+ overlays += state_warning
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ overlays += (is_weather_dangerous) ? state_danger : state_warning
+
+/// If powered, receive updates
+/datum/component/weather_announcer/proc/on_powered()
+ SIGNAL_HANDLER
+ enabled = TRUE
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+
+/// If no power, don't receive updates
+/datum/component/weather_announcer/proc/on_power_lost()
+ SIGNAL_HANDLER
+ enabled = FALSE
+ var/atom/speaker = parent
+ speaker.update_appearance(UPDATE_ICON)
+
+/datum/component/weather_announcer/process(seconds_per_tick)
+ if (!enabled)
+ return
+
+ var/previous_level = warning_level
+ var/previous_danger = is_weather_dangerous
+ set_current_alert_level()
+ if(previous_level == warning_level && previous_danger == is_weather_dangerous)
+ return // No change
+ var/atom/movable/speaker = parent
+ speaker.say(get_warning_message())
+ speaker.update_appearance(UPDATE_ICON)
+ update_light_color()
+
+/datum/component/weather_announcer/proc/update_light_color()
+ var/atom/movable/light = parent
+ switch(warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ light.set_light_color(LIGHT_COLOR_GREEN)
+ if(WEATHER_ALERT_INCOMING)
+ light.set_light_color(LIGHT_COLOR_YELLOW)
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ light.set_light_color(LIGHT_COLOR_INTENSE_RED)
+ light.update_light()
+
+/// Returns a string we should display to communicate what you should be doing
+/datum/component/weather_announcer/proc/get_warning_message()
+ if (!is_weather_dangerous)
+ return "No risk expected from incoming weather front."
+ switch(warning_level)
+ if(WEATHER_ALERT_CLEAR)
+ return "All clear, no weather alerts to report."
+ if(WEATHER_ALERT_INCOMING)
+ return "Weather front incoming, begin to seek shelter."
+ if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
+ return "Weather front imminent, find shelter immediately."
+ return "Error in meteorological calculation. Please report this deviation to a trained programmer."
+
+/datum/component/weather_announcer/proc/time_till_storm()
+ var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller(parent)
+ if(!local_weather_controller.next_weather)
+ return null
+ for(var/type_index in local_weather_controller.current_weathers)
+ var/datum/weather/check_weather = local_weather_controller.current_weathers[type_index]
+ if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
+ continue
+ warning_level = WEATHER_ALERT_IMMINENT_OR_ACTIVE
+ return 0
+
+ var/time_until_next = INFINITY
+ var/next_time = local_weather_controller.next_weather - world.time || INFINITY
+ if (next_time && next_time < time_until_next)
+ time_until_next = next_time
+ return time_until_next
+
+/// Polls existing weather for what kind of warnings we should be displaying.
+/datum/component/weather_announcer/proc/set_current_alert_level()
+ var/time_until_next = time_till_storm()
+ if(isnull(time_until_next))
+ return // No problems if there are no mining z levels
+ if(time_until_next >= 2 MINUTES)
+ warning_level = WEATHER_ALERT_CLEAR
+ return
+
+ if(time_until_next >= 30 SECONDS)
+ warning_level = WEATHER_ALERT_INCOMING
+ return
+
+ // Weather is here, now we need to figure out if it is dangerous
+ warning_level = WEATHER_ALERT_IMMINENT_OR_ACTIVE
+
+ var/datum/weather_controller/local_weather_controller = SSmapping.get_map_zone_weather_controller(parent)
+ for(var/type_index in local_weather_controller.current_weathers)
+ var/datum/weather/check_weather = local_weather_controller.current_weathers[type_index]
+ if(!check_weather.barometer_predictable || check_weather.stage == WIND_DOWN_STAGE || check_weather.stage == END_STAGE)
+ continue
+ is_weather_dangerous = !check_weather.aesthetic
+ return
+
+/datum/component/weather_announcer/proc/on_examine(atom/radio, mob/examiner, list/examine_texts)
+ var/time_until_next = time_till_storm()
+ if(isnull(time_until_next))
+ return
+ if (time_until_next == 0)
+ examine_texts += span_warning ("A storm is currently active, please seek shelter.")
+ else
+ examine_texts += span_notice("The next storm is inbound in [DisplayTimeText(time_until_next)].")
+
+/datum/component/weather_announcer/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+
+/datum/component/weather_announcer/UnregisterFromParent()
+ .=..()
+ UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+
+#undef WEATHER_ALERT_CLEAR
+#undef WEATHER_ALERT_INCOMING
+#undef WEATHER_ALERT_IMMINENT_OR_ACTIVE
diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm
index 9f723b9c07f6..f2c2b0b303ee 100644
--- a/code/datums/components/wet_floor.dm
+++ b/code/datums/components/wet_floor.dm
@@ -29,12 +29,12 @@
permanent = _permanent
if(!permanent)
START_PROCESSING(SSwet_floors, src)
- addtimer(CALLBACK(src, .proc/gc, TRUE), 1) //GC after initialization.
+ addtimer(CALLBACK(src, PROC_REF(gc), TRUE), 1) //GC after initialization.
last_process = world.time
/datum/component/wet_floor/RegisterWithParent()
- RegisterSignal(parent, COMSIG_TURF_IS_WET, .proc/is_wet)
- RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, .proc/dry)
+ RegisterSignal(parent, COMSIG_TURF_IS_WET, PROC_REF(is_wet))
+ RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, PROC_REF(dry))
/datum/component/wet_floor/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_TURF_IS_WET, COMSIG_TURF_MAKE_DRY))
@@ -94,7 +94,7 @@
qdel(parent.GetComponent(/datum/component/slippery))
return
- parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, .proc/AfterSlip))
+ parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, PROC_REF(AfterSlip)))
/datum/component/wet_floor/proc/dry(datum/source, strength = TURF_WET_WATER, immediate = FALSE, duration_decrease = INFINITY)
SIGNAL_HANDLER
diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm
index 3f519fc49155..5ba239c26d7a 100644
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -42,7 +42,7 @@
spot1.Beam(spot2,beam_effect,time=20)
current_charges--
owner.update_action_buttons_icon()
- addtimer(CALLBACK(src, .proc/charge), charge_rate)
+ addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate)
/datum/action/innate/dash/proc/charge()
current_charges = clamp(current_charges + 1, 0, max_charges)
diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm
index 1ee6f7d2eb55..547e66855bf6 100644
--- a/code/datums/diseases/advance/symptoms/cough.dm
+++ b/code/datums/diseases/advance/symptoms/cough.dm
@@ -73,6 +73,6 @@ BONUS
if(power >= 2 && prob(30))
to_chat(M, "[pick("You have a coughing fit!", "You can't stop coughing!")]")
M.Immobilize(20)
- addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 6)
- addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 12)
- addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 18)
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, emote), "cough"), 6)
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, emote), "cough"), 12)
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob, emote), "cough"), 18)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index bdc47a32c3a0..c7e5b5c064ac 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -277,12 +277,12 @@
if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
to_chat(M, "You feel yourself slip into a regenerative coma...")
active_coma = TRUE
- addtimer(CALLBACK(src, .proc/coma, M), 60)
+ addtimer(CALLBACK(src, PROC_REF(coma), M), 60)
/datum/symptom/heal/coma/proc/coma(mob/living/M)
M.fakedeath("regenerative_coma", !deathgasp)
- addtimer(CALLBACK(src, .proc/uncoma, M), 300)
+ addtimer(CALLBACK(src, PROC_REF(uncoma), M), 300)
/datum/symptom/heal/coma/proc/uncoma(mob/living/M)
diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm
index d1b59edbc1c8..2423208cb072 100644
--- a/code/datums/diseases/advance/symptoms/shedding.dm
+++ b/code/datums/diseases/advance/symptoms/shedding.dm
@@ -40,11 +40,11 @@ BONUS
if(3, 4)
if(!(H.hairstyle == "Bald") && !(H.hairstyle == "Balding Hair"))
to_chat(H, "Your hair starts to fall out in clumps...")
- addtimer(CALLBACK(src, .proc/Shed, H, FALSE), 50)
+ addtimer(CALLBACK(src, PROC_REF(Shed), H, FALSE), 50)
if(5)
if(!(H.facial_hairstyle == "Shaved") || !(H.hairstyle == "Bald"))
to_chat(H, "Your hair starts to fall out in clumps...")
- addtimer(CALLBACK(src, .proc/Shed, H, TRUE), 50)
+ addtimer(CALLBACK(src, PROC_REF(Shed), H, TRUE), 50)
/datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald)
if(fullbald)
diff --git a/code/datums/diseases/advance/symptoms/species.dm b/code/datums/diseases/advance/symptoms/species.dm
index 49a3cf8d07d5..b19a4d453dd5 100644
--- a/code/datums/diseases/advance/symptoms/species.dm
+++ b/code/datums/diseases/advance/symptoms/species.dm
@@ -27,7 +27,7 @@
severity = 0
/datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A)
- A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen and golems.
+ A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen
/datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
A.infectable_biotypes &= ~MOB_MINERAL
diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
index 56261688fc2a..21a780b93665 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -28,7 +28,7 @@
affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) , forced = "pierrot's throat")
/datum/disease/pierrot_throat/after_add()
- RegisterSignal(affected_mob, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(affected_mob, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/disease/pierrot_throat/proc/handle_speech(datum/source, list/speech_args)
diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 5a1c2b3783d4..7faf2a315e42 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -255,7 +255,7 @@
if(-INFINITY to 0)
message = "You can feel your DNA exploding, we need to do something fast!"
if(stability <= 0)
- holder.apply_status_effect(STATUS_EFFECT_DNA_MELT)
+ holder.apply_status_effect(/datum/status_effect/dna_melt)
if(message)
to_chat(holder, message)
@@ -645,7 +645,7 @@
to_chat(src, "Oh, I actually feel quite alright!")
reagents.add_reagent(/datum/reagent/aslimetoxin, 10)
if(6)
- apply_status_effect(STATUS_EFFECT_GO_AWAY)
+ apply_status_effect(/datum/status_effect/go_away)
if(7)
to_chat(src, "Oh, I actually feel quite alright!")
ForceContractDisease(new/datum/disease/decloning()) //slow acting, non-viral clone damage based GBS
@@ -688,12 +688,12 @@
spawn_gibs()
set_species(/datum/species/skeleton)
if(prob(90))
- addtimer(CALLBACK(src, .proc/death), 30)
+ addtimer(CALLBACK(src, PROC_REF(death)), 30)
if(mind)
mind.hasSoul = FALSE
if(5)
to_chat(src, "LOOK UP!")
- addtimer(CALLBACK(src, .proc/something_horrible_mindmelt), 30)
+ addtimer(CALLBACK(src, PROC_REF(something_horrible_mindmelt)), 30)
/mob/living/carbon/human/proc/something_horrible_mindmelt()
@@ -704,4 +704,4 @@
eyes.Remove(src)
qdel(eyes)
visible_message("[src] looks up and their eyes melt away!", "='userdanger'>I understand now.")
- addtimer(CALLBACK(src, .proc/adjustOrganLoss, ORGAN_SLOT_BRAIN, 200), 20)
+ addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20)
diff --git a/code/datums/ductnet.dm b/code/datums/ductnet.dm
index 14a74a67c490..3c109564815e 100644
--- a/code/datums/ductnet.dm
+++ b/code/datums/ductnet.dm
@@ -15,8 +15,8 @@
/datum/ductnet/proc/remove_duct(obj/machinery/duct/ducting)
destroy_network(FALSE)
for(var/obj/machinery/duct/D in ducting.neighbours)
- addtimer(CALLBACK(D, /obj/machinery/duct/proc/reconnect), 0) //all needs to happen after the original duct that was destroyed finishes destroying itself
- addtimer(CALLBACK(D, /obj/machinery/duct/proc/generate_connects), 0)
+ addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/duct, reconnect)), 0) //all needs to happen after the original duct that was destroyed finishes destroying itself
+ addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/duct, generate_connects)), 0)
qdel(src)
///add a plumbing object to either demanders or suppliers
/datum/ductnet/proc/add_plumber(datum/component/plumbing/P, dir)
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
index 55abf0a85de1..e9779644c211 100644
--- a/code/datums/elements/_element.dm
+++ b/code/datums/elements/_element.dm
@@ -23,7 +23,7 @@
return ELEMENT_INCOMPATIBLE
SEND_SIGNAL(target, COMSIG_ELEMENT_ATTACH, src)
if(element_flags & ELEMENT_DETACH)
- RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach, override = TRUE)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(Detach), override = TRUE)
/*
The override = TRUE here is to suppress runtimes happening because of the blood decal element
diff --git a/code/datums/elements/bed_tucking.dm b/code/datums/elements/bed_tucking.dm
index 10135871a7ad..c094e5a5b108 100644
--- a/code/datums/elements/bed_tucking.dm
+++ b/code/datums/elements/bed_tucking.dm
@@ -17,7 +17,7 @@
x_offset = x
y_offset = y
rotation_degree = rotation
- RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, .proc/tuck_into_bed)
+ RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(tuck_into_bed))
/datum/element/bed_tuckable/Detach(obj/target)
. = ..()
@@ -44,7 +44,7 @@
tucked.pixel_y = y_offset
if(rotation_degree)
tucked.transform = turn(tucked.transform, rotation_degree)
- RegisterSignal(tucked, COMSIG_ITEM_PICKUP, .proc/untuck)
+ RegisterSignal(tucked, COMSIG_ITEM_PICKUP, PROC_REF(untuck))
return COMPONENT_NO_AFTERATTACK
diff --git a/code/datums/elements/bsa_blocker.dm b/code/datums/elements/bsa_blocker.dm
index 5bdf4fa90912..96606a553096 100644
--- a/code/datums/elements/bsa_blocker.dm
+++ b/code/datums/elements/bsa_blocker.dm
@@ -3,7 +3,7 @@
/datum/element/bsa_blocker/Attach(datum/target)
if(!isatom(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_ATOM_BSA_BEAM, .proc/block_bsa)
+ RegisterSignal(target, COMSIG_ATOM_BSA_BEAM, PROC_REF(block_bsa))
return ..()
/datum/element/bsa_blocker/proc/block_bsa()
diff --git a/code/datums/elements/cleaning.dm b/code/datums/elements/cleaning.dm
index 1f9eb15ea1c8..c43c36902af5 100644
--- a/code/datums/elements/cleaning.dm
+++ b/code/datums/elements/cleaning.dm
@@ -2,7 +2,7 @@
. = ..()
if(!ismovable(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Clean)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Clean))
/datum/element/cleaning/Detach(datum/target)
. = ..()
diff --git a/code/datums/elements/connect_loc.dm b/code/datums/elements/connect_loc.dm
index cfadedd5980d..a0614dd12e0d 100644
--- a/code/datums/elements/connect_loc.dm
+++ b/code/datums/elements/connect_loc.dm
@@ -14,7 +14,7 @@
src.connections = connections
- RegisterSignal(listener, COMSIG_MOVABLE_MOVED, .proc/on_moved, override = TRUE)
+ RegisterSignal(listener, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), override = TRUE)
update_signals(listener)
/datum/element/connect_loc/Detach(atom/movable/listener)
diff --git a/code/datums/elements/decals/_decals.dm b/code/datums/elements/decals/_decals.dm
index 17ba311bc5a3..96c5d6a5fab3 100644
--- a/code/datums/elements/decals/_decals.dm
+++ b/code/datums/elements/decals/_decals.dm
@@ -24,21 +24,21 @@
cleanable = _cleanable
rotated = _rotated
- RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/apply_overlay, TRUE)
+ RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE)
if(isturf(target))
- RegisterSignal(target,COMSIG_TURF_AFTER_SHUTTLE_MOVE,.proc/shuttlemove_react, TRUE)
+ RegisterSignal(target,COMSIG_TURF_AFTER_SHUTTLE_MOVE, PROC_REF(shuttlemove_react), TRUE)
if(target.flags_1 & INITIALIZED_1)
target.update_appearance() //could use some queuing here now maybe.
else
- RegisterSignal(target,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE,.proc/late_update_icon, TRUE)
+ RegisterSignal(target,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, PROC_REF(late_update_icon), TRUE)
if(isitem(target))
- INVOKE_ASYNC(target, /obj/item/.proc/update_slot_icon, TRUE)
+ INVOKE_ASYNC(target, TYPE_PROC_REF(/obj/item, update_slot_icon), TRUE)
if(_dir)
- RegisterSignal(target, COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react,TRUE)
+ RegisterSignal(target, COMSIG_ATOM_DIR_CHANGE, PROC_REF(rotate_react),TRUE)
if(_cleanable)
- RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react,TRUE)
+ RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react),TRUE)
if(_description)
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examine,TRUE)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine),TRUE)
/**
* ## generate_appearance
@@ -63,7 +63,7 @@
UnregisterSignal(source, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_TURF_AFTER_SHUTTLE_MOVE))
source.update_appearance()
if(isitem(source))
- INVOKE_ASYNC(source, /obj/item/.proc/update_slot_icon)
+ INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, update_slot_icon))
return ..()
/datum/element/decal/proc/late_update_icon(atom/source)
diff --git a/code/datums/elements/decals/blood.dm b/code/datums/elements/decals/blood.dm
index d5f30c4d0c57..85f75bef2416 100644
--- a/code/datums/elements/decals/blood.dm
+++ b/code/datums/elements/decals/blood.dm
@@ -5,34 +5,22 @@
return ELEMENT_INCOMPATIBLE
. = ..()
- RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name, TRUE)
+ RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, PROC_REF(get_examine_name), TRUE)
/datum/element/decal/blood/Detach(atom/source, force)
UnregisterSignal(source, COMSIG_ATOM_GET_EXAMINE_NAME)
return ..()
/datum/element/decal/blood/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha, source)
- var/obj/item/I = source
- if(!_icon)
- _icon = 'icons/effects/blood.dmi'
- if(!_icon_state)
- _icon_state = "itemblood"
+ if(!_icon || !_icon_state)
+ return FALSE
if(!_color)
_color = COLOR_BLOOD
- var/item_icon = I.icon
- var/item_icon_state = I.icon_state
- var/static/list/blood_splatter_appearances = list()
- //try to find a pre-processed blood-splatter. otherwise, make a new one
- var/index = "[REF(item_icon)]-[item_icon_state]"
- pic = blood_splatter_appearances[index]
-
- if(!pic)
- var/icon/blood_splatter_icon = icon(I.icon, I.icon_state, null, 1) //we only want to apply blood-splatters to the initial icon_state for each object
- blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
- blood_splatter_icon.Blend(icon(_icon, _icon_state), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
- pic = mutable_appearance(blood_splatter_icon, initial(I.icon_state))
- pic.color = _color
- blood_splatter_appearances[index] = pic
+ var/icon/blood_splatter_icon = icon(_icon, _icon_state, , 1) //we only want to apply blood-splatters to the initial icon_state for each object
+ blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent)
+ blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
+ pic = mutable_appearance(blood_splatter_icon)
+ pic.color = _color
return TRUE
/datum/element/decal/blood/proc/get_examine_name(datum/source, mob/user, list/override)
diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm
index 8c9b5e88a5a9..de0520b5bbab 100644
--- a/code/datums/elements/digitalcamo.dm
+++ b/code/datums/elements/digitalcamo.dm
@@ -10,8 +10,8 @@
. = ..()
if(!isliving(target) || (target in attached_mobs))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, .proc/can_track)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track))
var/image/img = image(loc = target)
img.override = TRUE
attached_mobs[target] = img
diff --git a/code/datums/elements/dunkable.dm b/code/datums/elements/dunkable.dm
index 8ba38a515dad..1eaee1d8cbbc 100644
--- a/code/datums/elements/dunkable.dm
+++ b/code/datums/elements/dunkable.dm
@@ -10,7 +10,7 @@
if(!isitem(target))
return ELEMENT_INCOMPATIBLE
dunk_amount = amount_per_dunk
- RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/get_dunked)
+ RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(get_dunked))
/datum/element/dunkable/Detach(datum/target)
. = ..()
diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm
index d62a6fb9101a..8fc916c99c14 100644
--- a/code/datums/elements/earhealing.dm
+++ b/code/datums/elements/earhealing.dm
@@ -10,7 +10,7 @@
if(!isitem(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged)
+ RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), PROC_REF(equippedChanged))
/datum/element/earhealing/Detach(datum/target)
. = ..()
diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm
index 40b7d38d65a4..9b427b6b80c5 100644
--- a/code/datums/elements/embed.dm
+++ b/code/datums/elements/embed.dm
@@ -38,12 +38,12 @@
return ELEMENT_INCOMPATIBLE
if(isitem(target))
- RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, .proc/checkEmbedMob)
- RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/checkEmbedOther)
- RegisterSignal(target, COMSIG_ELEMENT_ATTACH, .proc/severancePackage)
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examined)
- RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, .proc/tryForceEmbed)
- RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, .proc/detachFromWeapon)
+ RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(checkEmbedMob))
+ RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(checkEmbedOther))
+ RegisterSignal(target, COMSIG_ELEMENT_ATTACH, PROC_REF(severancePackage))
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examined))
+ RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, PROC_REF(tryForceEmbed))
+ RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, PROC_REF(detachFromWeapon))
if(!initialized)
src.embed_chance = embed_chance
src.fall_chance = fall_chance
@@ -60,7 +60,7 @@
initialized = TRUE
else
payload_type = projectile_payload
- RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/checkEmbedProjectile)
+ RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(checkEmbedProjectile))
/datum/element/embed/Detach(obj/target)
diff --git a/code/datums/elements/firestacker.dm b/code/datums/elements/firestacker.dm
index de829098637a..9646579a83ca 100644
--- a/code/datums/elements/firestacker.dm
+++ b/code/datums/elements/firestacker.dm
@@ -15,10 +15,10 @@
src.amount = amount
- RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/impact, override = TRUE)
+ RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(impact), override = TRUE)
if(isitem(target))
- RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/item_attack, override = TRUE)
- RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/item_attack_self, override = TRUE)
+ RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(item_attack), override = TRUE)
+ RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(item_attack_self), override = TRUE)
/datum/element/firestacker/Detach(datum/source, force)
. = ..()
diff --git a/code/datums/elements/forced_gravity.dm b/code/datums/elements/forced_gravity.dm
index c567ff7b0961..b7bccea7ff02 100644
--- a/code/datums/elements/forced_gravity.dm
+++ b/code/datums/elements/forced_gravity.dm
@@ -16,9 +16,9 @@
src.gravity = gravity
src.ignore_space = ignore_space
- RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check)
+ RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, PROC_REF(gravity_check))
if(isturf(target))
- RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check)
+ RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, PROC_REF(turf_gravity_check))
ADD_TRAIT(target, TRAIT_FORCED_GRAVITY, our_ref)
diff --git a/code/datums/elements/lazy_fishing_spot.dm b/code/datums/elements/lazy_fishing_spot.dm
index 603cd56e22fb..f8c4cfa80134 100644
--- a/code/datums/elements/lazy_fishing_spot.dm
+++ b/code/datums/elements/lazy_fishing_spot.dm
@@ -12,7 +12,7 @@
CRASH("Lazy fishing spot had no configuration passed in.")
src.configuration = configuration
- RegisterSignal(target, COMSIG_PRE_FISHING, .proc/create_fishing_spot)
+ RegisterSignal(target, COMSIG_PRE_FISHING, PROC_REF(create_fishing_spot))
/datum/element/lazy_fishing_spot/Detach(datum/target)
UnregisterSignal(target, COMSIG_PRE_FISHING)
diff --git a/code/datums/elements/light_blocking.dm b/code/datums/elements/light_blocking.dm
index 69b6beffe6a1..2c73a082625a 100644
--- a/code/datums/elements/light_blocking.dm
+++ b/code/datums/elements/light_blocking.dm
@@ -9,7 +9,7 @@
. = ..()
if(!ismovable(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_target_move)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_target_move))
var/atom/movable/movable_target = target
if(isturf(movable_target.loc))
var/turf/turf_loc = movable_target.loc
diff --git a/code/datums/elements/mobappearance.dm b/code/datums/elements/mobappearance.dm
index 41b94755389f..4d8cc6eb2877 100644
--- a/code/datums/elements/mobappearance.dm
+++ b/code/datums/elements/mobappearance.dm
@@ -23,11 +23,11 @@
mob_appearance(target)
target.RemoveElement(/datum/element/appearance_on_login)
else
- RegisterSignal(target, COMSIG_MOB_LOGIN, .proc/on_mob_login)
+ RegisterSignal(target, COMSIG_MOB_LOGIN, PROC_REF(on_mob_login))
/datum/element/appearance_on_login/proc/on_mob_login(mob/source)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/mob_appearance, source)
+ INVOKE_ASYNC(src, PROC_REF(mob_appearance), source)
UnregisterSignal(source, COMSIG_MOB_LOGIN)
source.RemoveElement(/datum/element/appearance_on_login)
@@ -40,7 +40,7 @@
/datum/element/appearance_on_login/proc/mob_appearance(mob/living/simple_animal/target)
- var/picked_icon = show_radial_menu(target, target, icon_list, custom_check = CALLBACK(src, .proc/check_menu, target), radius = 38, require_near = TRUE)
+ var/picked_icon = show_radial_menu(target, target, icon_list, custom_check = CALLBACK(src, PROC_REF(check_menu), target), radius = 38, require_near = TRUE)
if(picked_icon)
target.icon_state = "[picked_icon]"
target.icon_living = "[picked_icon]"
diff --git a/code/datums/elements/renamemob.dm b/code/datums/elements/renamemob.dm
index bbc1fb99a7c2..909f55adc3e9 100644
--- a/code/datums/elements/renamemob.dm
+++ b/code/datums/elements/renamemob.dm
@@ -8,11 +8,11 @@
rename_mob(target)
target.RemoveElement(/datum/element/rename_on_login)
else
- RegisterSignal(target, COMSIG_MOB_LOGIN, .proc/on_mob_login)
+ RegisterSignal(target, COMSIG_MOB_LOGIN, PROC_REF(on_mob_login))
/datum/element/rename_on_login/proc/on_mob_login(mob/source)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/rename_mob, source)
+ INVOKE_ASYNC(src, PROC_REF(rename_mob), source)
UnregisterSignal(source, COMSIG_MOB_LOGIN)
source.RemoveElement(/datum/element/rename_on_login)
diff --git a/code/datums/elements/selfknockback.dm b/code/datums/elements/selfknockback.dm
index c99f8ab4cc26..fe53db1d4207 100644
--- a/code/datums/elements/selfknockback.dm
+++ b/code/datums/elements/selfknockback.dm
@@ -11,9 +11,9 @@ clamping the Knockback_Force value below. */
/datum/element/selfknockback/Attach(datum/target, throw_amount, speed_amount)
. = ..()
if(isitem(target))
- RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/Item_SelfKnockback)
+ RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(Item_SelfKnockback))
else if(isprojectile(target))
- RegisterSignal(target, COMSIG_PROJECTILE_FIRE, .proc/Projectile_SelfKnockback)
+ RegisterSignal(target, COMSIG_PROJECTILE_FIRE, PROC_REF(Projectile_SelfKnockback))
else
return ELEMENT_INCOMPATIBLE
diff --git a/code/datums/elements/snail_crawl.dm b/code/datums/elements/snail_crawl.dm
index 2bca125f4c25..49b3e5ccf0e8 100644
--- a/code/datums/elements/snail_crawl.dm
+++ b/code/datums/elements/snail_crawl.dm
@@ -7,9 +7,9 @@
return ELEMENT_INCOMPATIBLE
var/P
if(iscarbon(target))
- P = .proc/snail_crawl
+ P = PROC_REF(snail_crawl)
else
- P = .proc/lubricate
+ P = PROC_REF(lubricate)
RegisterSignal(target, COMSIG_MOVABLE_MOVED, P)
/datum/element/snailcrawl/Detach(mob/living/carbon/target)
diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm
index 3439d590669f..5a6c226b3142 100644
--- a/code/datums/elements/squish.dm
+++ b/code/datums/elements/squish.dm
@@ -18,7 +18,7 @@
var/mob/living/carbon/C = target
var/was_lying = C.body_position == LYING_DOWN
- addtimer(CALLBACK(src, .proc/Detach, C, was_lying, reverse), duration)
+ addtimer(CALLBACK(src, PROC_REF(Detach), C, was_lying, reverse), duration)
if(reverse)
C.transform = C.transform.Scale(SHORT, TALL)
diff --git a/code/datums/elements/tool_flash.dm b/code/datums/elements/tool_flash.dm
index cf03bdb502e5..53b94159e9b8 100644
--- a/code/datums/elements/tool_flash.dm
+++ b/code/datums/elements/tool_flash.dm
@@ -16,8 +16,8 @@
src.flash_strength = flash_strength
- RegisterSignal(target, COMSIG_TOOL_IN_USE, .proc/prob_flash)
- RegisterSignal(target, COMSIG_TOOL_START_USE, .proc/flash)
+ RegisterSignal(target, COMSIG_TOOL_IN_USE, PROC_REF(prob_flash))
+ RegisterSignal(target, COMSIG_TOOL_START_USE, PROC_REF(flash))
/datum/element/tool_flash/Detach(datum/source, force)
. = ..()
diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm
index 8a2ebca136cf..715c6ab4ecbd 100644
--- a/code/datums/elements/turf_transparency.dm
+++ b/code/datums/elements/turf_transparency.dm
@@ -15,8 +15,8 @@
our_turf.plane = OPENSPACE_PLANE
our_turf.layer = OPENSPACE_LAYER
- RegisterSignal(target, COMSIG_TURF_MULTIZ_DEL, .proc/on_multiz_turf_del, TRUE)
- RegisterSignal(target, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_turf_new, TRUE)
+ RegisterSignal(target, COMSIG_TURF_MULTIZ_DEL, PROC_REF(on_multiz_turf_del), TRUE)
+ RegisterSignal(target, COMSIG_TURF_MULTIZ_NEW, PROC_REF(on_multiz_turf_new), TRUE)
ADD_TRAIT(our_turf, TURF_Z_TRANSPARENT_TRAIT, TURF_TRAIT)
diff --git a/code/datums/elements/undertile.dm b/code/datums/elements/undertile.dm
index 3957f4632559..65301e8bdc0d 100644
--- a/code/datums/elements/undertile.dm
+++ b/code/datums/elements/undertile.dm
@@ -19,7 +19,7 @@
if(!ismovable(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_OBJ_HIDE, .proc/hide)
+ RegisterSignal(target, COMSIG_OBJ_HIDE, PROC_REF(hide))
src.invisibility_trait = invisibility_trait
src.invisibility_level = invisibility_level
diff --git a/code/datums/elements/update_icon_blocker.dm b/code/datums/elements/update_icon_blocker.dm
index 5c84ed9886aa..674b314ec9c1 100644
--- a/code/datums/elements/update_icon_blocker.dm
+++ b/code/datums/elements/update_icon_blocker.dm
@@ -4,7 +4,7 @@
. = ..()
if(!istype(target, /atom))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon)
+ RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, PROC_REF(block_update_icon))
/datum/element/update_icon_blocker/proc/block_update_icon()
SIGNAL_HANDLER
diff --git a/code/datums/elements/update_icon_updates_onmob.dm b/code/datums/elements/update_icon_updates_onmob.dm
index 7d1cb8d287d1..0ec9a472e64f 100644
--- a/code/datums/elements/update_icon_updates_onmob.dm
+++ b/code/datums/elements/update_icon_updates_onmob.dm
@@ -5,7 +5,7 @@
. = ..()
if(!istype(target, /obj/item))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, .proc/update_onmob)
+ RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_onmob))
/datum/element/update_icon_updates_onmob/proc/update_onmob(obj/item/target)
SIGNAL_HANDLER
diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm
index 04a44d85f267..059546116461 100644
--- a/code/datums/elements/waddling.dm
+++ b/code/datums/elements/waddling.dm
@@ -5,9 +5,9 @@
if(!ismovable(target))
return ELEMENT_INCOMPATIBLE
if(isliving(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/LivingWaddle)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(LivingWaddle))
else
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Waddle)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Waddle))
/datum/element/waddling/Detach(datum/source, force)
. = ..()
diff --git a/code/datums/ert.dm b/code/datums/ert.dm
index 8bb5f0e6e35a..0c0eb282e484 100644
--- a/code/datums/ert.dm
+++ b/code/datums/ert.dm
@@ -1,15 +1,29 @@
/datum/ert
var/mobtype = /mob/living/carbon/human
var/team = /datum/team/ert
- var/opendoors = TRUE
+ var/opendoors = FALSE
var/leader_role = /datum/antagonist/ert/commander
- var/enforce_human = TRUE
+ var/enforce_human = FALSE
var/roles = list(/datum/antagonist/ert/security, /datum/antagonist/ert/medic, /datum/antagonist/ert/engineer) //List of possible roles to be assigned to ERT members.
var/rename_team
var/code
var/mission = "Assist your employers in achieving their goals. Protect corporate assets."
var/teamsize = 5
var/polldesc
+ /// If TRUE, gives the team members "[role] [random last name]" style names
+ var/random_names = FALSE
+ /// If TRUE, the admin who created the response team will be spawned in the briefing room in their preferred briefing outfit (assuming they're a ghost)
+ var/spawn_admin = FALSE
+ /// If TRUE, we try and pick one of the most experienced players who volunteered to fill the leader slot
+ var/leader_experience = TRUE
+ /// A custom map template to spawn the ERT at. If use_custom_shuttle is FALSE, the ERT will spawn on foot. By default, a Kunai-Class.
+ var/datum/map_template/ert_template = /datum/map_template/shuttle/subshuttles/kunai
+ /// If we should actually _use_ the ert_template custom shuttle
+ var/use_custom_shuttle = TRUE
+ /// If TRUE, the ERT will spawn at the outpost. If use_custom_shuttle is also TRUE, the shuttle will be docked at the outpost
+ var/spawn_at_outpost = TRUE
+
+// Nanotrasen
/datum/ert/New()
if (!polldesc)
@@ -46,20 +60,16 @@
code = "Green"
teamsize = 1
opendoors = FALSE
- leader_role = /datum/antagonist/official
- roles = list(/datum/antagonist/official)
+ leader_role = /datum/antagonist/ert/official
+ roles = list(/datum/antagonist/ert/official)
rename_team = "CentCom Officials"
polldesc = "a CentCom Official"
+ random_names = FALSE
+ leader_experience = FALSE
+ spawn_at_outpost = FALSE
/datum/ert/centcom_official/New()
- mission = "Conduct a routine review of [station_name()]."
-
-/datum/ert/inquisition
- roles = list(/datum/antagonist/ert/chaplain/inquisitor, /datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor)
- leader_role = /datum/antagonist/ert/commander/inquisitor
- rename_team = "Inquisition"
- mission = "Destroy any traces of paranormal activity within the deployment site."
- polldesc = "a Nanotrasen paranormal response team"
+ mission = "Conduct a routine review of [station_name()]'s vessels."
/datum/ert/janitor
roles = list(/datum/antagonist/ert/janitor, /datum/antagonist/ert/janitor/heavy)
@@ -75,6 +85,170 @@
leader_role = /datum/antagonist/ert/intern/leader
teamsize = 7
opendoors = FALSE
+ spawn_at_outpost = FALSE
rename_team = "Horde of Interns"
mission = "Assist in conflict resolution."
polldesc = "an unpaid internship opportunity with Nanotrasen"
+
+/datum/ert/intern/unarmed
+ roles = list(/datum/antagonist/ert/intern/unarmed)
+ leader_role = /datum/antagonist/ert/intern/leader/unarmed
+ rename_team = "Unarmed Horde of Interns"
+
+/datum/ert/loss_prevention
+ code = "Light Blue"
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/lp/lieutenant
+ roles = list(/datum/antagonist/ert/lp, /datum/antagonist/ert/lp/medic, /datum/antagonist/ert/lp/engineer)
+ rename_team = "Loss Prevention Team"
+ polldesc = "a NanoTrasen loss prevention team"
+
+// Inteq
+
+/datum/ert/inteq
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/inteq/leader
+ roles = list(/datum/antagonist/ert/inteq)
+ mission = "Carry out your contract."
+ rename_team = "Generic Inteq Team"
+ polldesc = "an Inteq emergency team"
+
+// SolGov
+
+/datum/ert/solgov
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/solgov
+ roles = list(/datum/antagonist/ert/solgov)
+ mission = "Intervene in Solarian interests."
+ rename_team = "SolGov Sonnensoldner Team"
+ polldesc = "a SolGov mercenary team"
+
+/datum/ert/solgov/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/official/solgov
+ roles = list(/datum/antagonist/ert/official/solgov)
+ rename_team = "SolGov Inspector"
+ polldesc = "a solarian inspector"
+ spawn_at_outpost = FALSE
+
+/datum/ert/solgov/inspector/New()
+ mission = "Conduct a routine review on [station_name()]'s vessels."
+
+// Minutemen
+
+/datum/ert/minutemen
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/minutemen/leader
+ roles = list(/datum/antagonist/ert/minutemen)
+ mission = "Keep the peace in sector affairs"
+ rename_team = "Generic Minutemen Team"
+ polldesc = "a Minutemen emergency team"
+ random_names = TRUE
+
+
+/datum/ert/minutemen/bard
+ leader_role = /datum/antagonist/ert/minutemen/bard/leader
+ roles = list(/datum/antagonist/ert/minutemen/bard)
+ rename_team = "Minutemen BARD Team"
+ polldesc = "a Minutemen biohazard removal team"
+
+/datum/ert/minutemen/riot
+ teamsize = 6
+ leader_role = /datum/antagonist/ert/minutemen/riot/leader
+ roles = list(/datum/antagonist/ert/minutemen/riot)
+ rename_team = "Minutemen Riot Control Team"
+ polldesc = "a Minutemen riot control team"
+
+/datum/ert/minutemen/piratehunters
+ leader_role = /datum/antagonist/ert/minutemen/piratehunters/leader
+ roles = list(/datum/antagonist/ert/minutemen/piratehunters)
+ mission = "Eliminate pirate presence within the sector."
+ rename_team = "Minutemen Pirate Hunter Team"
+ polldesc = "a fireteam of Minutemen pirate hunters"
+
+/datum/ert/minutemen/inspector
+ teamsize = 1
+ leader_role = /datum/antagonist/ert/official/minutemen
+ roles = list(/datum/antagonist/ert/official/minutemen)
+ rename_team = "Minutemen GOLD Inspector"
+ polldesc = "a Minutemen inspector"
+
+// Syndicate
+
+/datum/ert/syndicate
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/syndicate/leader
+ roles = list(/datum/antagonist/ert/syndicate)
+ mission = "Serve the interests of the Syndicate."
+ rename_team = "Generic Syndicate Team"
+ polldesc = "a Syndicate emergency team"
+ spawn_at_outpost = FALSE
+
+/datum/ert/syndicate/gorlex
+ leader_role = /datum/antagonist/ert/syndicate/gorlex/leader
+ roles = list(/datum/antagonist/ert/syndicate/gorlex, /datum/antagonist/ert/syndicate/gorlex/pointman, /datum/antagonist/ert/syndicate/gorlex/medic, /datum/antagonist/ert/syndicate/gorlex/sniper)
+ mission = "Serve the interests of the 2nd Battlegroup."
+ rename_team = "2nd Battlegroup Squad"
+ polldesc = "a loyalist Gorlex squad"
+
+/datum/ert/syndicate/cybersun
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun)
+ mission = "Serve the interests of CyberSun."
+ rename_team = "Cybersun Commando Team"
+ polldesc = "a Cybersun Commando team"
+
+/datum/ert/syndicate/cybersun/medic
+ leader_role = /datum/antagonist/ert/syndicate/cybersun/medic/leader
+ roles = list(/datum/antagonist/ert/syndicate/cybersun/medic)
+ mission = "Assist CyberSun clients."
+ rename_team = "Cybersun Medical Intervention Team"
+ polldesc = "a Cybersun paramedic team"
+
+// Frontiersmen
+/datum/ert/frontier
+ teamsize = 4
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier)
+ rename_team = "Generic Frontiersmen Team"
+ mission = "Pillage in the name of the Frontiersmen."
+ polldesc = "an armed group of pirates"
+ random_names = TRUE
+ leader_experience = FALSE
+ spawn_at_outpost = FALSE
+ ert_template = /datum/map_template/shuttle/subshuttles/sugarcube
+
+/datum/ert/frontier/assault
+ leader_role = /datum/antagonist/ert/frontier/leader
+ roles = list(/datum/antagonist/ert/frontier, /datum/antagonist/ert/frontier/medic, /datum/antagonist/ert/frontier/engineer)
+ rename_team = "Assault Frontiersmen Team"
+ polldesc = "a well armed squad of pirates"
+ ert_template = /datum/map_template/shuttle/subshuttles/frontiersmen_gut
+
+/datum/ert/independent
+ teamsize = 3
+ opendoors = FALSE
+ leader_role = /datum/antagonist/ert/independent
+ roles = list(/datum/antagonist/ert/independent)
+ rename_team = "Security Independent Team"
+ polldesc = "an independent security team"
+
+/datum/ert/independent/emt
+ teamsize = 4
+ leader_role = /datum/antagonist/ert/independent/emt
+ roles = list(/datum/antagonist/ert/independent/emt)
+ rename_team = "Medical Independent Team"
+ polldesc = "an independent medical response team"
+
+/datum/ert/independent/firefighter
+ teamsize = 5
+ leader_role = /datum/antagonist/ert/independent/firefighter/leader
+ roles = list(/datum/antagonist/ert/independent/firefighter, /datum/antagonist/ert/independent/firefighter/medic)
+ rename_team = "Independent Firefighter Team"
+ polldesc = "an independent firefighting team"
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index 445d795d0024..6fd41b9df929 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -241,7 +241,7 @@
/obj/item/disk/holodisk/Initialize(mapload)
. = ..()
if(preset_record_text)
- INVOKE_ASYNC(src, .proc/build_record)
+ INVOKE_ASYNC(src, PROC_REF(build_record))
/obj/item/disk/holodisk/Destroy()
QDEL_NULL(record)
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index abc82ea6806e..24865387794a 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(huds, list(
RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(unregister_mob))
if(next_time_allowed[M] > world.time)
if(!queued_to_see[M])
- addtimer(CALLBACK(src, .proc/show_hud_images_after_cooldown, M), next_time_allowed[M] - world.time)
+ addtimer(CALLBACK(src, PROC_REF(show_hud_images_after_cooldown), M), next_time_allowed[M] - world.time)
queued_to_see[M] = TRUE
else
next_time_allowed[M] = world.time + ADD_HUD_TO_COOLDOWN
diff --git a/code/datums/keybinding/carbon.dm b/code/datums/keybinding/carbon.dm
index 29e53039fa86..568a56e368df 100644
--- a/code/datums/keybinding/carbon.dm
+++ b/code/datums/keybinding/carbon.dm
@@ -22,7 +22,7 @@
return TRUE
/datum/keybinding/carbon/hold_throw_mode
- hotkey_keys = list("Space")
+// hotkey_keys = list("Space")
name = "hold_throw_mode"
full_name = "Hold throw mode"
description = "Hold this to turn on throw mode, and release it to turn off throw mode"
diff --git a/code/datums/keybinding/human.dm b/code/datums/keybinding/human.dm
index 41b698059bb4..e4ce3478e73a 100644
--- a/code/datums/keybinding/human.dm
+++ b/code/datums/keybinding/human.dm
@@ -20,6 +20,22 @@
H.quick_equip()
return TRUE
+/datum/keybinding/human/unique_action
+ hotkey_keys = list("Space")
+ name = "unique_action"
+ full_name = "Perform unique action"
+ description = ""
+ keybind_signal = COMSIG_KB_HUMAN_UNIQUEACTION
+
+
+/datum/keybinding/human/unique_action/down(client/user)
+ . = ..()
+ if(.)
+ return
+ var/mob/living/carbon/human/current_human = user.mob
+ current_human.do_unique_action()
+ return TRUE
+
/datum/keybinding/human/quick_equip_belt
hotkey_keys = list("ShiftE")
name = "quick_equip_belt"
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index c1fb10f75436..bb7a33846a34 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -82,7 +82,7 @@
if(!chance || prob(chance))
play(get_sound(starttime))
if(!timerid)
- timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP, SSsound_loops)
+ timerid = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP, SSsound_loops)
/datum/looping_sound/proc/play(soundfile, volume_override)
var/list/atoms_cache = output_atoms
@@ -107,7 +107,7 @@
if(start_sound)
play(start_sound, start_volume)
start_wait = start_length
- addtimer(CALLBACK(src, .proc/sound_loop), start_wait, TIMER_CLIENT_TIME, SSsound_loops)
+ addtimer(CALLBACK(src, PROC_REF(sound_loop)), start_wait, TIMER_CLIENT_TIME, SSsound_loops)
/datum/looping_sound/proc/on_stop()
if(end_sound)
diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
index f07a9f8bd47a..320bb4022222 100644
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -36,7 +36,7 @@
/datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D)
A.say("TORNADO SWEEP!", forced="plasma fist")
- dance_rotate(A, CALLBACK(GLOBAL_PROC, .proc/playsound, A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1))
+ dance_rotate(A, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1))
var/obj/effect/proc_holder/spell/aoe_turf/repulse/R = new(null)
var/list/turfs = list()
for(var/turf/T in range(1,A))
@@ -107,7 +107,7 @@
A.apply_damage(rand(50,70), BRUTE)
- addtimer(CALLBACK(src,.proc/Apotheosis_end, A), 6 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(Apotheosis_end), A), 6 SECONDS)
playsound(boomspot, 'sound/weapons/punch1.ogg', 50, TRUE, -1)
explosion(boomspot,plasma_power,plasma_power*2,plasma_power*4,ignorecap = TRUE)
plasma_power = 1 //just in case there is any clever way to cause it to happen again
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 01c7e93ba516..72d26cf74367 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -189,8 +189,8 @@
/obj/item/staff/bostaff/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/staff/bostaff/ComponentInitialize()
. = ..()
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index b002de0abc61..e9d71398bda3 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -197,7 +197,7 @@
if (T && isturf(T))
if (!D.stat)
D.emote("scream")
- D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/Paralyze, 20))
+ D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, TYPE_PROC_REF(/mob/living/carbon/human, Paralyze), 20))
log_combat(A, D, "has thrown with wrestling")
return 0
@@ -334,7 +334,7 @@
A.setDir(turn(A.dir, 90))
A.forceMove(D.loc)
- addtimer(CALLBACK(src, .proc/CheckStrikeTurf, A, T), 4)
+ addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), A, T), 4)
D.visible_message("[A] headbutts [D]!", \
"You're headbutted by [A]!", "You hear a sickening sound of flesh hitting flesh!", COMBAT_MESSAGE_RANGE, A)
diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm
index 6d5c597c1ef4..79d3a5e68a89 100644
--- a/code/datums/materials/_material.dm
+++ b/code/datums/materials/_material.dm
@@ -65,7 +65,7 @@ Simple datum which is instanced once per type and is used for every object of sa
source.name = "[name] [source.name]"
if(beauty_modifier)
- addtimer(CALLBACK(source, /datum.proc/_AddComponent, list(/datum/component/beauty, beauty_modifier * amount)), 0)
+ addtimer(CALLBACK(source, TYPE_PROC_REF(/datum, _AddComponent), list(/datum/component/beauty, beauty_modifier * amount)), 0)
if(istype(source, /obj)) //objs
on_applied_obj(source, amount, material_flags)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 1ef0c1d50f60..af7d411245e2 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -57,7 +57,7 @@
var/hasSoul = TRUE // If false, renders the character unable to sell their soul.
var/holy_role = NONE //is this person a chaplain or admin role allowed to use bibles, Any rank besides 'NONE' allows for this.
- var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
+ var/mob/living/enslaved_to //If this mind's master is another mob
var/datum/language_holder/language_holder
var/unconvertable = FALSE
var/late_joiner = FALSE
@@ -113,7 +113,7 @@
UnregisterSignal(src, COMSIG_PARENT_QDELETING)
current = new_current
if(current)
- RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/clear_current)
+ RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(clear_current))
/datum/mind/proc/clear_current(datum/source)
SIGNAL_HANDLER
@@ -155,7 +155,7 @@
transfer_antag_huds(hud_to_transfer) //inherit the antag HUD
transfer_actions(new_character)
transfer_martial_arts(new_character)
- RegisterSignal(new_character, COMSIG_MOB_DEATH, .proc/set_death_time)
+ RegisterSignal(new_character, COMSIG_MOB_DEATH, PROC_REF(set_death_time))
if(active || force_key_move)
new_character.key = key //now transfer the key to link the client to our new body
if(new_character.client)
@@ -284,7 +284,7 @@
var/datum/team/antag_team = A.get_team()
if(antag_team)
antag_team.add_member(src)
- INVOKE_ASYNC(A, /datum/antagonist.proc/on_gain)
+ INVOKE_ASYNC(A, TYPE_PROC_REF(/datum/antagonist, on_gain))
log_game("[key_name(src)] has gained antag datum [A.name]([A.type])")
return A
@@ -762,7 +762,7 @@
continue
S.charge_counter = delay
S.updateButtonIcon()
- INVOKE_ASYNC(S, /obj/effect/proc_holder/spell.proc/start_recharge)
+ INVOKE_ASYNC(S, TYPE_PROC_REF(/obj/effect/proc_holder/spell, start_recharge))
/datum/mind/proc/get_ghost(even_if_they_cant_reenter, ghosts_with_clients)
for(var/mob/dead/observer/G in (ghosts_with_clients ? GLOB.player_list : GLOB.dead_mob_list))
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index c16655ae59e3..dbaac99c4296 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -113,6 +113,14 @@
description = "I love showing off my mime pin!\n"
mood_change = 1
+/datum/mood_event/rilena_fan
+ description = "I love my RILENA merch!\n"
+ mood_change = 1
+
+/datum/mood_event/rilena_super_fan
+ description = "I love my RILENA hoodie!\n"
+ mood_change = 1
+
/datum/mood_event/goodmusic
description = "There is something soothing about this music.\n"
mood_change = 3
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index e9ce07165326..5f873cf40ff8 100644
--- a/code/datums/mood_events/needs_events.dm
+++ b/code/datums/mood_events/needs_events.dm
@@ -1,8 +1,4 @@
//nutrition
-/datum/mood_event/fat
- description = "I'm so fat...\n" //muh fatshaming
- mood_change = -6
-
/datum/mood_event/wellfed
description = "I'm stuffed!\n"
mood_change = 8
diff --git a/code/datums/movement_detector.dm b/code/datums/movement_detector.dm
index 109290a8a953..be36d62e6606 100644
--- a/code/datums/movement_detector.dm
+++ b/code/datums/movement_detector.dm
@@ -20,7 +20,7 @@
src.listener = listener
while(ismovable(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
target = target.loc
/// Stops tracking
@@ -49,7 +49,7 @@
if(tracked.loc != newturf)
var/atom/target = mover.loc
while(ismovable(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react, TRUE)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react), TRUE)
target = target.loc
listener.Invoke(tracked, mover, oldloc, direction)
diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm
index 22cc860b2cb6..032e3ab8cc8d 100644
--- a/code/datums/mutations/_mutations.dm
+++ b/code/datums/mutations/_mutations.dm
@@ -50,7 +50,7 @@
. = ..()
class = class_
if(timer)
- addtimer(CALLBACK(src, .proc/remove), timer)
+ addtimer(CALLBACK(src, PROC_REF(remove)), timer)
timed = TRUE
if(copymut && istype(copymut, /datum/mutation/human))
copy_mutation(copymut)
@@ -86,7 +86,7 @@
owner.apply_overlay(layer_used)
grant_spell() //we do checks here so nothing about hulk getting magic
if(!modified)
- addtimer(CALLBACK(src, .proc/modify, 5)) //gonna want children calling ..() to run first
+ addtimer(CALLBACK(src, PROC_REF(modify), 5)) //gonna want children calling ..() to run first
/datum/mutation/human/proc/get_visual_indicator()
return
diff --git a/code/datums/mutations/actions.dm b/code/datums/mutations/actions.dm
index 29abd2f0d10c..f2ffe7c25fd2 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -282,7 +282,7 @@
/obj/item/hardened_spike/Initialize(mapload, firedby)
. = ..()
fired_by = firedby
- addtimer(CALLBACK(src, .proc/checkembedded), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(checkembedded)), 5 SECONDS)
/obj/item/hardened_spike/proc/checkembedded()
if(ishuman(loc))
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index 08e8d59b0502..97e488fcdf5a 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -15,7 +15,7 @@
owner.Unconscious(200 * GET_MUTATION_POWER(src))
owner.Jitter(1000 * GET_MUTATION_POWER(src))
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "epilepsy", /datum/mood_event/epilepsy)
- addtimer(CALLBACK(src, .proc/jitter_less), 90)
+ addtimer(CALLBACK(src, PROC_REF(jitter_less)), 90)
/datum/mutation/human/epilepsy/proc/jitter_less()
if(owner)
@@ -376,12 +376,12 @@
/datum/mutation/human/spastic/on_acquiring()
if(..())
return
- owner.apply_status_effect(STATUS_EFFECT_SPASMS)
+ owner.apply_status_effect(/datum/status_effect/spasms)
/datum/mutation/human/spastic/on_losing()
if(..())
return
- owner.remove_status_effect(STATUS_EFFECT_SPASMS)
+ owner.remove_status_effect(/datum/status_effect/spasms)
/datum/mutation/human/extrastun
name = "Two Left Feet"
@@ -395,7 +395,7 @@
. = ..()
if(.)
return
- RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
/datum/mutation/human/extrastun/on_losing()
. = ..()
@@ -426,7 +426,7 @@
. = ..()
if(.)
return TRUE
- RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/bloody_shower)
+ RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(bloody_shower))
/datum/mutation/human/martyrdom/on_losing()
. = ..()
@@ -484,7 +484,7 @@
head.drop_organs()
qdel(head)
owner.regenerate_icons()
- RegisterSignal(owner, COMSIG_LIVING_ATTACH_LIMB, .proc/abortattachment)
+ RegisterSignal(owner, COMSIG_LIVING_ATTACH_LIMB, PROC_REF(abortattachment))
/datum/mutation/human/headless/on_losing()
. = ..()
diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm
index ab609b54cf2a..37da2f30b232 100644
--- a/code/datums/mutations/chameleon.dm
+++ b/code/datums/mutations/chameleon.dm
@@ -13,8 +13,8 @@
if(..())
return
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY
- RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move)
- RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_attack_hand)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+ RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand))
/datum/mutation/human/chameleon/on_life()
owner.alpha = max(0, owner.alpha - 25)
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index 4526682c5eaa..707327f658be 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -23,8 +23,8 @@
ADD_TRAIT(owner, TRAIT_HULK, GENETIC_MUTATION)
owner.update_body_parts()
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
- RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_attack_hand)
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand))
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity)
SIGNAL_HANDLER
@@ -36,7 +36,7 @@
if(target.attack_hulk(owner))
if(world.time > (last_scream + scream_delay))
last_scream = world.time
- INVOKE_ASYNC(src, .proc/scream_attack, source)
+ INVOKE_ASYNC(src, PROC_REF(scream_attack), source)
log_combat(source, target, "punched", "hulk powers")
source.do_attack_animation(target, ATTACK_EFFECT_SMASH)
source.changeNext_move(CLICK_CD_MELEE)
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index d9b8cb18e13e..8fe2893f4de4 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -86,7 +86,7 @@
. = ..()
if(.)
return
- RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack)
+ RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_ranged_attack))
/datum/mutation/human/laser_eyes/on_losing(mob/living/carbon/human/H)
. = ..()
@@ -110,7 +110,7 @@
LE.firer = source
LE.def_zone = ran_zone(source.zone_selected)
LE.preparePixelProjectile(target, source, mouseparams)
- INVOKE_ASYNC(LE, /obj/projectile.proc/fire)
+ INVOKE_ASYNC(LE, TYPE_PROC_REF(/obj/projectile, fire))
playsound(source, 'sound/weapons/taser2.ogg', 75, TRUE)
///Projectile type used by laser eyes
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 17014b91530f..5545c4efde53 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -22,7 +22,7 @@
/datum/mutation/human/wacky/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/wacky/on_losing(mob/living/carbon/human/owner)
if(..())
@@ -78,7 +78,7 @@
/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner)
if(..())
@@ -109,7 +109,7 @@
/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner)
if(..())
@@ -166,7 +166,7 @@
/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner)
if(..())
return
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner)
if(..())
diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm
index beee7f3537ef..0ba690c8c0c9 100644
--- a/code/datums/mutations/telekinesis.dm
+++ b/code/datums/mutations/telekinesis.dm
@@ -17,7 +17,7 @@
. = ..()
if(.)
return
- RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack)
+ RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_ranged_attack))
/datum/mutation/human/telekinesis/on_losing(mob/living/carbon/human/H)
. = ..()
@@ -32,4 +32,4 @@
/datum/mutation/human/telekinesis/proc/on_ranged_attack(datum/source, atom/target)
SIGNAL_HANDLER
- INVOKE_ASYNC(target, /atom.proc/attack_tk, owner)
+ INVOKE_ASYNC(target, TYPE_PROC_REF(/atom, attack_tk), owner)
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
index 67051686b7d2..5ffa3778edc6 100644
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -45,9 +45,9 @@
user_client = user.client
add_prog_bar_image_to_client()
- RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/on_user_delete)
- RegisterSignal(user, COMSIG_MOB_LOGOUT, .proc/clean_user_client)
- RegisterSignal(user, COMSIG_MOB_LOGIN, .proc/on_user_login)
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(on_user_delete))
+ RegisterSignal(user, COMSIG_MOB_LOGOUT, PROC_REF(clean_user_client))
+ RegisterSignal(user, COMSIG_MOB_LOGIN, PROC_REF(on_user_login))
/datum/progressbar/Destroy()
diff --git a/code/datums/proximity_monitor/fields/timestop.dm b/code/datums/proximity_monitor/fields/timestop.dm
index 06ed1f113311..40a8c1cc947b 100644
--- a/code/datums/proximity_monitor/fields/timestop.dm
+++ b/code/datums/proximity_monitor/fields/timestop.dm
@@ -33,7 +33,7 @@
if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/timestop) in G.summoner.mind.spell_list) //It would only make sense that a person's stand would also be immune.
immune[G] = TRUE
if(start)
- INVOKE_ASYNC(src, .proc/timestop)
+ INVOKE_ASYNC(src, PROC_REF(timestop))
/obj/effect/timestop/Destroy()
QDEL_NULL(chronofield)
@@ -105,8 +105,8 @@
A.move_resist = INFINITY
global_frozen_atoms[A] = src
into_the_negative_zone(A)
- RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, .proc/unfreeze_atom)
- RegisterSignal(A, COMSIG_ITEM_PICKUP, .proc/unfreeze_atom)
+ RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(unfreeze_atom))
+ RegisterSignal(A, COMSIG_ITEM_PICKUP, PROC_REF(unfreeze_atom))
return TRUE
diff --git a/code/datums/proximity_monitor/proximity_monitor.dm b/code/datums/proximity_monitor/proximity_monitor.dm
index 6bc78a39c835..7ab65204b751 100644
--- a/code/datums/proximity_monitor/proximity_monitor.dm
+++ b/code/datums/proximity_monitor/proximity_monitor.dm
@@ -9,8 +9,8 @@
var/ignore_if_not_on_turf
///The signals of the connect range component, needed to monitor the turfs in range.
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
- COMSIG_ATOM_EXITED =.proc/on_uncrossed,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ COMSIG_ATOM_EXITED = PROC_REF(on_uncrossed),
)
/datum/proximity_monitor/New(atom/_host, range, _ignore_if_not_on_turf = TRUE)
@@ -28,14 +28,14 @@
if(new_receiver)
hasprox_receiver = new_receiver
if(new_receiver != new_host)
- RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, .proc/on_host_or_receiver_del)
+ RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del))
else if(hasprox_receiver == host) //Default case
hasprox_receiver = new_host
host = new_host
- RegisterSignal(new_host, COMSIG_PARENT_QDELETING, .proc/on_host_or_receiver_del)
- var/static/list/containers_connections = list(COMSIG_MOVABLE_MOVED = .proc/on_moved)
+ RegisterSignal(new_host, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del))
+ var/static/list/containers_connections = list(COMSIG_MOVABLE_MOVED = PROC_REF(on_moved))
AddComponent(/datum/component/connect_containers, host, containers_connections)
- RegisterSignal(host, COMSIG_MOVABLE_MOVED, .proc/on_moved)
+ RegisterSignal(host, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
set_range(current_range, TRUE)
/datum/proximity_monitor/proc/on_host_or_receiver_del(datum/source)
diff --git a/code/datums/quixotejump.dm b/code/datums/quixotejump.dm
index 98827a2a2df6..edc2b0c2192e 100644
--- a/code/datums/quixotejump.dm
+++ b/code/datums/quixotejump.dm
@@ -49,4 +49,4 @@
playsound(T, dash_sound, 25, TRUE)
charges--
holder.update_action_buttons_icon()
- addtimer(CALLBACK(src, .proc/charge), charge_rate)
+ addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate)
diff --git a/code/datums/ruins/beachplanet.dm b/code/datums/ruins/beachplanet.dm
index f67112e4c52f..dae334aefae1 100644
--- a/code/datums/ruins/beachplanet.dm
+++ b/code/datums/ruins/beachplanet.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\beachruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/beachplanet
prefix = "_maps/RandomRuins/BeachRuins/"
diff --git a/code/datums/ruins/icemoon.dm b/code/datums/ruins/icemoon.dm
index afd841ff802e..cc11481b6690 100644
--- a/code/datums/ruins/icemoon.dm
+++ b/code/datums/ruins/icemoon.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\iceruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/icemoon
prefix = "_maps/RandomRuins/IceRuins/"
@@ -77,3 +77,9 @@
id = "slimelab"
description = "An underground research facility devoted to researching the uncommon slime lifeform"
suffix = "icemoon_underground_slimelab.dmm"
+
+/datum/map_template/ruin/icemoon/crashed_holemaker
+ name = "Crashed Holemaker"
+ id = "crashed_holemaker"
+ description = "Safety records for early Nanotrasen Spaceworks vessels were, and always have been, top of their class. Absolutely no multi-billion credit projects have been painstakingly erased from history. (Citation Needed)"
+ suffix = "icemoon_crashed_holemaker.dmm"
diff --git a/code/datums/ruins/jungle.dm b/code/datums/ruins/jungle.dm
index b6147faac1cd..1f58dc96da67 100644
--- a/code/datums/ruins/jungle.dm
+++ b/code/datums/ruins/jungle.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\jungleruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/jungle
prefix = "_maps/RandomRuins/JungleRuins/"
@@ -66,12 +66,6 @@
description = "An abandoned hangar containing exosuits."
suffix = "jungle_hangar.dmm"
-/datum/map_template/ruin/jungle/spider
- name = "Jungle Spiders"
- id = "spiderjungle"
- description = "A genetic experiment gone wrong."
- suffix = "jungle_spider.dmm"
-
/datum/map_template/ruin/jungle/pirate
name = "Jungle Pirates"
id = "piratejungle"
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index 13d884187ad9..0c46f33ccacb 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\lavaruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/lavaland
prefix = "_maps/RandomRuins/LavaRuins/"
diff --git a/code/datums/ruins/rockplanet.dm b/code/datums/ruins/rockplanet.dm
index 5d8e74000564..b3d9276b827e 100644
--- a/code/datums/ruins/rockplanet.dm
+++ b/code/datums/ruins/rockplanet.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\rockruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/rockplanet
prefix = "_maps/RandomRuins/RockRuins/"
@@ -12,12 +12,6 @@
description = "something dangerous"
suffix = "rockplanet_heirophant.dmm"
-/datum/map_template/ruin/rockplanet/clock
- name = "Clockcult base"
- id = "clockcultrock"
- description = "the last remnants of a clockcult base on rockplanet."
- suffix = "rockplanet_clock.dmm"
-
/datum/map_template/ruin/rockplanet/cult
name = "Cult base"
id = "rockcult"
@@ -83,7 +77,7 @@
suffix = "rockplanet_saloon.dmm"
/datum/map_template/ruin/rockplanet/harmfactory
- name = "Harm factory"
+ name = "Harm Factory"
description = "A factory made for HARM and AGONY."
id = "rockplanet_harmfactory"
suffix = "rockplanet_harmfactory.dmm"
@@ -93,3 +87,9 @@
description = "Nanotrasen's gotta lay off some personnel, and this facility hasn't been worth the effort so far"
id = "rockplanet_budgetcuts"
suffix = "rockplanet_budgetcuts.dmm"
+
+/datum/map_template/ruin/rockplanet/nomadcrash
+ name = "Nomad Crash"
+ description = "A Crashed Arrow & Axe Interceptor. A long forgotten Crew. They tried their best to survive..."
+ id = "rockplanet_nomadcrash"
+ suffix = "rockplanet_nomadcrash.dmm"
diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm
index 5aba2df7d5ce..598f027fd016 100644
--- a/code/datums/ruins/space.dm
+++ b/code/datums/ruins/space.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\spaceruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/space
prefix = "_maps/RandomRuins/SpaceRuins/"
@@ -25,12 +25,6 @@
description = "A once-bustling tradestation that handled imports and exports from nearby stations now lays eerily dormant. \
The last received message was a distress call from one of the on-board officers, but we had no success in making contact again."
-/datum/map_template/ruin/space/mech_transport
- id = "mech-transport"
- suffix = "mechtransport.dmm"
- name = "CF Corsair"
- description = "Well, when is it getting here? I have bills to pay; very well-armed clients who want their shipments as soon as possible! I don't care, just find it!"
-
/datum/map_template/ruin/space/onehalf
id = "onehalf"
suffix = "onehalf.dmm"
@@ -66,12 +60,6 @@
description = "Pause and remember-- You are unique.You are special. Every mistake, trial, and hardship has helped to sculpt your real beauty. \
Stop hating yourself and start appreciating and loving yourself!"
-/datum/map_template/ruin/space/gondoland
- id = "gondolaasteroid"
- suffix = "gondolaasteroid.dmm"
- name = "Gondoland"
- description = "Just an ordinary rock- wait, what's that thing?"
-
/datum/map_template/ruin/space/clericden
id = "clericden"
suffix = "clericden.dmm"
@@ -115,12 +103,6 @@
description = "an abandoned secure storage location. there is no power left in the batteries and the former ocupants locked it pretty tight before leaving.\
You will have to power areas to raise the bolts on the doors. look out for secrets."
-/datum/map_template/ruin/space/spacegym
- id = "Space_Gym"
- suffix = "spacegym.dmm"
- name = "Space Gym"
- description = "A gym, lost in space, where many grunts and moaning could be heard."
-
/datum/map_template/ruin/space/oldshuttle
id = "oldcode-nukeops"
suffix = "oldcodeops.dmm"
@@ -139,12 +121,6 @@
name = "Fuel Depot"
description = "An orbital refueling station with the remains of a ship lodged among the debris."
-/datum/map_template/ruin/space/nuclear_dump
- id = "radioactivedump"
- suffix = "nuclear_dump.dmm"
- name = "Nuclear Waste Dump"
- description = "An abandoned nuclear waste disposal zone, a relic of old-age spaceflight and a death sentence to any who dare enter..."
-
/datum/map_template/ruin/space/ntfacility
id = "ntfacility"
suffix = "ntfacility.dmm"
diff --git a/code/datums/ruins/wasteplanet.dm b/code/datums/ruins/wasteplanet.dm
index 38c07d74cdfc..80bf701526be 100644
--- a/code/datums/ruins/wasteplanet.dm
+++ b/code/datums/ruins/wasteplanet.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\wasteruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/wasteplanet
prefix = "_maps/RandomRuins/WasteRuins/"
diff --git a/code/datums/ruins/whitesands.dm b/code/datums/ruins/whitesands.dm
index 062a64db559a..2135036e3d97 100644
--- a/code/datums/ruins/whitesands.dm
+++ b/code/datums/ruins/whitesands.dm
@@ -1,4 +1,4 @@
-// Hey! Listen! Update \config\sandruinblacklist.txt with your new ruins!
+// Hey! Listen! Update _maps\map_catalogue.txt with your new ruins!
/datum/map_template/ruin/whitesands
prefix = "_maps/RandomRuins/SandRuins/"
@@ -18,24 +18,12 @@
suffix = "whitesands_surface_starfurycrash.dmm"
allow_duplicates = FALSE
-/datum/map_template/ruin/whitesands/golem_hijack
- name = "Crashed Golem Ship"
- id = "golemcrash"
- description = "The remains of a mysterious ship, inhabited by strange lizardpeople and golems of some sort. Who knows what happened here."
- suffix = "whitesands_surface_golemhijack.dmm"
-
/datum/map_template/ruin/whitesands/medipen_plant
name = "Abandoned Medipen Factory"
id = "medipenplant"
description = "A once prosperous autoinjector manufacturing plant."
suffix = "whitesands_surface_medipen_plant.dmm"
-/datum/map_template/ruin/whitesands/youreinsane
- name = "Lost Engine"
- id = "ws-youreinsane"
- description = "Nanotrasen would like to remind all employees that the Pi\[REDACTED\]er is not real."
- suffix = "whitesands_surface_youreinsane.dmm"
-
/datum/map_template/ruin/whitesands/assaultpodcrash
name = "Crashed Syndicate Assault Drop Pod"
id = "ws-assaultpodcrash"
@@ -60,6 +48,12 @@
description = "Some sort of survivors, brandishing old nanotrasen security gear."
suffix = "whitesands_surface_chokepoint.dmm"
+/datum/map_template/ruin/whitesands/pubbyslopcrash
+ name = "Pubby Slop Crash"
+ id = "ws-pubbyslopcrash"
+ description = "A failed attempt of the Nanotrasen nutrional replacement program"
+ suffix = "whitesands_surface_pubbyslopcrash.dmm"
+
//////////OUTSIDE SETTLEMENTS/RUINS//////////
/datum/map_template/ruin/whitesands/survivors/drugstore
name = "Abandoned Store"
@@ -71,6 +65,7 @@
name = "Hermit Saloon"
id = "ws-saloon"
description = "A western style saloon, most popular spot for the hermits to gather planetside"
+ suffix = "whitesands_surface_camp_saloon.dmm"
/datum/map_template/ruin/whitesands/survivors/combination //combined extra large ruin of several other whitesands survivor ruins (excludes the drugstore)
name = "Wasteland Survivor Village"
@@ -78,3 +73,4 @@
description = "A small encampment of nomadic survivors of the First Colony, and their descendants. By all accounts, feral and without allegance to anyone but themselves."
suffix = "whitesands_surface_camp_combination.dmm"
allow_duplicates = FALSE
+
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index c294d25dee10..35e8ff81a580 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -365,4 +365,3 @@
file_name = "nanotrasen_falcon"
name = "Falcon Dropship"
prefix = "NTSV"
-
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index becead47da9d..af8de572b991 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -22,7 +22,7 @@
/datum/status_effect/shadow_mend/on_remove()
owner.visible_message("The violet light around [owner] glows black!", "The tendrils around you cinch tightly and reap their toll...")
playsound(owner, 'sound/magic/teleport_diss.ogg', 50, TRUE)
- owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE)
+ owner.apply_status_effect(/datum/status_effect/void_price)
/datum/status_effect/void_price
@@ -254,7 +254,7 @@
owner.add_stun_absorption("bloody bastard sword", duration, 2, "doesn't even flinch as the sword's power courses through them!", "You shrug off the stun!", " glowing with a blazing red aura!")
owner.spin(duration,1)
animate(owner, color = oldcolor, time = duration, easing = EASE_IN)
- addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), duration)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, update_atom_colour)), duration)
playsound(owner, 'sound/weapons/fwoosh.ogg', 75, FALSE)
return ..()
@@ -308,7 +308,7 @@
STOP_PROCESSING(SSprocessing, src)
//Hippocratic Oath: Applied when the Rod of Asclepius is activated.
-/datum/status_effect/hippocraticOath
+/datum/status_effect/hippocratic_oath
id = "Hippocratic Oath"
status_type = STATUS_EFFECT_UNIQUE
duration = -1
@@ -318,19 +318,19 @@
var/hand
var/deathTick = 0
-/datum/status_effect/hippocraticOath/on_apply()
+/datum/status_effect/hippocratic_oath/on_apply()
//Makes the user passive, it's in their oath not to harm!
- ADD_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
+ ADD_TRAIT(owner, TRAIT_PACIFISM, "hippocratic_oath")
var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.add_hud_to(owner)
return ..()
-/datum/status_effect/hippocraticOath/on_remove()
- REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
+/datum/status_effect/hippocratic_oath/on_remove()
+ REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocratic_oath")
var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
H.remove_hud_from(owner)
-/datum/status_effect/hippocraticOath/tick()
+/datum/status_effect/hippocratic_oath/tick()
if(owner.stat == DEAD)
if(deathTick < 4)
deathTick += 1
@@ -395,7 +395,7 @@
var/mob/living/simple_animal/SM = L
SM.adjustHealth(-3.5, forced = TRUE)
-/datum/status_effect/hippocraticOath/proc/consume_owner()
+/datum/status_effect/hippocratic_oath/proc/consume_owner()
owner.visible_message("[owner]'s soul is absorbed into the rod, relieving the previous snake of its duty.")
var/mob/living/simple_animal/hostile/retaliate/poison/snake/healSnake = new(owner.loc)
var/list/chems = list(/datum/reagent/medicine/sal_acid, /datum/reagent/medicine/c2/convermol, /datum/reagent/medicine/oxandrolone)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index fdc1710c9ea7..66b69f0403e5 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -219,52 +219,6 @@
desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
icon_state = "stasis"
-//GOLEM GANG
-
-//OTHER DEBUFFS
-/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
- id = "strandling"
- status_type = STATUS_EFFECT_UNIQUE
- alert_type = /atom/movable/screen/alert/status_effect/strandling
-
-/datum/status_effect/strandling/on_apply()
- ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
- return ..()
-
-/datum/status_effect/strandling/on_remove()
- REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
- return ..()
-
-/atom/movable/screen/alert/status_effect/strandling
- name = "Choking strand"
- desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
- icon_state = "his_grace"
- alerttooltipstyle = "hisgrace"
-
-/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
- . = ..()
- if(usr != owner)
- return
- to_chat(owner, "You attempt to remove the durathread strand from around your neck.")
- if(do_after(owner, 35, null, owner))
- if(isliving(owner))
- var/mob/living/L = owner
- to_chat(owner, "You succesfuly remove the durathread strand.")
- L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
-
-
-/datum/status_effect/pacify/on_creation(mob/living/new_owner, set_duration)
- if(isnum(set_duration))
- duration = set_duration
- . = ..()
-
-/datum/status_effect/pacify/on_apply()
- ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
- return ..()
-
-/datum/status_effect/pacify/on_remove()
- REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
-
//OTHER DEBUFFS
/datum/status_effect/pacify
id = "pacify"
@@ -374,11 +328,11 @@
H.emote(pick("gasp", "gag", "choke"))
/mob/living/proc/apply_necropolis_curse(set_curse)
- var/datum/status_effect/necropolis_curse/C = has_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE)
+ var/datum/status_effect/necropolis_curse/C = has_status_effect(/datum/status_effect/necropolis_curse)
if(!set_curse)
set_curse = pick(CURSE_BLINDING, CURSE_SPAWNING, CURSE_WASTING, CURSE_GRASPING)
if(QDELETED(C))
- apply_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE, set_curse)
+ apply_status_effect(/datum/status_effect/necropolis_curse, set_curse)
else
C.apply_curse(set_curse)
C.duration += 3000 //time added by additional curses
@@ -468,7 +422,7 @@
deltimer(timerid)
-/datum/status_effect/gonbolaPacify
+/datum/status_effect/gonbola_pacify
id = "gonbolaPacify"
status_type = STATUS_EFFECT_MULTIPLE
tick_interval = -1
@@ -508,7 +462,7 @@
/datum/status_effect/trance/on_apply()
if(!iscarbon(owner))
return FALSE
- RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize)
+ RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(hypnotize))
ADD_TRAIT(owner, TRAIT_MUTE, "trance")
owner.add_client_colour(/datum/client_colour/monochrome)
owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \
@@ -536,8 +490,8 @@
return
var/mob/living/carbon/C = owner
C.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY) //clear previous hypnosis
- addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10)
- addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it
+ addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, gain_trauma), /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10)
+ addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living, Stun), 60, TRUE, TRUE), 15) //Take some time to think about it
qdel(src)
/datum/status_effect/spasms
diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm
index c52e3c731a4d..11037374b9b3 100644
--- a/code/datums/status_effects/gas.dm
+++ b/code/datums/status_effects/gas.dm
@@ -22,7 +22,7 @@
icon_state = "frozen"
/datum/status_effect/freon/on_apply()
- RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist)
+ RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist))
if(!owner.stat)
to_chat(owner, "You become frozen in a cube!")
cube = icon('icons/effects/freeze.dmi', "ice_cube")
@@ -34,7 +34,7 @@
/datum/status_effect/freon/proc/owner_resist()
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/do_resist)
+ INVOKE_ASYNC(src, PROC_REF(do_resist))
/datum/status_effect/freon/proc/do_resist()
to_chat(owner, "You start breaking out of the ice cube...")
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 4952479fa635..18480d302cdc 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -132,7 +132,7 @@
/datum/status_effect/bugged/on_apply(mob/living/new_owner, mob/living/tracker)
. = ..()
if (.)
- RegisterSignal(new_owner, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
+ RegisterSignal(new_owner, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))
/datum/status_effect/bugged/on_remove()
. = ..()
@@ -158,12 +158,12 @@
desc = "Making any sudden moves would probably be a bad idea!"
icon_state = "aimed"
-/datum/status_effect/heldup/on_apply()
- owner.apply_status_effect(STATUS_EFFECT_SURRENDER)
+/datum/status_effect/grouped/heldup/on_apply()
+ owner.apply_status_effect(/datum/status_effect/surrender, src)
return ..()
-/datum/status_effect/heldup/on_remove()
- owner.remove_status_effect(STATUS_EFFECT_SURRENDER)
+/datum/status_effect/grouped/heldup/on_remove()
+ owner.remove_status_effect(/datum/status_effect/surrender, src)
return ..()
// holdup is for the person aiming
@@ -210,9 +210,9 @@
qdel(src)
return
- RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/check_owner_in_range)
- RegisterSignal(offered_item, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), .proc/dropped_item)
- //RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, .proc/check_fake_out)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(check_owner_in_range))
+ RegisterSignal(offered_item, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(dropped_item))
+ //RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(check_fake_out))
/datum/status_effect/offering/Destroy()
for(var/i in possible_takers)
@@ -227,7 +227,7 @@
if(!G)
return
LAZYADD(possible_takers, possible_candidate)
- RegisterSignal(possible_candidate, COMSIG_MOVABLE_MOVED, .proc/check_taker_in_range)
+ RegisterSignal(possible_candidate, COMSIG_MOVABLE_MOVED, PROC_REF(check_taker_in_range))
G.setup(possible_candidate, owner, offered_item)
/// Remove the alert and signals for the specified carbon mob. Automatically removes the status effect when we lost the last taker
diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm
index 434450b9bec5..dda39c21df55 100644
--- a/code/datums/tgs_event_handler.dm
+++ b/code/datums/tgs_event_handler.dm
@@ -1,5 +1,6 @@
/datum/tgs_event_handler/impl
var/datum/timedevent/reattach_timer
+ var/datum/timedevent/delay_end_timer
/datum/tgs_event_handler/impl/HandleEvent(event_code, ...)
switch(event_code)
@@ -14,28 +15,44 @@
message_admins("TGS: Instance renamed to from [world.TgsInstanceName()] to [args[2]]")
if(TGS_EVENT_COMPILE_START)
message_admins("TGS: Deployment started, new game version incoming...")
+ SSticker.delay_end = ROUND_END_TGS
+ SSticker.admin_delay_notice = "TGS Deployment in progress, please wait..."
+ delay_end_timer = addtimer(CALLBACK(src, PROC_REF(end_delay)), 5 MINUTES, TIMER_STOPPABLE)
if(TGS_EVENT_COMPILE_CANCELLED)
message_admins("TGS: Deployment cancelled!")
+ end_delay()
if(TGS_EVENT_COMPILE_FAILURE)
message_admins("TGS: Deployment failed!")
+ end_delay()
if(TGS_EVENT_DEPLOYMENT_COMPLETE)
message_admins("TGS: Deployment complete!")
- to_chat(world, "Server updated, changes will be applied on the next round...")
+ to_chat(world, span_boldannounce("Server updated, changes will be applied on the next round..."))
+ end_delay()
if(TGS_EVENT_WATCHDOG_DETACH)
message_admins("TGS restarting...")
- reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES)
+ reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES, TIMER_STOPPABLE)
if(TGS_EVENT_WATCHDOG_REATTACH)
var/datum/tgs_version/old_version = world.TgsVersion()
var/datum/tgs_version/new_version = args[2]
if(!old_version.Equals(new_version))
- to_chat(world, "TGS updated to v[new_version.deprefixed_parameter]")
+ to_chat(world, span_boldannounce("TGS updated to v[new_version.deprefixed_parameter]"))
else
message_admins("TGS: Back online")
if(reattach_timer)
deltimer(reattach_timer)
reattach_timer = null
if(TGS_EVENT_WATCHDOG_SHUTDOWN)
- to_chat_immediate(world, "Server is shutting down!")
+ to_chat_immediate(world, span_boldannounce("Server is shutting down!"))
/datum/tgs_event_handler/impl/proc/LateOnReattach()
message_admins("Warning: TGS hasn't notified us of it coming back for a full minute! Is there a problem?")
+
+/datum/tgs_event_handler/impl/proc/end_delay()
+ if(SSticker.delay_end == ROUND_END_TGS)
+ SSticker.delay_end = ROUND_END_NOT_DELAYED
+ SSticker.admin_delay_notice = null
+ if(delay_end_timer)
+ deltimer(delay_end_timer)
+ delay_end_timer = null
+ if(SSticker.ready_for_reboot && !SSticker.delay_end) //we undelayed after standard reboot would occur
+ SSticker.standard_reboot()
diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm
index bd4f5982901d..47e45a42aa67 100644
--- a/code/datums/traits/_quirk.dm
+++ b/code/datums/traits/_quirk.dm
@@ -31,7 +31,7 @@
if(quirk_holder.client)
post_add()
else
- RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, .proc/on_quirk_holder_first_login)
+ RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, PROC_REF(on_quirk_holder_first_login))
/**
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index c3a473ecd992..52ee20e23c27 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -82,6 +82,26 @@
var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
fan.add_hud_to(H)
+/datum/quirk/fan_rilena
+ name = "RILENA Super Fan"
+ desc = "You are a major fan of the popular webseries RILENA: LMR. You get a mood boost from plushies of your favorite characters, and wearing your Xader pin."
+ value = 1
+ mob_traits = list(TRAIT_FAN_RILENA)
+ gain_text = "You are a huge fan of a certain combination webcomic and bullet hell game."
+ gain_text = "Suddenly, bullet hell games and webcomics don't seem all that interesting anymore..."
+ medical_record_text = "Patient reports being a huge fan of RILENA."
+
+/datum/quirk/fan_rilena/on_spawn()
+ var/mob/living/carbon/human/H = quirk_holder
+ var/obj/item/clothing/accessory/rilena_pin/B = new(get_turf(H))
+ var/list/slots = list (
+ "backpack" = ITEM_SLOT_BACKPACK,
+ "hands" = ITEM_SLOT_HANDS,
+ )
+ H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE)
+ var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
+ fan.add_hud_to(H)
+
/datum/quirk/fan_mime
name = "Mime Fan"
desc = "You enjoy mime antics and get a mood boost from wearing your mime pin."
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index c8e3b582511d..dccd4e87877d 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -447,8 +447,8 @@
var/dumb_thing = TRUE
/datum/quirk/social_anxiety/add()
- RegisterSignal(quirk_holder, COMSIG_MOB_EYECONTACT, .proc/eye_contact)
- RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, .proc/looks_at_floor)
+ RegisterSignal(quirk_holder, COMSIG_MOB_EYECONTACT, PROC_REF(eye_contact))
+ RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, PROC_REF(looks_at_floor))
/datum/quirk/social_anxiety/remove()
if(quirk_holder)
@@ -479,7 +479,7 @@
if(prob(85) || (istype(mind_check) && mind_check.mind))
return
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, "You make eye contact with [A]."), 3)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), quirk_holder, "You make eye contact with [A]."), 3)
/datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner)
SIGNAL_HANDLER
@@ -504,7 +504,7 @@
msg += "causing you to freeze up!"
SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "anxiety_eyecontact", /datum/mood_event/anxiety_eyecontact)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, "[msg]"), 3) // so the examine signal has time to fire and this will print after
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), quirk_holder, "[msg]"), 3) // so the examine signal has time to fire and this will print after
return COMSIG_BLOCK_EYECONTACT
/datum/mood_event/anxiety_eyecontact
@@ -634,7 +634,7 @@
mood_quirk = TRUE
/datum/quirk/bad_touch/add()
- RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT), .proc/uncomfortable_touch)
+ RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HUGGED, COMSIG_CARBON_HEADPAT), PROC_REF(uncomfortable_touch))
/datum/quirk/bad_touch/remove()
if(quirk_holder)
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 0705a2837b6e..b92a3d137dc9 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -185,8 +185,8 @@
old_hair = H.hairstyle
H.hairstyle = "Bald"
H.update_hair()
- RegisterSignal(H, COMSIG_CARBON_EQUIP_HAT, .proc/equip_hat)
- RegisterSignal(H, COMSIG_CARBON_UNEQUIP_HAT, .proc/unequip_hat)
+ RegisterSignal(H, COMSIG_CARBON_EQUIP_HAT, PROC_REF(equip_hat))
+ RegisterSignal(H, COMSIG_CARBON_UNEQUIP_HAT, PROC_REF(unequip_hat))
/datum/quirk/bald/remove()
if(quirk_holder)
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index 142bda8a9572..e3b6f98329f5 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -164,7 +164,7 @@
to_chat(M, telegraph_message)
if(telegraph_sound)
SEND_SOUND(M, sound(telegraph_sound))
- addtimer(CALLBACK(src, .proc/start), telegraph_duration)
+ addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration)
if(sound_active_outside)
sound_active_outside.output_atoms = outside_areas
@@ -196,7 +196,7 @@
to_chat(M, weather_message)
if(weather_sound)
SEND_SOUND(M, sound(weather_sound))
- addtimer(CALLBACK(src, .proc/wind_down), weather_duration)
+ addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration)
if(sound_weak_outside)
sound_weak_outside.stop()
@@ -226,7 +226,7 @@
to_chat(M, end_message)
if(end_sound)
SEND_SOUND(M, sound(end_sound))
- addtimer(CALLBACK(src, .proc/end), end_duration)
+ addtimer(CALLBACK(src, PROC_REF(end)), end_duration)
if(sound_active_outside)
sound_active_outside.stop()
diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm
index 3562dc5d6dbb..e6db7790fd67 100644
--- a/code/datums/wires/_wires.dm
+++ b/code/datums/wires/_wires.dm
@@ -37,7 +37,7 @@
CRASH("Wire holder is not of the expected type!")
src.holder = holder
- RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel)
+ RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel))
if(randomize)
randomize()
else
diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm
index 6afccd547660..8297c2ab233c 100644
--- a/code/datums/wires/airalarm.dm
+++ b/code/datums/wires/airalarm.dm
@@ -31,13 +31,13 @@
if(!A.shorted)
A.shorted = TRUE
A.update_appearance()
- addtimer(CALLBACK(A, /obj/machinery/airalarm.proc/reset, wire), 1200)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 1200)
if(WIRE_IDSCAN) // Toggle lock.
A.locked = !A.locked
if(WIRE_AI) // Disable AI control for a while.
if(!A.aidisabled)
A.aidisabled = TRUE
- addtimer(CALLBACK(A, /obj/machinery/airalarm.proc/reset, wire), 100)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 100)
if(WIRE_PANIC) // Toggle panic siphon.
if(!A.shorted)
if(A.mode == 1) // AALARM_MODE_SCRUB
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index c9e969a8ebd0..14e2d4f2ba1f 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -63,9 +63,9 @@
return
if(!A.requiresID() || A.check_access(null))
if(A.density)
- INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/open)
+ INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, open))
else
- INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/close)
+ INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, close))
if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
if(!A.locked)
A.bolt()
@@ -84,7 +84,7 @@
A.aiControlDisabled = AI_WIRE_DISABLED
else if(A.aiControlDisabled == AI_WIRE_DISABLED_HACKED)
A.aiControlDisabled = AI_WIRE_HACKED
- addtimer(CALLBACK(A, /obj/machinery/door/airlock.proc/reset_ai_wire), 1 SECONDS)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/door/airlock, reset_ai_wire)), 1 SECONDS)
if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks.
if(!A.secondsElectrified)
A.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, usr)
diff --git a/code/datums/wires/airlock_cycle.dm b/code/datums/wires/airlock_cycle.dm
index a1f942dab2e9..318eaa6e0231 100644
--- a/code/datums/wires/airlock_cycle.dm
+++ b/code/datums/wires/airlock_cycle.dm
@@ -30,13 +30,13 @@
if(!A.shorted)
A.shorted = TRUE
A.update_appearance()
- addtimer(CALLBACK(A, /obj/machinery/advanced_airlock_controller.proc/reset, wire), 1200)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/advanced_airlock_controller, reset), wire), 1200)
if(WIRE_IDSCAN) // Toggle lock.
A.locked = !A.locked
if(WIRE_AI) // Disable AI control for a while.
if(!A.aidisabled)
A.aidisabled = TRUE
- addtimer(CALLBACK(A, /obj/machinery/advanced_airlock_controller.proc/reset, wire), 100)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/advanced_airlock_controller, reset), wire), 100)
/datum/wires/advanced_airlock_controller/on_cut(wire, mend)
var/obj/machinery/advanced_airlock_controller/A = holder
diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm
index 933b9aae0222..a6a18c6d8d1c 100644
--- a/code/datums/wires/apc.dm
+++ b/code/datums/wires/apc.dm
@@ -29,14 +29,14 @@
if(WIRE_POWER1, WIRE_POWER2) // Short for a long while.
if(!A.shorted)
A.shorted = TRUE
- addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 1200)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 1200)
if(WIRE_IDSCAN) // Unlock for a little while.
A.locked = FALSE
- addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 300)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 300)
if(WIRE_AI) // Disable AI control for a very short time.
if(!A.aidisabled)
A.aidisabled = TRUE
- addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 10)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 10)
/datum/wires/apc/on_cut(index, mend)
var/obj/machinery/power/apc/A = holder
diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm
index c14c18887a82..8f9fbc16033a 100644
--- a/code/datums/wires/autolathe.dm
+++ b/code/datums/wires/autolathe.dm
@@ -27,13 +27,13 @@
switch(wire)
if(WIRE_HACK)
A.adjust_hacked(!A.hacked)
- addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
if(WIRE_SHOCK)
A.shocked = !A.shocked
- addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
if(WIRE_DISABLE)
A.disabled = !A.disabled
- addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
/datum/wires/autolathe/on_cut(wire, mend)
var/obj/machinery/autolathe/A = holder
diff --git a/code/datums/wires/shieldwallgen.dm b/code/datums/wires/shieldwallgen.dm
index 58c52970c8e5..618e9871c031 100644
--- a/code/datums/wires/shieldwallgen.dm
+++ b/code/datums/wires/shieldwallgen.dm
@@ -28,7 +28,7 @@
switch(wire)
if(WIRE_SHOCK)
generator.shocked = !generator.shocked
- addtimer(CALLBACK(generator, /obj/machinery/autolathe.proc/reset, wire), 60)
+ addtimer(CALLBACK(generator, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
if(WIRE_ACTIVATE)
generator.toggle()
if(WIRE_DISABLE)
diff --git a/code/game/MapData/shuttles/srm_glaive.dm b/code/game/MapData/shuttles/srm_glaive.dm
index 738bebeda36b..a40e9bd426c1 100644
--- a/code/game/MapData/shuttles/srm_glaive.dm
+++ b/code/game/MapData/shuttles/srm_glaive.dm
@@ -91,10 +91,6 @@
)
generate_items_inside(items_inside, src)
-/obj/structure/flora/tree/chapel/srm
- name = "Montagne's Oak"
- desc = "A sturdy oak tree imported directly from the homeworld of the Montagne who runs the ship it resides on. It is planted in soil from the same place."
-
/obj/item/book/manual/srmlore
name = "Notes on the SRM"
icon_state = "book5"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index b7d13f80d70e..35712cb768ae 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -318,7 +318,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(D.operating)
D.nextstate = opening ? FIREDOOR_OPEN : FIREDOOR_CLOSED
else if(!(D.density ^ opening) && !D.is_holding_pressure())
- INVOKE_ASYNC(D, (opening ? /obj/machinery/door/firedoor.proc/open : /obj/machinery/door/firedoor.proc/close))
+ INVOKE_ASYNC(D, (opening ? TYPE_PROC_REF(/obj/machinery/door/firedoor, open) : TYPE_PROC_REF(/obj/machinery/door/firedoor, close)))
/**
* Generate an firealarm alert for this area
@@ -435,7 +435,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
var/mob/living/silicon/SILICON = i
if(SILICON.triggerAlarm("Burglar", src, cameras, trigger))
//Cancel silicon alert after 1 minute
- addtimer(CALLBACK(SILICON, /mob/living/silicon.proc/cancelAlarm,"Burglar",src,trigger), 600)
+ addtimer(CALLBACK(SILICON, TYPE_PROC_REF(/mob/living/silicon, cancelAlarm),"Burglar",src,trigger), 600)
/**
* Trigger the fire alarm visual affects in an area
diff --git a/code/game/area/areas/outpost.dm b/code/game/area/areas/outpost.dm
index 31d9f39c7e30..f50b7655a119 100644
--- a/code/game/area/areas/outpost.dm
+++ b/code/game/area/areas/outpost.dm
@@ -22,6 +22,9 @@
icon_state = "quartoffice"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
+/area/outpost/cargo/smeltery
+ name = "Smeltery"
+ icon_state = "mining_production"
/area/outpost/crew
name = "Crew Quarters"
@@ -68,6 +71,11 @@
icon_state = "library"
sound_environment = SOUND_AREA_LARGE_SOFTFLOOR
+/area/outpost/crew/bathroom
+ name = "Bathroom"
+ icon_state = "restrooms"
+ sound_environment = SOUND_ENVIRONMENT_BATHROOM
+
/area/outpost/crew/lounge
name = "Lounge"
icon_state = "lounge"
@@ -174,6 +182,9 @@
name = "Armory"
icon_state = "armory"
+/area/outpost/security/checkpoint
+ name = "Security Checkpoint"
+ icon_state = "checkpoint1"
/area/outpost/storage
name = "Storage"
@@ -181,7 +192,6 @@
lighting_colour_tube = "#ffce93"
lighting_colour_bulb = "#ffbc6f"
-
/area/outpost/vacant_rooms
name = "Vacant Rooms"
icon_state = "vacant_commissary"
@@ -190,6 +200,18 @@
name = "Vacant Office"
icon_state = "vacant_office"
+/area/outpost/vacant_rooms/shop
+ name = "Shop"
+ icon_state = "vacant_room"
+
+//for powered outdoors non-space areas -- uses ice planet ambience
+
+/area/outpost/exterior
+ name = "Exterior"
+ icon_state = "green"
+ sound_environment = SOUND_ENVIRONMENT_CAVE
+ ambientsounds = SPOOKY
+
// this might be redundant with /area/space/nearstation. unsure; use with caution?
/area/outpost/external
name = "External"
diff --git a/code/game/area/areas/ruins/icemoon.dm b/code/game/area/areas/ruins/icemoon.dm
index 0d449f6035a8..95200f5d51b9 100644
--- a/code/game/area/areas/ruins/icemoon.dm
+++ b/code/game/area/areas/ruins/icemoon.dm
@@ -61,3 +61,8 @@
/area/ruin/powered/slimelab/cafe
name = "Slime Lab Cafe"
icon_state = "green"
+
+// Crashed Holemaker
+/area/ruin/unpowered/crashed_holemaker
+ name = "NTSV Holemaker II" // In honor of the kugelblitz shenanigan of all time
+ icon_state = "green"
diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm
index 645d98fc8f58..e9dc0b9fda0a 100644
--- a/code/game/area/areas/ruins/lavaland.dm
+++ b/code/game/area/areas/ruins/lavaland.dm
@@ -60,42 +60,6 @@
name = "Cult Altar"
ambientsounds = SPOOKY
-//Syndicate lavaland base
-
-/area/ruin/unpowered/syndicate_lava_base/engineering
- name = "Syndicate Lavaland Engineering"
-
-/area/ruin/unpowered/syndicate_lava_base/medbay
- name = "Syndicate Lavaland Medbay"
-
-/area/ruin/unpowered/syndicate_lava_base/arrivals
- name = "Syndicate Lavaland Arrivals"
-
-/area/ruin/unpowered/syndicate_lava_base/bar
- name = "Syndicate Lavaland Bar"
-
-/area/ruin/unpowered/syndicate_lava_base/main
- name = "Syndicate Lavaland Primary Hallway"
- area_flags = HIDDEN_AREA | BLOBS_ALLOWED | UNIQUE_AREA // WS edit - Fix various startup runtimes
-
-/area/ruin/unpowered/syndicate_lava_base/cargo
- name = "Syndicate Lavaland Cargo Bay"
-
-/area/ruin/unpowered/syndicate_lava_base/chemistry
- name = "Syndicate Lavaland Chemistry"
-
-/area/ruin/unpowered/syndicate_lava_base/virology
- name = "Syndicate Lavaland Virology"
-
-/area/ruin/unpowered/syndicate_lava_base/testlab
- name = "Syndicate Lavaland Experimentation Lab"
-
-/area/ruin/unpowered/syndicate_lava_base/dormitories
- name = "Syndicate Lavaland Dormitories"
-
-/area/ruin/unpowered/syndicate_lava_base/telecomms
- name = "Syndicate Lavaland Telecommunications"
-
//Xeno Nest
/area/ruin/unpowered/xenonest
diff --git a/code/game/area/areas/ruins/rockplanet.dm b/code/game/area/areas/ruins/rockplanet.dm
index cabadd3f252d..a869f0c53816 100644
--- a/code/game/area/areas/ruins/rockplanet.dm
+++ b/code/game/area/areas/ruins/rockplanet.dm
@@ -1,7 +1,17 @@
/**********************Rock Planet Areas**************************/
-/area/mine/rockplanet
+//syndicate
+/area/ruin/rockplanet/syndicate
name = "Abandoned Syndicate Mining Facility"
+ icon_state = "green"
-/area/mine/rockplanet_nanotrasen
+//budgetcuts
+/area/ruin/rockplanet/nanotrasen
name = "Abandoned Mining Facility"
+ icon_state = "green"
+
+//nomad
+/area/ruin/rockplanet/nomad
+ name = "Abandoned Crash Site"
+ always_unpowered = FALSE
+ icon_state = "red"
diff --git a/code/game/area/areas/ruins/sandplanet.dm b/code/game/area/areas/ruins/sandplanet.dm
index 5c3d509d589a..e2fb00acdc10 100644
--- a/code/game/area/areas/ruins/sandplanet.dm
+++ b/code/game/area/areas/ruins/sandplanet.dm
@@ -5,3 +5,7 @@
/area/ruin/whitesands/saloon
name = "Hermit Saloon"
icon_state = "green"
+
+/area/ruin/whitesands/pubbycrash
+ name = "Pubby Crash"
+ icon_state = "blue"
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index 769c509734bd..a249ef4ec9f7 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -56,19 +56,6 @@
name = "Derelict Outpost Docked Ship"
icon_state = "red"
-//Ruin of mech transport
-
-/area/ruin/space/has_grav/powered/mechtransport
- name = "Mech Transport"
- icon_state = "green"
-
-
-//Ruin of gas the lizard
-
-/area/ruin/space/has_grav/gasthelizard
- name = "Gas the lizard"
-
-
//Ruin of Deep Storage
/area/ruin/space/has_grav/deepstorage
@@ -187,6 +174,7 @@
/area/solar/ancientstation
name = "Charlie Station Solar Array"
icon_state = "panelsP"
+ has_gravity = STANDARD_GRAVITY
//DERELICT
@@ -366,16 +354,6 @@
name = "Mac Space Restaurant"
icon_state = "yellow"
-//NUCLEAR DUMP -- this ruin uses an area from power puzzle, for whatever reason. added new areas, for now.
-
-/area/ruin/space/has_grav/nucleardump
- name = "Hallway"
- icon_state = "hallC"
-
-/area/ruin/space/has_grav/nucleardump/supermatter
- name = "Supermatter Chamber"
- icon_state = "red"
-
//POWER PUZZLE
/area/ruin/space/has_grav/powerpuzzle
@@ -390,12 +368,6 @@
name = "Engineering Wing"
icon_state = "yellow"
-//Space Gym
-
-/area/ruin/space/has_grav/spacegym
- name = "Space Gym"
- icon_state = "firingrange"
-
//scav_mining
/area/ruin/space/has_grav/scav_mining/entrance
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 084736fb7069..350b80907f70 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -156,6 +156,10 @@
///Default Y pixel offset
var/base_pixel_y
+ ///Wanted sound when hit by a projectile
+ var/hitsound_type = PROJECTILE_HITSOUND_NON_LIVING
+ ///volume wanted for being hit
+ var/hitsound_volume = 50
/**
* Called when an atom is created in byond (built in engine proc)
*
@@ -587,6 +591,33 @@
SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, P, def_zone)
. = P.on_hit(src, 0, def_zone, piercing_hit)
+/atom/proc/bullet_hit_sfx(obj/projectile/hitting_projectile)
+ var/selected_sound = ""
+
+ if(!hitsound_volume)
+ return FALSE
+ if(!hitsound_volume)
+ return FALSE
+
+ switch(hitsound_type)
+ if(PROJECTILE_HITSOUND_FLESH)
+ selected_sound = hitting_projectile.hitsound
+ if(PROJECTILE_HITSOUND_NON_LIVING)
+ selected_sound = hitting_projectile.hitsound_non_living
+ if(PROJECTILE_HITSOUND_GLASS)
+ selected_sound = hitting_projectile.hitsound_glass
+ if(PROJECTILE_HITSOUND_STONE)
+ selected_sound = hitting_projectile.hitsound_stone
+ if(PROJECTILE_HITSOUND_METAL)
+ selected_sound = hitting_projectile.hitsound_metal
+ if(PROJECTILE_HITSOUND_WOOD)
+ selected_sound = hitting_projectile.hitsound_wood
+ if(PROJECTILE_HITSOUND_SNOW)
+ selected_sound = hitting_projectile.hitsound_snow
+
+ playsound(src, selected_sound, hitsound_volume, TRUE)
+ return TRUE
+
///Return true if we're inside the passed in atom
/atom/proc/in_contents_of(container)//can take class or object instance as argument
if(ispath(container))
@@ -780,7 +811,7 @@
*/
/atom/proc/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
if(density && !has_gravity(AM)) //thrown stuff bounces off dense stuff in no grav, unless the thrown stuff ends up inside what it hit(embedding, bola, etc...).
- addtimer(CALLBACK(src, .proc/hitby_react, AM), 2)
+ addtimer(CALLBACK(src, PROC_REF(hitby_react), AM), 2)
/**
* We have have actually hit the passed in atom
@@ -944,7 +975,7 @@
var/list/things = src_object.contents()
var/datum/progressbar/progress = new(user, things.len, src)
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(STR, /datum/component/storage.proc/handle_mass_item_insertion, things, src_object, user, progress)))
+ while (do_after(user, 10, TRUE, src, FALSE, CALLBACK(STR, TYPE_PROC_REF(/datum/component/storage, handle_mass_item_insertion), things, src_object, user, progress)))
stoplag(1)
progress.end_progress()
to_chat(user, "You dump as much of [src_object.parent]'s contents [STR.insert_preposition]to [src] as you can.")
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 7471c3514881..54ac77bb0a8c 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -167,7 +167,7 @@
if(isobj(A) || ismob(A))
if(A.layer > highest.layer)
highest = A
- INVOKE_ASYNC(src, .proc/SpinAnimation, 5, 2)
+ INVOKE_ASYNC(src, PROC_REF(SpinAnimation), 5, 2)
throw_impact(highest)
return TRUE
diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm
index a690a9317670..fe95ea3c5988 100644
--- a/code/game/gamemodes/clown_ops/clown_weapons.dm
+++ b/code/game/gamemodes/clown_ops/clown_weapons.dm
@@ -157,7 +157,7 @@
slipper.Slip(src, hit_atom)
var/mob/thrown_by = thrownby?.resolve()
if(thrown_by && !caught)
- addtimer(CALLBACK(src, /atom/movable.proc/throw_at, thrown_by, throw_range+2, throw_speed, null, TRUE), 1)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, throw_range+2, throw_speed, null, TRUE), 1)
else
return ..()
@@ -217,7 +217,7 @@
/obj/item/clothing/mask/fakemoustache/sticky/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
- addtimer(CALLBACK(src, .proc/unstick), unstick_time)
+ addtimer(CALLBACK(src, PROC_REF(unstick)), unstick_time)
/obj/item/clothing/mask/fakemoustache/sticky/proc/unstick()
REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT)
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index 81cd538a7e45..b8dcd669d385 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -159,10 +159,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
return
if(threatadd > 0)
create_threat(threatadd)
- threat_log += "[worldtime2text()]: [key_name(usr)] increased threat by [threatadd] threat."
+ threat_log += "[game_timestamp()]: [key_name(usr)] increased threat by [threatadd] threat."
else
spend_threat(-threatadd)
- threat_log += "[worldtime2text()]: [key_name(usr)] decreased threat by [-threatadd] threat."
+ threat_log += "[game_timestamp()]: [key_name(usr)] decreased threat by [-threatadd] threat."
else if (href_list["injectlate"])
latejoin_injection_cooldown = 0
forced_injection = TRUE
@@ -367,7 +367,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/datum/game_mode/dynamic/post_setup(report)
for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules)
rule.candidates.Cut() // The rule should not use candidates at this point as they all are null.
- addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/game_mode/dynamic, execute_roundstart_rule), rule), rule.delay)
..()
/// A simple roundstart proc used when dynamic_forced_roundstart_ruleset has rules in it.
@@ -478,7 +478,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
var/added_threat = starting_rule.scale_up(extra_rulesets_amount, threat)
if(starting_rule.pre_execute())
spend_threat(starting_rule.cost + added_threat)
- threat_log += "[worldtime2text()]: Roundstart [starting_rule.name] spent [starting_rule.cost + added_threat]. [starting_rule.scaling_cost ? "Scaled up[starting_rule.scaled_times]/3 times." : ""]"
+ threat_log += "[game_timestamp()]: Roundstart [starting_rule.name] spent [starting_rule.cost + added_threat]. [starting_rule.scaling_cost ? "Scaled up[starting_rule.scaled_times]/3 times." : ""]"
if(starting_rule.flags & HIGHLANDER_RULESET)
highlander_executed = TRUE
else if(starting_rule.flags & ONLY_RULESET)
@@ -540,7 +540,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
else if(rule.ruletype == "Midround")
midround_rules = remove_from_list(midround_rules, rule.type)
- addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_midround_latejoin_rule, rule), rule.delay)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/game_mode/dynamic, execute_midround_latejoin_rule), rule), rule.delay)
return TRUE
/// An experimental proc to allow admins to call rules on the fly or have rules call other rules.
@@ -572,7 +572,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
new_rule.trim_candidates()
if (new_rule.ready(forced))
spend_threat(new_rule.cost)
- threat_log += "[worldtime2text()]: Forced rule [new_rule.name] spent [new_rule.cost]"
+ threat_log += "[game_timestamp()]: Forced rule [new_rule.name] spent [new_rule.cost]"
if (new_rule.execute()) // This should never fail since ready() returned 1
if(new_rule.flags & HIGHLANDER_RULESET)
highlander_executed = TRUE
@@ -591,7 +591,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/datum/game_mode/dynamic/proc/execute_midround_latejoin_rule(sent_rule)
var/datum/dynamic_ruleset/rule = sent_rule
spend_threat(rule.cost)
- threat_log += "[worldtime2text()]: [rule.ruletype] [rule.name] spent [rule.cost]"
+ threat_log += "[game_timestamp()]: [rule.ruletype] [rule.name] spent [rule.cost]"
rule.pre_execute()
if (rule.execute())
log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].")
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
index 44e6a5310d17..1e6a2da4d867 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm
@@ -166,7 +166,7 @@
/// This one only handles refunding the threat, override in ruleset to clean up the rest.
/datum/dynamic_ruleset/proc/clean_up()
mode.refund_threat(cost + (scaled_times * scaling_cost))
- mode.threat_log += "[worldtime2text()]: [ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]. Failed to execute."
+ mode.threat_log += "[game_timestamp()]: [ruletype] [name] refunded [cost + (scaled_times * scaling_cost)]. Failed to execute."
/// Gets weight of the ruleset
/// Note that this decreases weight if repeatable is TRUE and repeatable_weight_decrease is higher than 0
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index 29333ce332d4..8c8fe19d0a97 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -355,7 +355,7 @@
message_admins("Starting a round of extended.")
log_game("Starting a round of extended.")
mode.spend_threat(mode.threat)
- mode.threat_log += "[worldtime2text()]: Extended ruleset set threat to 0."
+ mode.threat_log += "[game_timestamp()]: Extended ruleset set threat to 0."
return TRUE
//////////////////////////////////////////////
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 53f6f85f71b5..391ad852664f 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -110,7 +110,7 @@
query_round_game_mode.Execute()
qdel(query_round_game_mode)
if(report)
- addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h))
+ addtimer(CALLBACK(src, PROC_REF(send_intercept), 0), rand(waittime_l, waittime_h))
generate_station_goals()
gamemode_ready = TRUE
return 1
diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm
index da1db44bb251..17f6f474e5ea 100644
--- a/code/game/gamemodes/sandbox/airlock_maker.dm
+++ b/code/game/gamemodes/sandbox/airlock_maker.dm
@@ -16,7 +16,7 @@
/obj/structure/door_assembly/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/structure/door_assembly/proc/can_be_rotated(mob/user, rotation_type)
return !anchored
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index b46449a43748..1aaf853fc000 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -90,7 +90,7 @@
/datum/game_mode/traitor/post_setup()
for(var/datum/mind/traitor in pre_traitors)
var/datum/antagonist/traitor/new_antag = new antag_datum()
- addtimer(CALLBACK(traitor, /datum/mind.proc/add_antag_datum, new_antag), rand(10,100))
+ addtimer(CALLBACK(traitor, TYPE_PROC_REF(/datum/mind, add_antag_datum), new_antag), rand(10,100))
GLOB.pre_setup_antags -= traitor
if(!exchange_blue)
exchange_blue = -1 //Block latejoiners from getting exchange objectives
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index f0a1c403cfa4..4b97379ab030 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -98,13 +98,13 @@
if(target != occupant || !can_stasis)
return
playsound(src, 'sound/machines/synth_yes.ogg', 50, TRUE, frequency = rand(5120, 8800))
- target.apply_status_effect(STATUS_EFFECT_STASIS, STASIS_MACHINE_EFFECT)
+ target.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
target.ExtinguishMob()
use_power = ACTIVE_POWER_USE
/obj/machinery/sleeper/proc/thaw_them(mob/living/target)
if(IS_IN_STASIS(target))
- target.remove_status_effect(STATUS_EFFECT_STASIS, STASIS_MACHINE_EFFECT)
+ target.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
playsound(src, 'sound/machines/synth_no.ogg', 50, TRUE, frequency = rand(5120, 8800))
/obj/machinery/sleeper/process()
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index bc793eb60d82..c81a58ad73b9 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -95,6 +95,8 @@ Class Procs:
anchored = TRUE
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
+ hitsound_type = PROJECTILE_HITSOUND_METAL
+
var/machine_stat = NONE
var/use_power = IDLE_POWER_USE
//0 = dont run the auto
@@ -138,7 +140,7 @@ Class Procs:
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
. = ..()
GLOB.machines += src
- RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, .proc/power_change)
+ RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(power_change))
if(ispath(circuit, /obj/item/circuitboard))
circuit = new circuit
if(mapload || apply_default_parts)
@@ -165,7 +167,7 @@ Class Procs:
/obj/machinery/LateInitialize()
. = ..()
power_change()
- RegisterSignal(src, COMSIG_ENTER_AREA, .proc/power_change)
+ RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(power_change))
/obj/machinery/Destroy()
GLOB.machines.Remove(src)
@@ -519,7 +521,7 @@ Class Procs:
I.play_tool_sound(src, 50)
var/prev_anchored = anchored
//as long as we're the same anchored state and we're either on a floor or are anchored, toggle our anchored state
- if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user)))
+ if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, PROC_REF(unfasten_wrench_check), prev_anchored, user)))
if(!anchored && ground.is_blocked_turf(exclude_mobs = TRUE, source_atom = src))
to_chat(user, "You fail to secure [src].")
return CANT_UNFASTEN
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index eb46da7f568b..0423794a560d 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -42,4 +42,4 @@
to_chat(user, "You activate [src]. It now has [uses] uses of foam remaining.")
cooldown = world.time + cooldown_time
power_change()
- addtimer(CALLBACK(src, .proc/power_change), cooldown_time)
+ addtimer(CALLBACK(src, PROC_REF(power_change)), cooldown_time)
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index 9a3f470fe99d..67d1e1f4a07f 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -110,10 +110,6 @@
id_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR
master_tag = INCINERATOR_ATMOS_AIRLOCK_CONTROLLER
-/obj/machinery/airlock_sensor/incinerator_syndicatelava
- id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR
- master_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER
-
/obj/machinery/airlock_sensor/update_icon_state()
if(!on)
icon_state = "[base_icon_state]_off"
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index b6fb1f27f5a1..d83831f2c634 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -5,6 +5,7 @@
/obj/machinery/autolathe
name = "autolathe"
desc = "It produces items using metal and glass and maybe other materials, can take design disks."
+ icon = 'icons/obj/machines/autolathe.dmi'
icon_state = "autolathe"
density = TRUE
use_power = IDLE_POWER_USE
@@ -49,7 +50,7 @@
)
/obj/machinery/autolathe/Initialize()
- AddComponent(/datum/component/material_container,list(/datum/material/iron, /datum/material/glass, /datum/material/plastic, /datum/material/silver, /datum/material/gold, /datum/material/plasma, /datum/material/uranium, /datum/material/titanium), 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
+ AddComponent(/datum/component/material_container,list(/datum/material/iron, /datum/material/glass, /datum/material/plastic, /datum/material/silver, /datum/material/gold, /datum/material/plasma, /datum/material/uranium, /datum/material/titanium), 0, TRUE, null, null, CALLBACK(src, PROC_REF(AfterMaterialInsert)))
. = ..()
wires = new /datum/wires/autolathe(src)
@@ -251,7 +252,7 @@
use_power(power)
icon_state = "autolathe_n"
var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8
- addtimer(CALLBACK(src, .proc/make_item, power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time)
+ addtimer(CALLBACK(src, PROC_REF(make_item), power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time)
. = TRUE
else
to_chat(usr, "Not enough materials for this operation.")
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 3e04893bf8a9..1a89a2b011cc 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -181,7 +181,7 @@
device.pulsed()
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_BUTTON_PRESSED,src)
- addtimer(CALLBACK(src, /atom/.proc/update_appearance), 15)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 15)
/obj/machinery/button/door
name = "door button"
@@ -220,15 +220,6 @@
id = INCINERATOR_ATMOS_AUXVENT
req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS)
-/obj/machinery/button/door/incinerator_vent_syndicatelava_main
- name = "turbine vent control"
- id = INCINERATOR_SYNDICATELAVA_MAINVENT
- req_access = list(ACCESS_SYNDICATE)
-
-/obj/machinery/button/door/incinerator_vent_syndicatelava_aux
- name = "Combustion Chamber Vent control"
- id = INCINERATOR_SYNDICATELAVA_AUXVENT
- req_access = list(ACCESS_SYNDICATE)
/obj/machinery/button/massdriver
name = "mass driver button"
@@ -260,9 +251,6 @@
/obj/machinery/button/ignition/incinerator/atmos
id = INCINERATOR_ATMOS_IGNITER
-/obj/machinery/button/ignition/incinerator/syndicatelava
- id = INCINERATOR_SYNDICATELAVA_IGNITER
-
/obj/machinery/button/flasher
name = "flasher button"
desc = "A remote control switch for a mounted flasher."
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index faccb82395fd..c1cca432efd4 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -158,7 +158,7 @@
set_light(0)
emped = emped+1 //Increase the number of consecutive EMP's
update_appearance()
- addtimer(CALLBACK(src, .proc/post_emp_reset, emped, network), 90 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(post_emp_reset), emped, network), 90 SECONDS)
for(var/i in GLOB.player_list)
var/mob/M = i
if (M.client.eye == src)
@@ -178,7 +178,7 @@
if(can_use())
GLOB.cameranet.addCamera(src)
emped = 0 //Resets the consecutive EMP count
- addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100)
+ addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
/obj/machinery/camera/ex_act(severity, target)
if(invuln)
@@ -437,7 +437,7 @@
change_msg = "reactivates"
triggerCameraAlarm()
if(!QDELETED(src)) //We'll be doing it anyway in destroy
- addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100)
+ addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100)
if(displaymessage)
if(user)
visible_message("[user] [change_msg] [src]!")
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index fd876b2987f2..cdfb48edc2e9 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -86,7 +86,7 @@
to_chat(U, "Now tracking [target.get_visible_name()] on camera.")
- INVOKE_ASYNC(src, .proc/do_track, target, U)
+ INVOKE_ASYNC(src, PROC_REF(do_track), target, U)
/mob/living/silicon/ai/proc/do_track(mob/living/target, mob/living/silicon/ai/U)
var/cameraticks = 0
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 60c41eeeb921..c71e94a0948a 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -206,7 +206,7 @@
if(!G)
return NONE
if(clonemind.damnation_type) //Can't clone the damned.
- INVOKE_ASYNC(src, .proc/horrifyingsound)
+ INVOKE_ASYNC(src, PROC_REF(horrifyingsound))
mess = TRUE
icon_state = "pod_g"
update_appearance()
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
index 49b13bb0c2c9..bdbadf79a943 100644
--- a/code/game/machinery/computer/_computer.dm
+++ b/code/game/machinery/computer/_computer.dm
@@ -21,6 +21,8 @@
///Does this computer have a unique icon_state? Prevents the changing of icons from alternative computer construction
var/unique_icon = FALSE
+ hitsound_type = PROJECTILE_HITSOUND_GLASS
+
/obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
power_change()
diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm
index eb43515d6e47..1ca0c97d5223 100644
--- a/code/game/machinery/computer/apc_control.dm
+++ b/code/game/machinery/computer/apc_control.dm
@@ -114,7 +114,7 @@
log_game("[key_name(operator)] set the logs of [src] in [AREACOORD(src)] [should_log ? "On" : "Off"]")
if("restore-console")
restoring = TRUE
- addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9)
+ addtimer(CALLBACK(src, PROC_REF(restore_comp)), rand(3,5) * 9)
if("access-apc")
var/ref = params["ref"]
playsound(src, "terminal_type", 50, FALSE)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 94b57a2d9f57..571d5b090da9 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -773,7 +773,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
var/mob/living/L = usr
L.Stun(200, ignore_canstun = TRUE) //you can't run :^)
var/S = new /obj/singularity/academy(usr.loc)
- addtimer(CALLBACK(src, /atom/movable/proc/say, "[S] winks out, just as suddenly as it appeared."), 50)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, say), "[S] winks out, just as suddenly as it appeared."), 50)
QDEL_IN(S, 50)
else
event = null
diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm
index 5c4a62abe683..428d553ee068 100644
--- a/code/game/machinery/computer/arena.dm
+++ b/code/game/machinery/computer/arena.dm
@@ -88,7 +88,7 @@
var/list/default_arenas = flist(arena_dir)
for(var/arena_file in default_arenas)
var/simple_name = replacetext(replacetext(arena_file,arena_dir,""),".dmm","")
- INVOKE_ASYNC(src, .proc/add_new_arena_template, null, arena_dir + arena_file, simple_name)
+ INVOKE_ASYNC(src, PROC_REF(add_new_arena_template), null, arena_dir + arena_file, simple_name)
/obj/machinery/computer/arena/proc/get_landmark_turf(landmark_tag)
for(var/obj/effect/landmark/arena/L in GLOB.landmarks_list)
@@ -234,7 +234,7 @@
for(var/mob/M in all_contestants())
to_chat(M,"The gates will open in [timetext]!")
start_time = world.time + start_delay
- addtimer(CALLBACK(src,.proc/begin),start_delay)
+ addtimer(CALLBACK(src, PROC_REF(begin)),start_delay)
for(var/team in teams)
var/obj/machinery/arena_spawn/team_spawn = get_spawn(team)
var/obj/effect/countdown/arena/A = new(team_spawn)
@@ -261,9 +261,9 @@
if(D.id != arena_id)
continue
if(closed)
- INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/close)
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, close))
else
- INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/open)
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, open))
/obj/machinery/computer/arena/Topic(href, href_list)
if(..())
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 3275bb33f272..50ed20ae619e 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -270,13 +270,13 @@
/obj/machinery/computer/security/telescreen/entertainment/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_CLICK, .proc/BigClick)
+ RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick))
// Bypass clickchain to allow humans to use the telescreen from a distance
/obj/machinery/computer/security/telescreen/entertainment/proc/BigClick()
SIGNAL_HANDLER
- INVOKE_ASYNC(src, /atom.proc/interact, usr)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), usr)
/obj/machinery/computer/security/telescreen/entertainment/proc/notify(on)
if(on && icon_state == icon_state_off)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 426e393e5bb8..0fe059653d5c 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -356,7 +356,7 @@
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
say("Initiating scan...")
- addtimer(CALLBACK(src, .proc/do_scan, usr, body_only), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(do_scan), usr, body_only), 2 SECONDS)
//No locking an open scanner.
else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational)
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 589289c595db..f875defd6044 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -44,6 +44,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
ui = new(user, src, "CrewConsole")
ui.open()
+/datum/crewmonitor/ui_close(mob/user)
+ ui_sources -= user
+ return ..()
+
/datum/crewmonitor/proc/show(mob/M, source)
ui_sources[M] = source
ui_interact(M)
diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm
index 437a19136453..ffeabbdc4e0a 100644
--- a/code/game/machinery/computer/dna_console.dm
+++ b/code/game/machinery/computer/dna_console.dm
@@ -1997,7 +1997,7 @@
connected_scanner.set_linked_console(null)
connected_scanner = new_scanner
if(connected_scanner)
- RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, .proc/react_to_scanner_del)
+ RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, PROC_REF(react_to_scanner_del))
connected_scanner.set_linked_console(src)
/obj/machinery/computer/scan_consolenew/proc/react_to_scanner_del(datum/source)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 498342d62891..17c5dc2ef39c 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -472,7 +472,7 @@
var/counter = 1
while(active2.fields[text("com_[]", counter)])
counter++
- active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []
[]", authenticated, rank, station_time_timestamp(), time2text(world.realtime, "MMM DD"), "504 FS", t1)
+ active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], []
[]", authenticated, rank, station_time_timestamp(), sector_datestamp(), t1)
else if(href_list["del_c"])
if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm
index 9eba87108291..f05ab6b8dea9 100644
--- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm
+++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm
@@ -112,7 +112,7 @@
if("teleport")
if(!teleporter || !beacon)
return
- addtimer(CALLBACK(src, .proc/teleport, usr), 5)
+ addtimer(CALLBACK(src, PROC_REF(teleport), usr), 5)
return TRUE
/obj/machinery/computer/prisoner/gulag_teleporter_computer/proc/scan_machinery()
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index de05cce3ac77..2dc9a2c98bed 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -478,7 +478,7 @@ What a mess.*/
var/counter = 1
while(active2.fields[text("com_[]", counter)])
counter++
- active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []
[]", src.authenticated, src.rank, station_time_timestamp(), time2text(world.realtime, "MMM DD"), "504 FS", t1)
+ active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [], []
[]", src.authenticated, src.rank, station_time_timestamp(), sector_datestamp(shortened = TRUE), t1)
if("Delete Record (ALL)")
if(active1)
diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index 6c83c0389487..fe1d87c2c89a 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -90,7 +90,7 @@
say("Processing hub calibration to target...")
calibrating = TRUE
power_station.update_appearance()
- addtimer(CALLBACK(src, .proc/finish_calibration), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
+ addtimer(CALLBACK(src, PROC_REF(finish_calibration)), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration
. = TRUE
/obj/machinery/computer/teleporter/proc/finish_calibration()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 985a61efe01d..ac66aa4f6f26 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -213,7 +213,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17)
var/mob/living/mob_occupant = occupant
if(mob_occupant && mob_occupant.stat != DEAD)
to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.")
- addtimer(CALLBACK(src, .proc/try_despawn_occupant, mob_occupant), mob_occupant.client ? time_till_despawn * 0.1 : time_till_despawn) // If they're logged in, reduce the timer
+ addtimer(CALLBACK(src, PROC_REF(try_despawn_occupant), mob_occupant), mob_occupant.client ? time_till_despawn * 0.1 : time_till_despawn) // If they're logged in, reduce the timer
icon_state = close_state
if(close_sound)
playsound(src, close_sound, 40)
@@ -254,7 +254,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17)
despawn_occupant()
else
- addtimer(CALLBACK(src, .proc/try_despawn_occupant, mob_occupant), time_till_despawn) //try again with normal delay
+ addtimer(CALLBACK(src, PROC_REF(try_despawn_occupant), mob_occupant), time_till_despawn) //try again with normal delay
/obj/machinery/cryopod/proc/handle_objectives()
var/mob/living/mob_occupant = occupant
@@ -339,7 +339,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/retro, 17)
var/list/frozen_details = list()
frozen_details["name"] = "[mob_occupant.real_name]"
frozen_details["rank"] = announce_rank || "[mob_occupant.job]"
- frozen_details["time"] = gameTimestamp()
+ frozen_details["time"] = station_time_timestamp()
control_computer_obj.frozen_crew += list(frozen_details)
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 04fe3c750ca1..20c3d66e8585 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -294,7 +294,7 @@
glow.set_light_color(COLOR_SOFT_RED)
glow.even_cycle = !glow.even_cycle
if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up
- INVOKE_ASYNC(src, .proc/hierofunk)
+ INVOKE_ASYNC(src, PROC_REF(hierofunk))
sleep(selection.song_beat)
if(QDELETED(src))
return
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 3f62292736da..589393479ff5 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -128,7 +128,7 @@
/obj/structure/barricade/security/Initialize()
. = ..()
- addtimer(CALLBACK(src, .proc/deploy), deploy_time)
+ addtimer(CALLBACK(src, PROC_REF(deploy)), deploy_time)
/obj/structure/barricade/security/proc/deploy()
icon_state = "barrier1"
diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm
index 7fd0f3262273..7f61dde6ef79 100644
--- a/code/game/machinery/dna_scanner.dm
+++ b/code/game/machinery/dna_scanner.dm
@@ -152,7 +152,7 @@
UnregisterSignal(linked_console, COMSIG_PARENT_QDELETING)
linked_console = new_console
if(linked_console)
- RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, .proc/react_to_console_del)
+ RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, PROC_REF(react_to_console_del))
/obj/machinery/dna_scannernew/proc/react_to_console_del(datum/source)
SIGNAL_HANDLER
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 525811b23ffc..6bb5a4bab561 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -129,7 +129,7 @@
set_frequency(frequency)
if(closeOtherId != null)
- addtimer(CALLBACK(.proc/update_other_id), 5)
+ addtimer(CALLBACK(PROC_REF(update_other_id)), 5)
if(glass)
airlock_material = "glass"
if(security_level > AIRLOCK_SECURITY_METAL)
@@ -145,13 +145,13 @@
diag_hud.add_to_hud(src)
diag_hud_set_electrified()
- RegisterSignal(src, COMSIG_MACHINERY_BROKEN, .proc/on_break)
+ RegisterSignal(src, COMSIG_MACHINERY_BROKEN, PROC_REF(on_break))
update_appearance()
var/static/list/connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
- COMSIG_ATOM_EXITED = .proc/on_exited
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ COMSIG_ATOM_EXITED = PROC_REF(on_exited)
)
AddElement(/datum/element/connect_loc, connections)
@@ -322,9 +322,9 @@
return
if(density)
- INVOKE_ASYNC(src, .proc/open)
+ INVOKE_ASYNC(src, PROC_REF(open))
else
- INVOKE_ASYNC(src, .proc/close)
+ INVOKE_ASYNC(src, PROC_REF(close))
if("bolt")
if(command_value == "on" && locked)
@@ -439,7 +439,7 @@
if(cyclelinkedairlock.operating)
cyclelinkedairlock.delayed_close_requested = TRUE
else
- addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2)
+ addtimer(CALLBACK(cyclelinkedairlock, PROC_REF(close)), 2)
if(locked && allowed(user) && aac)
aac.request_from_door(src)
return
@@ -499,7 +499,7 @@
secondsBackupPowerLost = 10
if(!spawnPowerRestoreRunning)
spawnPowerRestoreRunning = TRUE
- INVOKE_ASYNC(src, .proc/handlePowerRestore)
+ INVOKE_ASYNC(src, PROC_REF(handlePowerRestore))
update_appearance()
/obj/machinery/door/airlock/proc/loseBackupPower()
@@ -507,7 +507,7 @@
secondsBackupPowerLost = 60
if(!spawnPowerRestoreRunning)
spawnPowerRestoreRunning = TRUE
- INVOKE_ASYNC(src, .proc/handlePowerRestore)
+ INVOKE_ASYNC(src, PROC_REF(handlePowerRestore))
update_appearance()
/obj/machinery/door/airlock/proc/regainBackupPower()
@@ -1139,7 +1139,7 @@
user.visible_message("[user] begins [welded ? "unwelding":"welding"] the airlock.", \
"You begin [welded ? "unwelding":"welding"] the airlock...", \
"You hear welding.")
- if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
+ if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
welded = !welded
user.visible_message("[user] [welded? "welds shut":"unwelds"] [src].", \
"You [welded ? "weld the airlock shut":"unweld the airlock"].")
@@ -1151,7 +1151,7 @@
user.visible_message("[user] begins welding the airlock.", \
"You begin repairing the airlock...", \
"You hear welding.")
- if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
+ if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user)))
obj_integrity = max_integrity
set_machine_stat(machine_stat & ~BROKEN)
user.visible_message("[user] finishes welding [src].", \
@@ -1241,7 +1241,7 @@
if(axe && !axe.wielded)
to_chat(user, "You need to be wielding \the [axe] to do that!")
return
- INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)
+ INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2)
/obj/machinery/door/airlock/open(forced=0)
@@ -1280,7 +1280,7 @@
operating = FALSE
if(delayed_close_requested)
delayed_close_requested = FALSE
- addtimer(CALLBACK(src, .proc/close), 1)
+ addtimer(CALLBACK(src, PROC_REF(close)), 1)
return TRUE
@@ -1450,7 +1450,7 @@
secondsElectrified = seconds
diag_hud_set_electrified()
if(secondsElectrified > MACHINE_NOT_ELECTRIFIED)
- INVOKE_ASYNC(src, .proc/electrified_loop)
+ INVOKE_ASYNC(src, PROC_REF(electrified_loop))
if(user)
var/message
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 92fb368bdc19..8e0ed982b501 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -83,14 +83,6 @@
req_access = list(ACCESS_SYNDICATE)
has_hatch = FALSE
-/obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior
- name = "Turbine Interior Airlock"
- id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR
-
-/obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior
- name = "Turbine Exterior Airlock"
- id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR
-
/obj/machinery/door/airlock/command/glass
opacity = FALSE
glass = TRUE
diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm
index 3fc9a30033ce..3972998da809 100644
--- a/code/game/machinery/doors/alarmlock.dm
+++ b/code/game/machinery/doors/alarmlock.dm
@@ -23,7 +23,7 @@
. = ..()
SSradio.remove_object(src, air_frequency)
air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM)
- INVOKE_ASYNC(src, .proc/open)
+ INVOKE_ASYNC(src, PROC_REF(open))
/obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal)
..()
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 7013d3f68a7a..213b15c00ced 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -92,12 +92,12 @@
for(var/obj/machinery/door/window/brigdoor/door in targets)
if(door.density)
continue
- INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/close)
+ INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, close))
for(var/obj/machinery/door/airlock/security/brig/airlock in targets)
if(airlock.density)
continue
- INVOKE_ASYNC(airlock, /obj/machinery/door/airlock/security/brig.proc/close)
+ INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock/security/brig, close))
for(var/obj/structure/closet/secure_closet/brig/C in targets)
if(C.broken)
@@ -126,12 +126,12 @@
for(var/obj/machinery/door/window/brigdoor/door in targets)
if(!door.density)
continue
- INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/open)
+ INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, open))
for(var/obj/machinery/door/airlock/security/brig/airlock in targets)
if(!airlock.density)
continue
- INVOKE_ASYNC(airlock, /obj/machinery/door/airlock/security/brig.proc/open)
+ INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock/security/brig, open))
for(var/obj/structure/closet/secure_closet/brig/C in targets)
if(C.broken)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 44b7c827daa1..8dbc880f740a 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -291,12 +291,12 @@
if (. & EMP_PROTECT_SELF)
return
if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)))
- INVOKE_ASYNC(src, .proc/open)
+ INVOKE_ASYNC(src, PROC_REF(open))
if(prob(severity*10 - 20))
if(secondsElectrified == MACHINE_NOT_ELECTRIFIED)
secondsElectrified = MACHINE_ELECTRIFIED_PERMANENT
LAZYADD(shockedby, "\[[time_stamp()]\]EM Pulse")
- addtimer(CALLBACK(src, .proc/unelectrify), 300)
+ addtimer(CALLBACK(src, PROC_REF(unelectrify)), 300)
/obj/machinery/door/proc/unelectrify()
secondsElectrified = MACHINE_NOT_ELECTRIFIED
@@ -341,7 +341,7 @@
air_update_turf(1)
update_freelook_sight()
if(autoclose)
- addtimer(CALLBACK(src, .proc/close), autoclose)
+ addtimer(CALLBACK(src, PROC_REF(close)), autoclose)
return 1
/obj/machinery/door/proc/close()
@@ -415,7 +415,7 @@
close()
/obj/machinery/door/proc/autoclose_in(wait)
- addtimer(CALLBACK(src, .proc/autoclose), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(autoclose)), wait, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE)
/obj/machinery/door/proc/requiresID()
return 1
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 69169d167f3e..a18550033d04 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -95,7 +95,7 @@
/obj/machinery/door/firedoor/power_change()
. = ..()
- INVOKE_ASYNC(src, .proc/latetoggle)
+ INVOKE_ASYNC(src, PROC_REF(latetoggle))
/obj/machinery/door/firedoor/attack_hand(mob/user)
. = ..()
@@ -332,7 +332,7 @@
. = ..()
var/static/list/loc_connections = list(
- COMSIG_ATOM_EXIT = .proc/on_exit,
+ COMSIG_ATOM_EXIT = PROC_REF(on_exit),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -435,7 +435,7 @@
update_freelook_sight()
if(!(flags_1 & ON_BORDER_1))
crush()
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 5)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5)
/obj/machinery/door/firedoor/border_only/emergency_pressure_close()
if(density)
@@ -450,14 +450,14 @@
if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull)
to_chat(M, "You pull [M.pulling] through [src] right as it closes.")
M.pulling.forceMove(T1)
- INVOKE_ASYNC(M, /atom/movable/.proc/start_pulling)
+ INVOKE_ASYNC(M, TYPE_PROC_REF(/atom/movable, start_pulling))
for(var/mob/living/M in T2)
if(M.stat == CONSCIOUS && M.pulling && M.pulling.loc == T1 && !M.pulling.anchored && M.pulling.move_resist <= M.move_force)
var/mob/living/M2 = M.pulling
if(!istype(M2) || !M2.buckled || !M2.buckled.buckle_prevents_pull)
to_chat(M, "You pull [M.pulling] through [src] right as it closes.")
M.pulling.forceMove(T2)
- INVOKE_ASYNC(M, /atom/movable/.proc/start_pulling)
+ INVOKE_ASYNC(M, TYPE_PROC_REF(/atom/movable, start_pulling))
return ..()
/obj/machinery/door/firedoor/heavy
@@ -736,14 +736,14 @@
. = ..()
var/static/list/loc_connections = list(
- COMSIG_ATOM_EXIT = .proc/on_exit,
+ COMSIG_ATOM_EXIT = PROC_REF(on_exit),
)
AddElement(/datum/element/connect_loc, loc_connections)
/obj/structure/firelock_frame/border/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/structure/firelock_frame/border/proc/can_be_rotated(mob/user, rotation_type)
if (anchored)
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 56418d523b1d..4e846c26f14a 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -90,9 +90,9 @@
/obj/machinery/door/poddoor/shuttledock/proc/check()
var/turf/T = get_step(src, checkdir)
if(!istype(T, turftype))
- INVOKE_ASYNC(src, .proc/open)
+ INVOKE_ASYNC(src, PROC_REF(open))
else
- INVOKE_ASYNC(src, .proc/close)
+ INVOKE_ASYNC(src, PROC_REF(close))
/obj/machinery/door/poddoor/incinerator_toxmix
name = "Combustion Chamber Vent"
@@ -106,13 +106,6 @@
name = "Combustion Chamber Vent"
id = INCINERATOR_ATMOS_AUXVENT
-/obj/machinery/door/poddoor/incinerator_syndicatelava_main
- name = "turbine vent"
- id = INCINERATOR_SYNDICATELAVA_MAINVENT
-
-/obj/machinery/door/poddoor/incinerator_syndicatelava_aux
- name = "Combustion Chamber Vent"
- id = INCINERATOR_SYNDICATELAVA_AUXVENT
/obj/machinery/door/poddoor/Bumped(atom/movable/AM)
if(density)
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index e10f0786489c..fa2ddefb7279 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -24,6 +24,8 @@
var/cable = 1
var/list/debris = list()
+ hitsound_type = PROJECTILE_HITSOUND_GLASS
+
/obj/machinery/door/window/Initialize(mapload, set_dir)
. = ..()
flags_1 &= ~PREVENT_CLICK_UNDER_1
@@ -40,7 +42,7 @@
debris += new /obj/item/stack/cable_coil(src, cable)
var/static/list/loc_connections = list(
- COMSIG_ATOM_EXIT = .proc/on_exit,
+ COMSIG_ATOM_EXIT = PROC_REF(on_exit),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -341,11 +343,11 @@
return
if(density)
- INVOKE_ASYNC(src, .proc/open)
+ INVOKE_ASYNC(src, PROC_REF(open))
else
- INVOKE_ASYNC(src, .proc/close)
+ INVOKE_ASYNC(src, PROC_REF(close))
if("touch")
- INVOKE_ASYNC(src, .proc/open_and_close)
+ INVOKE_ASYNC(src, PROC_REF(open_and_close))
/obj/machinery/door/window/brigdoor
name = "secure door"
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 8af3908ec531..0b538d1ce109 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -19,13 +19,13 @@
/obj/machinery/doppler_array/Initialize()
. = ..()
- RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, .proc/sense_explosion)
- RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, .proc/power_change)
+ RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion))
+ RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(power_change))
printer_ready = world.time + PRINTER_TIMEOUT
/obj/machinery/doppler_array/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,.proc/rot_message))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src, PROC_REF(rot_message)))
/datum/data/tachyon_record
name = "Log Recording"
diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
index 3b1bfbd4b351..9d190b2e1369 100644
--- a/code/game/machinery/embedded_controller/access_controller.dm
+++ b/code/game/machinery/embedded_controller/access_controller.dm
@@ -79,7 +79,7 @@
controller.cycleClose(door)
else
controller.onlyClose(door)
- addtimer(CALLBACK(src, .proc/not_busy), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(not_busy)), 2 SECONDS)
/obj/machinery/doorButtons/access_button/proc/not_busy()
busy = FALSE
@@ -207,7 +207,7 @@
goIdle(TRUE)
return
A.unbolt()
- INVOKE_ASYNC(src, .proc/do_openDoor, A)
+ INVOKE_ASYNC(src, PROC_REF(do_openDoor), A)
/obj/machinery/doorButtons/airlock_controller/proc/do_openDoor(obj/machinery/door/airlock/A)
if(A && A.open())
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm
index a4de8908abfe..c0938bc2bdb9 100644
--- a/code/game/machinery/embedded_controller/airlock_controller.dm
+++ b/code/game/machinery/embedded_controller/airlock_controller.dm
@@ -230,15 +230,6 @@
sanitize_external = TRUE
sensor_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_syndicatelava
- name = "Incinerator Access Console"
- airpump_tag = INCINERATOR_SYNDICATELAVA_DP_VENTPUMP
- exterior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR
- id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER
- interior_door_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR
- sanitize_external = TRUE
- sensor_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR
-
/obj/machinery/embedded_controller/radio/airlock_controller/Initialize(mapload)
. = ..()
if(!mapload)
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 315f2e128303..602b239bf020 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -56,10 +56,10 @@
if(program)
program.receive_user_command(href_list["command"])
- addtimer(CALLBACK(program, /datum/computer/file/embedded_program.proc/process), 5)
+ addtimer(CALLBACK(program, TYPE_PROC_REF(/datum/computer/file/embedded_program, process)), 5)
usr.set_machine(src)
- addtimer(CALLBACK(src, .proc/updateDialog), 5)
+ addtimer(CALLBACK(src, PROC_REF(updateDialog)), 5)
/obj/machinery/embedded_controller/process()
if(program)
diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm
index 3b2b414b0bf2..01f9b00e9785 100644
--- a/code/game/machinery/exp_cloner.dm
+++ b/code/game/machinery/exp_cloner.dm
@@ -232,7 +232,7 @@
playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
say("Initiating scan...")
- addtimer(CALLBACK(src, .proc/do_clone), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(do_clone)), 2 SECONDS)
//No locking an open scanner.
else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational)
diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm
deleted file mode 100644
index 28c6d3d3ee2a..000000000000
--- a/code/game/machinery/fat_sucker.dm
+++ /dev/null
@@ -1,217 +0,0 @@
-/obj/machinery/fat_sucker
- name = "lipid extractor"
- desc = "Safely and efficiently extracts excess fat from a subject."
- icon = 'icons/obj/machines/fat_sucker.dmi'
- icon_state = "fat"
-
- state_open = FALSE
- density = TRUE
- req_access = list(ACCESS_KITCHEN)
- var/processing = FALSE
- var/start_at = NUTRITION_LEVEL_WELL_FED
- var/stop_at = NUTRITION_LEVEL_STARVING
- var/free_exit = TRUE //set to false to prevent people from exiting before being completely stripped of fat
- var/bite_size = 15 //amount of nutrients we take per process
- var/nutrients //amount of nutrients we got build up
- var/nutrient_to_meat = 90 //one slab of meat gives about 52 nutrition
- var/datum/looping_sound/microwave/soundloop //100% stolen from microwaves
- var/breakout_time = 600
-
- var/next_fact = 10 //in ticks, so about 20 seconds
- var/static/list/fat_facts = list(\
- "Fats are triglycerides made up of a combination of different building blocks; glycerol and fatty acids.", \
- "Adults should get a recommended 20-35% of their energy intake from fat.", \
- "Being overweight or obese puts you at an increased risk of chronic diseases, such as cardiovascular diseases, metabolic syndrome, type 2 diabetes and some types of cancers.", \
- "Not all fats are bad. A certain amount of fat is an essential part of a healthy balanced diet. " , \
- "Saturated fat should form no more than 11% of your daily calories.", \
- "Unsaturated fat, that is monounsaturated fats, polyunsaturated fats and omega-3 fatty acids, is found in plant foods and fish." \
- )
-
-/obj/machinery/fat_sucker/Initialize()
- . = ..()
- soundloop = new(list(src), FALSE)
- update_appearance()
-
-/obj/machinery/fat_sucker/Destroy()
- QDEL_NULL(soundloop)
- return ..()
-
-/obj/machinery/fat_sucker/RefreshParts()
- ..()
- var/rating = 0
- for(var/obj/item/stock_parts/micro_laser/L in component_parts)
- rating += L.rating
- bite_size = initial(bite_size) + rating * 5
- nutrient_to_meat = initial(nutrient_to_meat) - rating * 5
-
-/obj/machinery/fat_sucker/examine(mob/user)
- . = ..()
- . += {"Alt-Click to toggle the safety hatch.
- Removing [bite_size] nutritional units per operation.
- Requires [nutrient_to_meat] nutritional units per meat slab."}
-
-/obj/machinery/fat_sucker/close_machine(mob/user)
- if(panel_open)
- to_chat(user, "You need to close the maintenance hatch first!")
- return
- ..()
- playsound(src, 'sound/machines/click.ogg', 50)
- if(occupant)
- if(!iscarbon(occupant))
- occupant.forceMove(drop_location())
- occupant = null
- return
- to_chat(occupant, "You enter [src].")
- addtimer(CALLBACK(src, .proc/start_extracting), 20, TIMER_OVERRIDE|TIMER_UNIQUE)
- update_appearance()
-
-/obj/machinery/fat_sucker/open_machine(mob/user)
- make_meat()
- playsound(src, 'sound/machines/click.ogg', 50)
- if(processing)
- stop()
- ..()
-
-/obj/machinery/fat_sucker/container_resist_act(mob/living/user)
- if(!free_exit || state_open)
- to_chat(user, "The emergency release is not responding! You start pushing against the hull!")
- user.changeNext_move(CLICK_CD_BREAKOUT)
- user.last_special = world.time + CLICK_CD_BREAKOUT
- user.visible_message("You see [user] kicking against the door of [src]!", \
- "You lean on the back of [src] and start pushing the door open... (this will take about [DisplayTimeText(breakout_time)].)", \
- "You hear a metallic creaking from [src].")
- if(do_after(user, breakout_time, target = src))
- if(!user || user.stat != CONSCIOUS || user.loc != src || state_open)
- return
- free_exit = TRUE
- user.visible_message("[user] successfully broke out of [src]!", \
- "You successfully break out of [src]!")
- open_machine()
- return
- open_machine()
-
-/obj/machinery/fat_sucker/interact(mob/user)
- if(state_open)
- close_machine()
- else if(!processing || free_exit)
- open_machine()
- else
- to_chat(user, "The safety hatch has been disabled!")
-
-/obj/machinery/fat_sucker/AltClick(mob/living/user)
- if(!user.canUseTopic(src, BE_CLOSE))
- return
- if(user == occupant)
- to_chat(user, "You can't reach the controls from inside!")
- return
- if(!(obj_flags & EMAGGED) && !allowed(user))
- to_chat(user, "You lack the required access.")
- return
- free_exit = !free_exit
- to_chat(user, "Safety hatch [free_exit ? "unlocked" : "locked"].")
-
-/obj/machinery/fat_sucker/update_overlays()
- . = ..()
-
- if(!state_open)
- if(processing)
- . += "[icon_state]_door_on"
- . += "[icon_state]_stack"
- . += "[icon_state]_smoke"
- . += "[icon_state]_green"
- else
- . += "[icon_state]_door_off"
- if(occupant)
- if(powered())
- . += "[icon_state]_stack"
- . += "[icon_state]_yellow"
- else
- . += "[icon_state]_red"
- else if(powered())
- . += "[icon_state]_red"
- if(panel_open)
- . += "[icon_state]_panel"
-
-/obj/machinery/fat_sucker/process()
- if(!processing)
- return
- if(!powered() || !occupant || !iscarbon(occupant))
- open_machine()
- return
-
- var/mob/living/carbon/C = occupant
- if(C.nutrition <= stop_at)
- open_machine()
- playsound(src, 'sound/machines/microwave/microwave-end.ogg', 100, FALSE)
- return
- C.adjust_nutrition(-bite_size)
- nutrients += bite_size
-
- if(next_fact <= 0)
- next_fact = initial(next_fact)
- say(pick(fat_facts))
- playsound(loc, 'sound/machines/chime.ogg', 30, FALSE)
- else
- next_fact--
- use_power(500)
-
-/obj/machinery/fat_sucker/proc/start_extracting()
- if(state_open || !occupant || processing || !powered())
- return
- if(iscarbon(occupant))
- var/mob/living/carbon/C = occupant
- if(C.nutrition > start_at)
- processing = TRUE
- soundloop.start()
- update_appearance()
- set_light(2, 1, "#ff0000")
- else
- say("Subject not fat enough.")
- playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
- overlays += "[icon_state]_red" //throw a red light icon over it, to show that it wont work
-
-/obj/machinery/fat_sucker/proc/stop()
- processing = FALSE
- soundloop.stop()
- set_light(0, 0)
-
-/obj/machinery/fat_sucker/proc/make_meat()
- if(occupant && iscarbon(occupant))
- var/mob/living/carbon/C = occupant
- if(C.type_of_meat)
- if(nutrients >= nutrient_to_meat * 2)
- C.put_in_hands(new /obj/item/reagent_containers/food/snacks/cookie (), TRUE)
- while(nutrients >= nutrient_to_meat)
- nutrients -= nutrient_to_meat
- new C.type_of_meat (drop_location())
- while(nutrients >= nutrient_to_meat / 3)
- nutrients -= nutrient_to_meat / 3
- new /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain (drop_location())
- nutrients = 0
-
-/obj/machinery/fat_sucker/screwdriver_act(mob/living/user, obj/item/I)
- . = TRUE
- if(..())
- return
- if(occupant)
- to_chat(user, "[src] is currently occupied!")
- return
- if(state_open)
- to_chat(user, "[src] must be closed to [panel_open ? "close" : "open"] its maintenance hatch!")
- return
- if(default_deconstruction_screwdriver(user, icon_state, icon_state, I))
- update_appearance()
- return
- return FALSE
-
-/obj/machinery/fat_sucker/crowbar_act(mob/living/user, obj/item/I)
- if(default_deconstruction_crowbar(I))
- return TRUE
-
-/obj/machinery/fat_sucker/emag_act(mob/living/user)
- if(obj_flags & EMAGGED)
- return
- start_at = 100
- stop_at = 0
- to_chat(user, "You remove the access restrictions and lower the automatic ejection threshold!")
- obj_flags |= EMAGGED
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 4bacfbbb5651..d4a59cb27c31 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -109,7 +109,7 @@
playsound(src.loc, 'sound/weapons/flash.ogg', 100, TRUE)
flick("[base_icon_state]_flash", src)
set_light_on(TRUE)
- addtimer(CALLBACK(src, .proc/flash_end), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(flash_end)), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE)
last_flash = world.time
use_power(1000)
diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm
index 82ef63c3d738..9cf4470cab5c 100644
--- a/code/game/machinery/harvester.dm
+++ b/code/game/machinery/harvester.dm
@@ -94,7 +94,7 @@
visible_message("The [name] begins warming up!")
say("Initializing harvest protocol.")
update_appearance()
- addtimer(CALLBACK(src, .proc/harvest), interval)
+ addtimer(CALLBACK(src, PROC_REF(harvest)), interval)
/obj/machinery/harvester/proc/harvest()
warming_up = FALSE
@@ -129,7 +129,7 @@
operation_order.Remove(BP)
break
use_power(5000)
- addtimer(CALLBACK(src, .proc/harvest), interval)
+ addtimer(CALLBACK(src, PROC_REF(harvest)), interval)
/obj/machinery/harvester/proc/end_harvesting()
warming_up = FALSE
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 98014077d4b0..4a31d650f9a1 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -653,7 +653,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
if(HOLORECORD_SOUND)
playsound(src,entry[2],50,TRUE)
if(HOLORECORD_DELAY)
- addtimer(CALLBACK(src,.proc/replay_entry,entry_number+1),entry[2])
+ addtimer(CALLBACK(src, PROC_REF(replay_entry),entry_number+1),entry[2])
return
if(HOLORECORD_LANGUAGE)
var/datum/language_holder/holder = replay_holo.get_language_holder()
diff --git a/code/game/machinery/hypnochair.dm b/code/game/machinery/hypnochair.dm
index 8e86447f6060..b31dd9925375 100644
--- a/code/game/machinery/hypnochair.dm
+++ b/code/game/machinery/hypnochair.dm
@@ -98,7 +98,7 @@
START_PROCESSING(SSobj, src)
start_time = world.time
update_appearance()
- timerid = addtimer(CALLBACK(src, .proc/finish_interrogation), 450, TIMER_STOPPABLE)
+ timerid = addtimer(CALLBACK(src, PROC_REF(finish_interrogation)), 450, TIMER_STOPPABLE)
/obj/machinery/hypnochair/process()
var/mob/living/carbon/C = occupant
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index a610ec5d11b8..8117ad2c251a 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -20,9 +20,6 @@
/obj/machinery/igniter/incinerator_atmos
id = INCINERATOR_ATMOS_IGNITER
-/obj/machinery/igniter/incinerator_syndicatelava
- id = INCINERATOR_SYNDICATELAVA_IGNITER
-
/obj/machinery/igniter/on
on = TRUE
icon_state = "igniter1"
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index 16d7386273d8..dc5b41ee3821 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -196,7 +196,7 @@
flick("limbgrower_fill",src)
icon_state = "limbgrower_idleon"
selected_category = params["active_tab"]
- addtimer(CALLBACK(src, .proc/build_item, consumed_reagents_list), production_speed * production_coefficient)
+ addtimer(CALLBACK(src, PROC_REF(build_item), consumed_reagents_list), production_speed * production_coefficient)
. = TRUE
return
diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm
index d6acc545da03..4dac48d6cfd4 100644
--- a/code/game/machinery/medipen_refiller.dm
+++ b/code/game/machinery/medipen_refiller.dm
@@ -60,7 +60,7 @@
if(reagents.has_reagent(allowed[P.type], 10))
busy = TRUE
add_overlay("active")
- addtimer(CALLBACK(src, .proc/refill, P, user), 20)
+ addtimer(CALLBACK(src, PROC_REF(refill), P, user), 20)
qdel(P)
return
to_chat(user, "There aren't enough reagents to finish this operation.")
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 2711ee9ee61a..c53b256b04de 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -855,7 +855,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30)
say("Breaking news from [channel]!")
alert = TRUE
update_appearance()
- addtimer(CALLBACK(src,.proc/remove_alert),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(remove_alert)),alert_delay,TIMER_UNIQUE|TIMER_OVERRIDE)
playsound(loc, 'sound/machines/twobeep_high.ogg', 75, TRUE)
else
say("Attention! Wanted issue distributed!")
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 64b7fb47edd0..75498600b007 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -120,7 +120,7 @@ DEFINE_BITFIELD(turret_flags, list(
base.layer = NOT_HIGH_OBJ_LAYER
underlays += base
if(!has_cover)
- INVOKE_ASYNC(src, .proc/popUp)
+ INVOKE_ASYNC(src, PROC_REF(popUp))
/obj/machinery/porta_turret/proc/toggle_on(set_to)
var/current = on
@@ -369,7 +369,7 @@ DEFINE_BITFIELD(turret_flags, list(
toggle_on(FALSE) //turns off the turret temporarily
update_appearance()
//6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
- addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 6 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 6 SECONDS)
//turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
/obj/machinery/porta_turret/emp_act(severity)
@@ -389,7 +389,7 @@ DEFINE_BITFIELD(turret_flags, list(
toggle_on(FALSE)
remove_control()
- addtimer(CALLBACK(src, .proc/toggle_on, TRUE), rand(60,600))
+ addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), rand(60,600))
/obj/machinery/porta_turret/take_damage(damage, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
. = ..()
@@ -398,7 +398,7 @@ DEFINE_BITFIELD(turret_flags, list(
spark_system.start()
if(on && !(turret_flags & TURRET_FLAG_SHOOT_ALL_REACT) && !(obj_flags & EMAGGED))
turret_flags |= TURRET_FLAG_SHOOT_ALL_REACT
- addtimer(CALLBACK(src, .proc/reset_attacked), 60)
+ addtimer(CALLBACK(src, PROC_REF(reset_attacked)), 60)
/obj/machinery/porta_turret/proc/reset_attacked()
turret_flags &= ~TURRET_FLAG_SHOOT_ALL_REACT
@@ -778,9 +778,9 @@ DEFINE_BITFIELD(turret_flags, list(
if(target)
setDir(get_dir(base, target))//even if you can't shoot, follow the target
shootAt(target)
- addtimer(CALLBACK(src, .proc/shootAt, target), 5)
- addtimer(CALLBACK(src, .proc/shootAt, target), 10)
- addtimer(CALLBACK(src, .proc/shootAt, target), 15)
+ addtimer(CALLBACK(src, PROC_REF(shootAt), target), 5)
+ addtimer(CALLBACK(src, PROC_REF(shootAt), target), 10)
+ addtimer(CALLBACK(src, PROC_REF(shootAt), target), 15)
return TRUE
/obj/machinery/porta_turret/ai
@@ -839,6 +839,27 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/machinery/porta_turret/ship/solgov
faction = list("playerSolgov", "turret")
+/obj/machinery/porta_turret/ship/syndicate
+ faction = list(FACTION_PLAYER_SYNDICATE, "turret")
+ icon_state = "standard_lethal"
+ base_icon_state = "standard"
+
+/obj/machinery/porta_turret/ship/syndicate/weak
+ name = "Light Laser Turret"
+ desc = "A low powered turret designed by the Gorlex Maurauders during the ICW. Effectively weaponizes mining equipment."
+ stun_projectile = /obj/projectile/beam/disabler/weak
+ lethal_projectile = /obj/projectile/beam/weak/penetrator
+ icon_state = "syndie_off"
+ base_icon_state = "syndie"
+
+/obj/machinery/porta_turret/ship/syndicate/heavy
+ name = "Heavy Laser Turret"
+ desc = "Produced by Cybersun, this turret is a duel mount of a propietary heavy laser, and crowd control taser system."
+ stun_projectile = /obj/projectile/energy/electrode
+ stun_projectile_sound = 'sound/weapons/taser.ogg'
+ lethal_projectile = /obj/projectile/beam/laser/heavylaser
+ lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
+
////////////////////////
//Turret Control Panel//
////////////////////////
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 3ca96ae5dcba..c604b3eeccf6 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -12,6 +12,8 @@
var/obj/item/charging = null
var/recharge_coeff = 1
var/using_power = FALSE //Did we put power into "charging" last process()?
+ ///Did we finish recharging the currently inserted item?
+ var/finished_recharging = FALSE
var/static/list/allowed_devices = typecacheof(list(
/obj/item/gun/energy,
@@ -47,6 +49,7 @@
charging = new_charging
if (new_charging)
START_PROCESSING(SSmachines, src)
+ finished_recharging = FALSE
use_power = ACTIVE_POWER_USE
using_power = TRUE
update_appearance()
@@ -143,6 +146,10 @@
using_power = TRUE
update_appearance()
return
+ if(!using_power && !finished_recharging) //Inserted thing is at max charge/ammo, notify those around us
+ finished_recharging = TRUE
+ playsound(src, 'sound/machines/ping.ogg', 30, TRUE)
+ say("[charging] has finished recharging!")
else
return PROCESS_KILL
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 37def4d5a9da..b548ecf73125 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -25,7 +25,7 @@
req_one_access = get_all_accesses() + get_all_centcom_access()
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -92,7 +92,7 @@
/obj/machinery/recycler/proc/on_entered(datum/source, atom/movable/AM)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/eat, AM)
+ INVOKE_ASYNC(src, PROC_REF(eat), AM)
/obj/machinery/recycler/proc/eat(atom/movable/AM0, sound=TRUE)
if(machine_stat & (BROKEN|NOPOWER))
@@ -166,7 +166,7 @@
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
safety_mode = TRUE
update_appearance()
- addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN)
+ addtimer(CALLBACK(src, PROC_REF(reboot)), SAFETY_COOLDOWN)
/obj/machinery/recycler/proc/reboot()
playsound(src, 'sound/machines/ping.ogg', 50, FALSE)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 3a03453a2ce3..ed3a35c1e228 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -298,7 +298,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
Radio.set_frequency(radio_freq)
Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq)
update_appearance()
- addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES)
if(href_list["send"] && message && to_department && priority)
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index 8e056d198ea6..c9e1d108c1e5 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -164,7 +164,7 @@
playsound(src, 'sound/machines/piston_raise.ogg', 70)
playsound(src, 'sound/machines/chime.ogg', 50)
- addtimer(CALLBACK(src, .proc/play, user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first
+ addtimer(CALLBACK(src, PROC_REF(play), user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first
return TRUE
else
var/obj/item/card/id/new_card = W
@@ -194,8 +194,8 @@
var/rolled_number = rand(0, 36)
playsound(src, 'sound/machines/roulettewheel.ogg', 50)
- addtimer(CALLBACK(src, .proc/finish_play, player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play
- addtimer(CALLBACK(src, .proc/finish_play_animation), 30)
+ addtimer(CALLBACK(src, PROC_REF(finish_play), player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play
+ addtimer(CALLBACK(src, PROC_REF(finish_play_animation)), 30)
/obj/machinery/roulette/proc/finish_play_animation()
icon_state = "idle"
@@ -269,7 +269,7 @@
var/obj/item/cash = new bundle_to_drop(drop_loc)
playsound(cash, pick(list('sound/machines/coindrop.ogg', 'sound/machines/coindrop2.ogg')), 40, TRUE)
- addtimer(CALLBACK(src, .proc/drop_cash), 3) //Recursion time
+ addtimer(CALLBACK(src, PROC_REF(drop_cash)), 3) //Recursion time
///Fills a list of bundles that should be dropped.
@@ -413,7 +413,7 @@
return
loc.visible_message("\The [src] begins to beep loudly!")
used = TRUE
- addtimer(CALLBACK(src, .proc/launch_payload), 40)
+ addtimer(CALLBACK(src, PROC_REF(launch_payload)), 40)
/obj/item/roulette_wheel_beacon/proc/launch_payload()
var/obj/structure/closet/supplypod/centcompod/toLaunch = new()
diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm
index 1b0736a2951f..afc154a0c95a 100644
--- a/code/game/machinery/scan_gate.dm
+++ b/code/game/machinery/scan_gate.dm
@@ -5,7 +5,6 @@
#define SCANGATE_GUNS "Guns"
#define SCANGATE_WANTED "Wanted"
#define SCANGATE_SPECIES "Species"
-#define SCANGATE_NUTRITION "Nutrition"
#define SCANGATE_HUMAN "human"
#define SCANGATE_LIZARD "lizard"
@@ -14,7 +13,6 @@
#define SCANGATE_MOTH "moth"
#define SCANGATE_JELLY "jelly"
#define SCANGATE_POD "pod"
-#define SCANGATE_GOLEM "golem"
#define SCANGATE_ZOMBIE "zombie"
#define SCANGATE_SPIDER "rachnid"
#define SCANGATE_IPC "ipc"
@@ -39,13 +37,12 @@
var/nanite_cloud = 1
var/detect_species = SCANGATE_HUMAN
var/reverse = FALSE //If true, signals if the scan returns false
- var/detect_nutrition = NUTRITION_LEVEL_FAT
/obj/machinery/scanner_gate/Initialize()
. = ..()
set_scanline("passive")
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -59,7 +56,7 @@
/obj/machinery/scanner_gate/proc/on_entered(datum/source, atom/movable/AM)
SIGNAL_HANDLER
- INVOKE_ASYNC(src, .proc/auto_scan, AM)
+ INVOKE_ASYNC(src, PROC_REF(auto_scan), AM)
/obj/machinery/scanner_gate/proc/auto_scan(atom/movable/AM)
if(!(machine_stat & (BROKEN|NOPOWER)) && isliving(AM))
@@ -70,7 +67,7 @@
deltimer(scanline_timer)
add_overlay(type)
if(duration)
- scanline_timer = addtimer(CALLBACK(src, .proc/set_scanline, "passive"), duration, TIMER_STOPPABLE)
+ scanline_timer = addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_STOPPABLE)
/obj/machinery/scanner_gate/attackby(obj/item/W, mob/user, params)
var/obj/item/card/id/card = W.GetID()
@@ -143,8 +140,6 @@
scan_species = /datum/species/jelly
if(SCANGATE_POD)
scan_species = /datum/species/pod
- if(SCANGATE_GOLEM)
- scan_species = /datum/species/golem
if(SCANGATE_ZOMBIE)
scan_species = /datum/species/zombie
if(SCANGATE_SPIDER)
@@ -165,13 +160,6 @@
if(istype(I, /obj/item/gun))
beep = TRUE
break
- if(SCANGATE_NUTRITION)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.nutrition <= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_STARVING)
- beep = TRUE
- if(H.nutrition >= detect_nutrition && detect_nutrition == NUTRITION_LEVEL_FAT)
- beep = TRUE
if(reverse)
beep = !beep
@@ -207,7 +195,6 @@
data["nanite_cloud"] = nanite_cloud
data["disease_threshold"] = disease_threshold
data["target_species"] = detect_species
- data["target_nutrition"] = detect_nutrition
return data
/obj/machinery/scanner_gate/ui_act(action, params)
@@ -240,19 +227,6 @@
var/new_species = params["new_species"]
detect_species = new_species
. = TRUE
- if("set_target_nutrition")
- var/new_nutrition = params["new_nutrition"]
- var/nutrition_list = list(
- "Starving",
- "Obese"
- )
- if(new_nutrition && (new_nutrition in nutrition_list))
- switch(new_nutrition)
- if("Starving")
- detect_nutrition = NUTRITION_LEVEL_STARVING
- if("Obese")
- detect_nutrition = NUTRITION_LEVEL_FAT
- . = TRUE
#undef SCANGATE_NONE
#undef SCANGATE_MINDSHIELD
@@ -261,7 +235,6 @@
#undef SCANGATE_GUNS
#undef SCANGATE_WANTED
#undef SCANGATE_SPECIES
-#undef SCANGATE_NUTRITION
#undef SCANGATE_HUMAN
#undef SCANGATE_LIZARD
@@ -270,7 +243,6 @@
#undef SCANGATE_MOTH
#undef SCANGATE_JELLY
#undef SCANGATE_POD
-#undef SCANGATE_GOLEM
#undef SCANGATE_ZOMBIE
#undef SCANGATE_SPIDER
#undef SCANGATE_IPC
diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm
index b80cca3864ff..569bfa4b6f9e 100644
--- a/code/game/machinery/sheetifier.dm
+++ b/code/game/machinery/sheetifier.dm
@@ -13,7 +13,7 @@
/obj/machinery/sheetifier/Initialize()
. = ..()
- AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials))
+ AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials)))
/obj/machinery/sheetifier/update_overlays()
. = ..()
@@ -36,7 +36,7 @@
var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing")
processing_overlay.color = last_inserted_material.color
flick_overlay_static(processing_overlay, src, 64)
- addtimer(CALLBACK(src, .proc/finish_processing), 64)
+ addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64)
/obj/machinery/sheetifier/proc/finish_processing()
busy_processing = FALSE
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 2d735deb1969..bc578a856300 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -507,7 +507,7 @@
/obj/machinery/power/shieldwallgen/atmos/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/machinery/power/shieldwallgen/atmos/proc/can_be_rotated(mob/user, rotation_type)
if (anchored)
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index b05b0a2c2a18..0ae88638d5b3 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -43,13 +43,13 @@
jackpots = rand(1, 4) //false hope
plays = rand(75, 200)
- INVOKE_ASYNC(src, .proc/toggle_reel_spin, TRUE)//The reels won't spin unless we activate them
+ INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), TRUE)//The reels won't spin unless we activate them
var/list/reel = reels[1]
for(var/i = 0, i < reel.len, i++) //Populate the reels.
randomize_reels()
- INVOKE_ASYNC(src, .proc/toggle_reel_spin, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), FALSE)
for(cointype in typesof(/obj/item/coin))
var/obj/item/coin/C = cointype
@@ -211,9 +211,9 @@
update_appearance()
updateDialog()
- var/spin_loop = addtimer(CALLBACK(src, .proc/do_spin), 2, TIMER_LOOP|TIMER_STOPPABLE)
+ var/spin_loop = addtimer(CALLBACK(src, PROC_REF(do_spin)), 2, TIMER_LOOP|TIMER_STOPPABLE)
- addtimer(CALLBACK(src, .proc/finish_spinning, spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len))
+ addtimer(CALLBACK(src, PROC_REF(finish_spinning), spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len))
//WARNING: no sanity checking for user since it's not needed and would complicate things (machine should still spin even if user is gone), be wary of this if you're changing this code.
/obj/machinery/computer/slot_machine/proc/do_spin()
diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm
index 37e079715dcd..d354e8c776e0 100644
--- a/code/game/machinery/stasis.dm
+++ b/code/game/machinery/stasis.dm
@@ -110,12 +110,12 @@
return
var/freq = rand(24750, 26550)
playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 2, frequency = freq)
- target.apply_status_effect(STATUS_EFFECT_STASIS, STASIS_MACHINE_EFFECT)
+ target.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
target.ExtinguishMob()
use_power = ACTIVE_POWER_USE
/obj/machinery/stasis/proc/thaw_them(mob/living/target)
- target.remove_status_effect(STATUS_EFFECT_STASIS, STASIS_MACHINE_EFFECT)
+ target.remove_status_effect(/datum/status_effect/grouped/stasis, STASIS_MACHINE_EFFECT)
if(target == occupant)
use_power = IDLE_POWER_USE
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 231e36282bdc..e86d4ae9f0f9 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -294,7 +294,7 @@
user,
src,
choices,
- custom_check = CALLBACK(src, .proc/check_interactable, user),
+ custom_check = CALLBACK(src, PROC_REF(check_interactable), user),
require_near = !issilicon(user),
)
@@ -409,7 +409,7 @@
else
mob_occupant.adjustFireLoss(rand(10, 16))
mob_occupant.emote("scream")
- addtimer(CALLBACK(src, .proc/cook), 50)
+ addtimer(CALLBACK(src, PROC_REF(cook)), 50)
else
uv_cycles = initial(uv_cycles)
uv = FALSE
@@ -496,7 +496,7 @@
if(locked)
visible_message("You see [user] kicking against the doors of [src]!", \
"You start kicking against the doors...")
- addtimer(CALLBACK(src, .proc/resist_open, user), 300)
+ addtimer(CALLBACK(src, PROC_REF(resist_open), user), 300)
else
open_machine()
dump_contents()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 83182bedb942..b3bd14af5a07 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -401,7 +401,7 @@
chem_splash(get_turf(src), spread_range, list(reactants), temp_boost)
// Detonate it again in one second, until it's out of juice.
- addtimer(CALLBACK(src, .proc/detonate), 10)
+ addtimer(CALLBACK(src, PROC_REF(detonate)), 10)
// If it's not a time release bomb, do normal explosion
diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm
index 66a384036c35..153035a39374 100644
--- a/code/game/machinery/teambuilder.dm
+++ b/code/game/machinery/teambuilder.dm
@@ -17,7 +17,7 @@
/obj/machinery/teambuilder/Initialize(mapload, apply_default_parts)
. = ..()
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index d3bf1657273f..96c0af2b7787 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -59,7 +59,7 @@
// Will help make emagging the console not so easy to get away with.
monitor_key_paper.add_raw_text("
£%@%(*$%&(£&?*(%&£/{}")
var/time = 100 * length(linkedServer.decryptkey)
- addtimer(CALLBACK(src, .proc/UnmagConsole), time)
+ addtimer(CALLBACK(src, PROC_REF(UnmagConsole)), time)
message = rebootmsg
else
to_chat(user, "A no server error appears on the screen.")
@@ -347,7 +347,7 @@
hacking = TRUE
screen = MSG_MON_SCREEN_HACKED
//Time it takes to bruteforce is dependant on the password length.
- addtimer(CALLBACK(src, .proc/finish_bruteforce, usr), 100*length(linkedServer.decryptkey))
+ addtimer(CALLBACK(src, PROC_REF(finish_bruteforce), usr), 100*length(linkedServer.decryptkey))
//Delete the log.
if (href_list["delete_logs"])
diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm
index 1d29e99b27f4..ce44158cdcc8 100644
--- a/code/game/machinery/telecomms/machines/broadcaster.dm
+++ b/code/game/machinery/telecomms/machines/broadcaster.dm
@@ -49,7 +49,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
if(!GLOB.message_delay)
GLOB.message_delay = TRUE
- addtimer(CALLBACK(GLOBAL_PROC, .proc/end_message_delay), 1 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(end_message_delay)), 1 SECONDS)
/* --- Do a snazzy animation! --- */
flick("broadcaster_send", src)
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index dec15ed3013b..11f3d7b34f58 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(telecomms_list)
if(prob(100/severity) && !(machine_stat & EMPED))
set_machine_stat(machine_stat | EMPED)
var/duration = (300 * 10)/severity
- addtimer(CALLBACK(src, .proc/de_emp), rand(duration - 20, duration + 20))
+ addtimer(CALLBACK(src, PROC_REF(de_emp)), rand(duration - 20, duration + 20))
/obj/machinery/telecomms/proc/de_emp()
set_machine_stat(machine_stat & ~EMPED)
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 8d449ef1c98b..da5a006de0b5 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -101,7 +101,7 @@
R.set_connected_ai(masterAI)
R.lawsync()
R.lawupdate = 1
- addtimer(CALLBACK(src, .proc/unlock_new_robot, R), 50)
+ addtimer(CALLBACK(src, PROC_REF(unlock_new_robot), R), 50)
/obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R)
playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index a437c59c9352..1d6a9e3845b8 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -160,7 +160,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
return
busy = TRUE
update_appearance()
- addtimer(CALLBACK(src, .proc/wash_cycle), 200)
+ addtimer(CALLBACK(src, PROC_REF(wash_cycle)), 200)
START_PROCESSING(SSfastprocess, src)
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index ac8920367620..728bacdb671d 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -26,8 +26,8 @@
/obj/mecha/combat/durand/Initialize()
. = ..()
shield = new /obj/durand_shield(loc, src, layer, dir)
- RegisterSignal(src, COMSIG_MECHA_ACTION_ACTIVATE, .proc/relay)
- RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, .proc/prehit)
+ RegisterSignal(src, COMSIG_MECHA_ACTION_ACTIVATE, PROC_REF(relay))
+ RegisterSignal(src, COMSIG_PROJECTILE_PREHIT, PROC_REF(prehit))
/obj/mecha/combat/durand/Destroy()
@@ -165,7 +165,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
chassis = _chassis
layer = _layer
setDir(_dir)
- RegisterSignal(src, COMSIG_MECHA_ACTION_ACTIVATE, .proc/activate)
+ RegisterSignal(src, COMSIG_MECHA_ACTION_ACTIVATE, PROC_REF(activate))
/obj/durand_shield/Destroy()
@@ -204,11 +204,11 @@ the shield is disabled by means other than the action button (like running out o
invisibility = 0
flick("shield_raise", src)
playsound(src, 'sound/mecha/mech_shield_raise.ogg', 50, FALSE)
- addtimer(CALLBACK(src, .proc/shield_icon_enable), 3)
+ addtimer(CALLBACK(src, PROC_REF(shield_icon_enable)), 3)
else
flick("shield_drop", src)
playsound(src, 'sound/mecha/mech_shield_drop.ogg', 50, FALSE)
- addtimer(CALLBACK(src, .proc/shield_icon_reset), 5)
+ addtimer(CALLBACK(src, PROC_REF(shield_icon_reset)), 5)
switching = FALSE
/obj/durand_shield/proc/shield_icon_enable()
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index c6c91e5b9a44..63d308f69558 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -99,7 +99,7 @@
/obj/item/mecha_parts/mecha_equipment/proc/start_cooldown()
set_ready_state(0)
chassis.use_power(energy_drain)
- addtimer(CALLBACK(src, .proc/set_ready_state, 1), equip_cooldown)
+ addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
if(!chassis)
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 2beaf9129ff6..1b33de31b54e 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -122,7 +122,7 @@
var/mob/M = A
if(M.mob_negates_gravity())
continue
- INVOKE_ASYNC(src, .proc/do_scatter, A, target)
+ INVOKE_ASYNC(src, PROC_REF(do_scatter), A, target)
var/turf/T = get_turf(target)
log_game("[key_name(chassis.occupant)] used a Gravitational Catapult repulse wave on [AREACOORD(T)]")
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index fe48f4ead497..b1f8d126705c 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -377,7 +377,7 @@
/obj/item/mecha_parts/mecha_equipment/cable_layer/attach()
..()
- event = chassis.events.addEvent("onMove", CALLBACK(src, .proc/layCable))
+ event = chassis.events.addEvent("onMove", CALLBACK(src, PROC_REF(layCable)))
return
/obj/item/mecha_parts/mecha_equipment/cable_layer/detach()
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index e342defadf1b..4a16a6f9b249 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -72,7 +72,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon/energy/start_cooldown()
set_ready_state(0)
chassis.use_power(energy_drain*get_shot_amount())
- addtimer(CALLBACK(src, .proc/set_ready_state, 1), equip_cooldown)
+ addtimer(CALLBACK(src, PROC_REF(set_ready_state), 1), equip_cooldown)
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser
equip_cooldown = 8
@@ -439,7 +439,7 @@
var/turf/T = get_turf(src)
message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_VERBOSEJMP(T)]")
log_game("[key_name(chassis.occupant)] fired a [src] in [AREACOORD(T)]")
- addtimer(CALLBACK(F, /obj/item/grenade/flashbang.proc/prime), det_time)
+ addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, prime)), det_time)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze
name = "\improper SOB-3 grenade launcher"
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 160b6a27ab3d..6814f0cc2e7f 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -386,7 +386,7 @@
add_part_set_to_queue(href_list["partset_to_queue"])
return update_queue_on_page()
if(href_list["process_queue"])
- INVOKE_ASYNC(src, .proc/do_process_queue)
+ INVOKE_ASYNC(src, PROC_REF(do_process_queue))
if(href_list["clear_temp"])
temp = null
if(href_list["screen"])
@@ -448,7 +448,7 @@
/obj/machinery/mecha_part_fabricator/proc/AfterMaterialInsert(item_inserted, id_inserted, amount_inserted)
var/datum/material/M = id_inserted
add_overlay("fab-load-[M.name]")
- addtimer(CALLBACK(src, /atom/proc/cut_overlay, "fab-load-[M.name]"), 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), "fab-load-[M.name]"), 10)
updateUsrDialog()
/obj/machinery/mecha_part_fabricator/attackby(obj/item/W, mob/user, params)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index fe1ca47ad4b3..d2c712d32ea8 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -458,7 +458,7 @@
for(var/mob/M in get_hearers_in_view(7,src))
if(M.client)
speech_bubble_recipients.Add(M.client)
- INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, image('icons/mob/talk.dmi', src, "machine[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30)
+ INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), image('icons/mob/talk.dmi', src, "machine[say_test(raw_message)]",MOB_LAYER+1), speech_bubble_recipients, 30)
////////////////////////////
///// Action processing ////
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 83f44f536b56..5172619ba022 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -421,7 +421,7 @@
outer_plating_amount=1
/datum/component/construction/mecha/gygax/action(datum/source, atom/used_atom, mob/user)
- return INVOKE_ASYNC(src, .proc/check_step, used_atom, user)
+ return INVOKE_ASYNC(src, PROC_REF(check_step), used_atom, user)
/datum/component/construction/mecha/gygax/custom_action(obj/item/I, mob/living/user, diff)
if(!..())
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 3aac1d0468ae..de051d5b355e 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -133,7 +133,7 @@
return
if(chassis)
chassis.emp_act(EMP_HEAVY)
- addtimer(CALLBACK(src, /obj/item/mecha_parts/mecha_tracking/proc/recharge), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_tracking, recharge)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
recharging = TRUE
/**
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index d10b2e878a61..50652434c6f6 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -167,7 +167,7 @@
occupant?.update_mouse_pointer()
if(!equipment_disabled && occupant) //prevent spamming this message with back-to-back EMPs
to_chat(occupant, "Error -- Connection to equipment control unit has been lost.")
- addtimer(CALLBACK(src, /obj/mecha/proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/mecha, restore_equipment)), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
equipment_disabled = 1
/obj/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm
index 9b7a5e65c9e5..f2028def7b45 100644
--- a/code/game/mecha/mecha_topic.dm
+++ b/code/game/mecha/mecha_topic.dm
@@ -408,7 +408,7 @@
if(href_list["repair_int_control_lost"])
occupant_message("Recalibrating coordination system...")
log_message("Recalibration of coordination system started.", LOG_MECHA)
- addtimer(CALLBACK(src, .proc/stationary_repair, loc), 100, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(stationary_repair), loc), 100, TIMER_UNIQUE)
///Repairs internal damage if the mech hasn't moved.
/obj/mecha/proc/stationary_repair(location)
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index ef47a3fa0fed..bf11c24b0d88 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -32,7 +32,7 @@
return
AI = AI_pilot
AI.apply_damage(150, BURN) //Give the AI a bit of damage from the "shock" of being suddenly shut down
- INVOKE_ASYNC(AI, /mob/living/silicon.proc/death) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair.
+ INVOKE_ASYNC(AI, TYPE_PROC_REF(/mob/living/silicon, death)) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair.
AI.forceMove(src) //Put the dead AI inside the wreckage for recovery
add_overlay(mutable_appearance('icons/obj/projectiles.dmi', "green_laser")) //Overlay for the recovery beacon
AI.controlled_mech = null
diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm
index e9b6487d9480..52a69d47cb5e 100644
--- a/code/game/objects/effects/alien_acid.dm
+++ b/code/game/objects/effects/alien_acid.dm
@@ -26,7 +26,7 @@
START_PROCESSING(SSobj, src)
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm
index 3c8340bb284b..e62b1e52f7b3 100644
--- a/code/game/objects/effects/anomalies/_anomalies.dm
+++ b/code/game/objects/effects/anomalies/_anomalies.dm
@@ -50,7 +50,7 @@
aSignal = new aSignal(src)
aSignal.code = rand(1,100)
aSignal.anomaly_type = type
- aSignal.research = rand(500,4000)
+ aSignal.research = research_value
var/frequency = rand(MIN_FREE_FREQ, MAX_FREE_FREQ)
if(ISMULTIPLE(frequency, 2))//signaller frequencies are always uneven!
diff --git a/code/game/objects/effects/anomalies/anomalies_gravity.dm b/code/game/objects/effects/anomalies/anomalies_gravity.dm
index e8bdd61dd3fc..1dea7049fc97 100644
--- a/code/game/objects/effects/anomalies/anomalies_gravity.dm
+++ b/code/game/objects/effects/anomalies/anomalies_gravity.dm
@@ -21,7 +21,7 @@
/obj/effect/anomaly/grav/Initialize(mapload, new_lifespan, drops_core)
. = ..()
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -88,7 +88,7 @@
/obj/effect/anomaly/grav/high/Initialize(mapload, new_lifespan)
. = ..()
- INVOKE_ASYNC(src, .proc/setup_grav_field)
+ INVOKE_ASYNC(src, PROC_REF(setup_grav_field))
/obj/effect/anomaly/grav/high/proc/setup_grav_field()
grav_field = new(src, effectrange, TRUE, 2)
diff --git a/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm b/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
index 1a81cecabc79..aead14f26e25 100644
--- a/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
+++ b/code/game/objects/effects/anomalies/anomalies_plasmasoul.dm
@@ -22,15 +22,6 @@
to_chat(mob, span_warning("Your blood feels thick.."))
playsound(mob, 'sound/effects/bubbles.ogg', 50)
-
- if(!COOLDOWN_FINISHED(src, pulse_secondary_cooldown))
- return
-
- COOLDOWN_START(src, pulse_secondary_cooldown, pulse_delay*5)
- var/turf/open/tile = get_turf(src)
- if(istype(tile))
- tile.atmos_spawn_air("plasma=750;TEMP=200") //free lag!
-
/obj/effect/anomaly/plasmasoul/Bumped(atom/movable/AM)
var/turf/open/spot = locate(rand(src.x-effectrange, src.x+effectrange), rand(src.y-effectrange, src.y+effectrange), src.z)
for(var/mob/living/mob in range(effectrange,src))
diff --git a/code/game/objects/effects/anomalies/anomalies_static.dm b/code/game/objects/effects/anomalies/anomalies_static.dm
index 07107cd5a332..205a8778d394 100644
--- a/code/game/objects/effects/anomalies/anomalies_static.dm
+++ b/code/game/objects/effects/anomalies/anomalies_static.dm
@@ -6,6 +6,12 @@
aSignal = /obj/item/assembly/signaler/anomaly/tvstatic
effectrange = 4
pulse_delay = 4 SECONDS
+ verb_say = "pleads"
+ verb_ask = "begs"
+ verb_exclaim = "screams"
+ verb_whisper = "whimpers"
+ verb_yell = "screams"
+ speech_span = SPAN_ITALICS
var/mob/living/carbon/stored_mob = null
/obj/effect/anomaly/tvstatic/examine(mob/user)
@@ -13,9 +19,9 @@
if(!iscarbon(user))
return
if(iscarbon(user) && !user.research_scanner) //this'll probably cause some weirdness when I start using research scanner in more places / on more items. Oh well.
- var/mob/living/carbon/bah = user
- to_chat(bah, span_userdanger("Your head aches as you stare into the [src]!"))
- bah.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 100)
+ var/mob/living/carbon/victim = user
+ to_chat(victim, span_userdanger("Your head aches as you stare into [src]!"))
+ victim.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 100)
/obj/effect/anomaly/tvstatic/anomalyEffect()
..()
@@ -29,11 +35,13 @@
COOLDOWN_START(src, pulse_cooldown, pulse_delay)
- for(var/mob/living/carbon/looking in range(effectrange, src))
- playsound(src, 'sound/effects/walkietalkie.ogg', 100)
- if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD || !looking.research_scanner && looking.stat != DEAD)
+ for(var/mob/living/carbon/human/looking in range(effectrange, src))
+ playsound(src, 'sound/effects/walkietalkie.ogg', 75)
+ if(stored_mob && looking.stat != DEAD && prob(25))
+ say_fucky_things()
+ if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD || !looking.research_scanner && looking.stat != DEAD || !HAS_TRAIT(looking, TRAIT_DEAF))
looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200)
- playsound(src, 'sound/effects/stall.ogg', 100)
+ playsound(src, 'sound/effects/stall.ogg', 50)
if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD)
if(prob(20))
var/mob/living/carbon/victim = looking
@@ -49,15 +57,55 @@
/obj/effect/anomaly/tvstatic/Bumped(atom/movable/AM)
anomalyEffect()
+/obj/effect/anomaly/tvstatic/proc/say_fucky_things()
+ switch(rand(1, 13))
+ if(1)
+ say("... Help me...")
+ if(2)
+ say("... I need to get out ...")
+ if(3)
+ say("...No hope....")
+ if(4)
+ say("....Let me loose...")
+ if(5)
+ say("...stay with me...")
+ if(6)
+ say("...I hope I live...")
+ if(7)
+ say("...please don't go...")
+ if(8)
+ say("...don't forget me...")
+ if(9)
+ say("...Are you there...?")
+ if(10)
+ say("...it hurts...")
+ if(11)
+ say("...the eyes...")
+ if(12)
+ say("...need to run...")
+ if(13)
+ say("...don't become like me...")
+ return
+
/obj/effect/anomaly/tvstatic/detonate()
- for(var/mob/living/carbon/looking in range(effectrange, src))
+ for(var/mob/living/carbon/human/looking in range(effectrange, src))
visible_message(" The static lashes out, agony filling your mind as its tendrils scrape your thoughts!")
if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD)
looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 100, 200)
playsound(src, 'sound/effects/stall.ogg', 100)
+ if(stored_mob)
+ mangle_corpse()
+ visible_message("The static sputters out [stored_mob], their body coming out in a burst of blood and gore!")
+ new /obj/effect/gibspawner/human(loc)
+ stored_mob.forceMove(get_turf(src))
+ stored_mob = null
anomalyEffect()
. = ..()
+/obj/effect/anomaly/tvstatic/proc/mangle_corpse()
+ if(!stored_mob)
+ return
+ stored_mob.adjustBruteLoss(400)
/obj/effect/anomaly/tvstatic/anomalyNeutralize()
var/turf/T = get_turf(src)
@@ -73,6 +121,11 @@
immortal = TRUE
immobile = TRUE
+/obj/effect/anomaly/tvstatic/planetary/Initialize(mapload)
+ if(prob(25))
+ stored_mob = /obj/effect/mob_spawn/human/corpse/damaged
+ . = ..()
+
/obj/effect/particle_effect/staticball
name = "static blob"
desc = "An unsettling mass of free floating static"
diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm
index 2bb45924dfdd..be2d89707882 100644
--- a/code/game/objects/effects/blessing.dm
+++ b/code/game/objects/effects/blessing.dm
@@ -16,7 +16,7 @@
I.alpha = 64
I.appearance_flags = RESET_ALPHA
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "blessing", I)
- RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport)
+ RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, PROC_REF(block_cult_teleport))
/obj/effect/blessing/Destroy()
UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT)
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index 60bdcb7c1546..e8d1aca60520 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -60,6 +60,11 @@
poster_type = /obj/structure/sign/poster/minutemen/random
icon_state = "rolled_legit"
+/obj/item/poster/random_rilena
+ name = "random rilena poster"
+ poster_type = /obj/structure/sign/poster/rilena/random
+ icon_state = "rolled_rilena"
+
// The poster sign/structure
/obj/structure/sign/poster
@@ -92,7 +97,7 @@
name = "poster - [name]"
desc = "A large piece of space-resistant printed paper. [desc]"
- addtimer(CALLBACK(src, /datum.proc/_AddComponent, list(/datum/component/beauty, 300)), 0)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, _AddComponent), list(/datum/component/beauty, 300)), 0)
/obj/structure/sign/poster/proc/randomise()
var/obj/structure/sign/poster/selected
@@ -958,13 +963,13 @@
icon_state = "poster-cmm_enlist"
/obj/structure/sign/poster/minutemen/bard
- name = "CMM BARD"
- desc = "A poster that was made by soldiers that attemps to recruit people in the BARD depecting a \"Sargent Clues\" mowing down waves and waves of xenofauna, and them exploding into blood. Somethinng tells you that service is a lot less intresting than this."
+ name = "CMM-BARD"
+ desc = "A poster made by soldiers to recruit people into the BARD, depecting a \"Sergeant Clues\" mowing down waves and waves of xenofauna, and them exploding into blood. Something tells you that service is a lot less interesting than this."
icon_state = "poster-cmm_bard"
/obj/structure/sign/poster/minutemen/gold
- name = "CMM GOLD"
- desc = "A poster listing job positions open in CMM GOLD and asking for applications, listing important but unintresting benifits like health insurance and such."
+ name = "CMM-GOLD"
+ desc = "A poster listing job positions open in the CMM GOLD and asking for applications, listing important but uninteresting benifits like health insurance and such."
icon_state = "poster-cmm_gold"
/obj/structure/sign/poster/minutemen/lunatown
@@ -1015,6 +1020,51 @@
/obj/structure/sign/poster/contraband/d_day_promo,
)
+//RILENA poster pool. There are only five of these, so try not to go overboard with the random posters, okay? Expect not to see these mapped onto ships except in rolled up form, since they're supposed to be bought in the RILENA merch crate.
+
+/obj/structure/sign/poster/rilena
+ poster_item_name = "rilena poster"
+ poster_item_desc = "A poster with a vibrant purple backing, indicating it is for the popular webseries RILENA: LMR. It comes with adhesive backing, for easy pinning to any vertical surface."
+ poster_item_icon_state = "rolled_rilena"
+
+/obj/structure/sign/poster/rilena/Initialize(mapload, obj/structure/sign/poster/new_poster_structure)
+ . = ..()
+ AddComponent(/datum/component/art/rilena, GOOD_ART)
+
+/obj/structure/sign/poster/rilena/random
+ name = "random rilena poster"
+ icon_state = "random_rilena"
+ never_random = TRUE
+ random_basetype = /obj/structure/sign/poster/rilena
+ random_type = POSTER_SUBTYPES
+
+/obj/structure/sign/poster/rilena/rilena
+ name = "RILENA"
+ desc = "A RILENA: LMR poster featuring two of the more fan favorite characters, Ri and T4L1."
+ icon_state = "poster-rilena_rilena"
+
+/obj/structure/sign/poster/rilena/ri
+ name = "Ri"
+ desc = "A RILENA: LMR poster featuring Ri on her own."
+ icon_state = "poster-rilena_ri"
+
+/obj/structure/sign/poster/rilena/tali
+ name = "T4L1"
+ desc = "A RILENA: LMR poster featuring a fan favorite miniboss, T4L1."
+ icon_state = "poster-rilena_tali"
+
+/obj/structure/sign/poster/rilena/run
+ name = "Lenelasa Me Refi"
+ desc = "A RILENA: LMR poster featuring Ri running, a core mechanic of the series."
+ icon_state = "poster-rilena_run"
+
+/obj/structure/sign/poster/rilena/timeline
+ name = "Timeline"
+ desc = "A RILENA: LMR poster split in two to represent the series' disregard for conventional timeline aspects."
+ icon_state = "poster-rilena_timeline"
+
+
+
#undef PLACE_SPEED
#undef POSTER_SUBTYPES
#undef POSTER_LIST
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index d00f3eb256a6..a0909bb0b994 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -27,11 +27,11 @@
AddComponent(/datum/component/infective, diseases_to_add)
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
- addtimer(CALLBACK(src, /datum.proc/_AddComponent, list(/datum/component/beauty, beauty)), 0)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, _AddComponent), list(/datum/component/beauty, beauty)), 0)
SSblackbox.record_feedback("tally", "station_mess_created", 1, name)
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index d1f65a592091..5610e6a19efa 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -268,7 +268,7 @@
/obj/effect/decal/cleanable/squid_ink/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/slippery, 5SECONDS, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip), 3SECONDS)
+ AddComponent(/datum/component/slippery, 5SECONDS, NO_SLIP_WHEN_WALKING, CALLBACK(src, PROC_REF(AfterSlip)), 3SECONDS)
/obj/effect/decal/cleanable/squid_ink/proc/AfterSlip(mob/living/M)
M.AddComponent(/datum/component/outline)
diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
index cfbc81a631a1..b5c6f9fe0eec 100644
--- a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
+++ b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -1092,3 +1092,17 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
/obj/effect/turf_decal/hardline_big/seven
icon_state = "hardline_big-7"
+
+//ARROW & AXE DOCKYARDS
+
+/obj/effect/turf_decal/arrowaxe_small
+ name = "small arrow & axe logo"
+
+/obj/effect/turf_decal/arrowaxe_small/left
+ icon_state = "arrowaxe-left"
+
+/obj/effect/turf_decal/arrowaxe_small/center
+ icon_state = "arrowaxe-center"
+
+/obj/effect/turf_decal/arrowaxe_small/right
+ icon_state = "arrowaxe-right"
diff --git a/code/game/objects/effects/decals/turfdecal/weather.dm b/code/game/objects/effects/decals/turfdecal/weather.dm
index d73af55ef7e9..04dcf807314a 100644
--- a/code/game/objects/effects/decals/turfdecal/weather.dm
+++ b/code/game/objects/effects/decals/turfdecal/weather.dm
@@ -2,14 +2,14 @@
name = "sandy floor"
icon_state = "sandyfloor"
-/obj/effect/turf_decal/weather/snow
- name = "snowy floor"
- icon_state = "snowyfloor"
-
-/obj/effect/turf_decal/weather/snow/corner
- name = "snow corner piece"
+/obj/effect/turf_decal/weather/snow //add a corner decal if you resprite this to look like the other sidings
+ name = "snow siding"
icon = 'icons/turf/snow.dmi'
- icon_state = "snow_corner"
+ icon_state = "snow_side"
+
+/obj/effect/turf_decal/weather/snow/surround
+ name = "surround"
+ icon_state = "snow_surround"
/obj/effect/turf_decal/weather/dirt
name = "dirt siding"
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 1093f078966d..8e2db3706ca3 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -56,7 +56,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/i in 1 to number)
if(total_effects > 20)
return
- INVOKE_ASYNC(src, .proc/generate_effect)
+ INVOKE_ASYNC(src, PROC_REF(generate_effect))
/datum/effect_system/proc/generate_effect()
if(holder)
@@ -73,7 +73,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
sleep(5)
step(E,direction)
if(!QDELETED(src))
- addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
+ addtimer(CALLBACK(src, PROC_REF(decrement_total_effect)), 20)
/datum/effect_system/proc/decrement_total_effect()
total_effects--
diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm
index f12ee1e2df72..f8ed47a9b273 100644
--- a/code/game/objects/effects/effect_system/effects_explosion.dm
+++ b/code/game/objects/effects/effect_system/effects_explosion.dm
@@ -61,4 +61,4 @@
S.start()
/datum/effect_system/explosion/smoke/start()
..()
- addtimer(CALLBACK(src, .proc/create_smoke), 5)
+ addtimer(CALLBACK(src, PROC_REF(create_smoke)), 5)
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index a19ab7781269..7fc59d075356 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -42,7 +42,7 @@
/obj/effect/particle_effect/smoke/proc/kill_smoke()
STOP_PROCESSING(SSobj, src)
- INVOKE_ASYNC(src, .proc/fade_out)
+ INVOKE_ASYNC(src, PROC_REF(fade_out))
QDEL_IN(src, 10)
/obj/effect/particle_effect/smoke/process()
@@ -64,7 +64,7 @@
if(C.smoke_delay)
return 0
C.smoke_delay++
- addtimer(CALLBACK(src, .proc/remove_smoke_delay, C), 10)
+ addtimer(CALLBACK(src, PROC_REF(remove_smoke_delay), C), 10)
return 1
/obj/effect/particle_effect/smoke/proc/remove_smoke_delay(mob/living/carbon/C)
@@ -95,7 +95,7 @@
//the smoke spreads rapidly but not instantly
for(var/obj/effect/particle_effect/smoke/SM in newsmokes)
- addtimer(CALLBACK(SM, /obj/effect/particle_effect/smoke.proc/spread_smoke), 1)
+ addtimer(CALLBACK(SM, TYPE_PROC_REF(/obj/effect/particle_effect/smoke, spread_smoke)), 1)
/datum/effect_system/smoke_spread
@@ -223,9 +223,9 @@
for(var/atom/movable/AM in T)
if(AM.type == src.type)
continue
- reagents.expose(AM, TOUCH, fraction)
+ reagents.expose(AM, SMOKE, fraction)
- reagents.expose(T, TOUCH, fraction)
+ reagents.expose(T, SMOKE, fraction)
return 1
/obj/effect/particle_effect/smoke/chem/smoke_mob(mob/living/carbon/M)
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index 751025e7b49c..e46d8d92e82a 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -8,8 +8,11 @@
CanAtmosPass = ATMOS_PASS_DENSITY
var/timeleft = 300 //Set to 0 for permanent forcefields (ugh)
-/obj/effect/forcefield/Initialize()
+/obj/effect/forcefield/Initialize(mapload, new_timeleft)
. = ..()
+ //used to change the time for forcewine
+ if(new_timeleft)
+ timeleft = new_timeleft
if(timeleft)
QDEL_IN(src, timeleft)
@@ -36,3 +39,10 @@
name = "invisible blockade"
desc = "You're gonna be here awhile."
timeleft = 600
+
+/obj/effect/forcefield/resin
+ desc = "It's rapidly decaying!"
+ name = "resin"
+ icon_state = "atmos_resin"
+ CanAtmosPass = ATMOS_PASS_NO
+ timeleft = 1
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 327f77545d8b..f880b95497c4 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -80,7 +80,7 @@
else //if on the floor, glowshroom on-floor sprite
icon_state = base_icon_state
- addtimer(CALLBACK(src, .proc/Spread), delay)
+ addtimer(CALLBACK(src, PROC_REF(Spread)), delay)
/obj/structure/glowshroom/proc/Spread()
var/turf/ownturf = get_turf(src)
@@ -127,7 +127,7 @@
shrooms_planted++ //if we failed due to generation, don't try to plant one later
if(shrooms_planted < myseed.yield) //if we didn't get all possible shrooms planted, try again later
myseed.yield -= shrooms_planted
- addtimer(CALLBACK(src, .proc/Spread), delay)
+ addtimer(CALLBACK(src, PROC_REF(Spread)), delay)
/obj/structure/glowshroom/proc/CalcDir(turf/location = loc)
var/direction = 16
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 63ff9b794ce4..c8332e1dd0cd 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -219,10 +219,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Brig Physician"
icon_state = "Brig Physician"
-/obj/effect/landmark/start/lieutenant
- name = "SolGov Representative" //WS Edit - SolGov Rep
- icon_state = "SolGov Representative" //WS Edit - SolGov Rep
-
//Department Security spawns
/obj/effect/landmark/start/depsec
@@ -344,7 +340,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/ert_spawn
- name = "Emergencyresponseteam"
+ name = "Emergency response team spawn"
icon_state = "ert_spawn"
/obj/effect/landmark/ert_spawn/Initialize(mapload)
@@ -352,6 +348,23 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
GLOB.emergencyresponseteamspawn += loc
return INITIALIZE_HINT_QDEL
+/obj/effect/landmark/ert_outpost_spawn
+ name = "Emergency response team outpost spawn"
+ icon_state = "ert_spawn"
+
+/obj/effect/landmark/ert_outpost_spawn/Initialize(mapload)
+ ..()
+ GLOB.emergencyresponseteam_outpostspawn += loc
+ return INITIALIZE_HINT_QDEL
+
+/obj/effect/landmark/ert_shuttle_spawn
+ name = "Emergency response team shuttle spawn"
+ icon_state = "ert_spawn"
+
+/obj/effect/landmark/ert_shuttle_brief_spawn
+ name = "Emergency response team briefing officer spawn"
+ icon_state = "ert_brief_spawn"
+
//ninja energy nets teleport victims here
/obj/effect/landmark/holding_facility
name = "Holding Facility"
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 4af986b79cbe..0ca73652857c 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -11,7 +11,7 @@
/obj/effect/mine/Initialize()
. = ..()
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -24,9 +24,9 @@
if(ismob(AM))
var/mob/MM = AM
if(!(MM.movement_type & FLYING))
- INVOKE_ASYNC(src, .proc/triggermine, AM)
+ INVOKE_ASYNC(src, PROC_REF(triggermine), AM)
else
- INVOKE_ASYNC(src, .proc/triggermine, AM)
+ INVOKE_ASYNC(src, PROC_REF(triggermine), AM)
/obj/effect/mine/proc/triggermine(mob/victim)
if(triggered)
@@ -161,7 +161,7 @@
return
to_chat(victim, "RIP AND TEAR")
- INVOKE_ASYNC(src, .proc/blood_delusion, victim)
+ INVOKE_ASYNC(src, PROC_REF(blood_delusion), victim)
chainsaw = new(victim.loc)
victim.log_message("entered a marg frenzy", LOG_ATTACK)
@@ -176,7 +176,7 @@
var/datum/client_colour/colour = victim.add_client_colour(/datum/client_colour/bloodlust)
QDEL_IN(colour, 11)
doomslayer = victim
- RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/end_blood_frenzy)
+ RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(end_blood_frenzy))
QDEL_IN(WEAKREF(src), duration)
/obj/effect/mine/pickup/bloodbath/proc/end_blood_frenzy()
@@ -210,7 +210,7 @@
return
to_chat(victim, "You feel fast!")
victim.add_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
- addtimer(CALLBACK(src, .proc/finish_effect, victim), duration)
+ addtimer(CALLBACK(src, PROC_REF(finish_effect), victim), duration)
/obj/effect/mine/pickup/speed/proc/finish_effect(mob/living/carbon/victim)
victim.remove_movespeed_modifier(/datum/movespeed_modifier/yellow_orb)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 1e349fd17abb..d1f47ff647f6 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -105,7 +105,6 @@
/obj/item/paper/fluff/jobs/prisoner/letter = 1,
/obj/item/grenade/smokebomb = 1,
/obj/item/flashlight/seclite = 1,
- /obj/item/tailclub = 1, //want to buy makeshift wooden club sprite
/obj/item/kitchen/knife/shiv = 4,
/obj/item/kitchen/knife/shiv/carrot = 1,
/obj/item/kitchen/knife = 1,
@@ -565,29 +564,11 @@
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/diamond/twenty,
/obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/sheet/mineral/adamantine/ten,
+
/obj/item/stack/cable_coil/red,
/obj/item/stack/rods/fifty
)
-/obj/effect/spawner/lootdrop/spacegym
- name = "spacegym loot spawner"
- lootdoubles = FALSE
-
- loot = list(
- /obj/item/dnainjector/hulkmut = 1,
- /obj/item/dnainjector/dwarf = 1,
- /obj/item/dnainjector/gigantism = 1,
- /obj/item/reagent_containers/food/snacks/meat/cutlet/chicken = 1,
- /obj/item/clothing/under/shorts/black = 1,
- /obj/item/clothing/under/shorts/blue = 1,
- /obj/item/clothing/under/shorts/red = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/storage/pill_bottle/stimulant = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/box/handcuffs = 1,
- )
-
/obj/effect/spawner/lootdrop/singularitygen
name = "Tesla or Singulo spawner"
lootdoubles = FALSE
@@ -645,7 +626,6 @@
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/diamond/twenty,
/obj/item/stack/sheet/mineral/gold/fifty,
- /obj/item/stack/sheet/mineral/adamantine/ten,
/obj/item/stack/cable_coil/red,
/obj/item/stack/rods/fifty
)
@@ -1250,6 +1230,42 @@
))
return ..()
+
+//random RND imprinter/protolathe board spawners. Do not use on maps without a good reason
+/obj/effect/spawner/lootdrop/randomprotolathe
+ name = "random departmental protolathe"
+ loot = list(
+ /obj/item/circuitboard/machine/protolathe/department/cargo,
+ /obj/item/circuitboard/machine/protolathe/department/engineering,
+ /obj/item/circuitboard/machine/protolathe/department/service,
+ /obj/item/circuitboard/machine/protolathe/department/medical,
+ /obj/item/circuitboard/machine/protolathe/department/science,
+ /obj/item/circuitboard/machine/protolathe/department/security
+ )
+
+/obj/effect/spawner/lootdrop/randomimprinter
+ name = "random departmental circuit imprinter"
+ loot = list(
+ /obj/item/circuitboard/machine/circuit_imprinter/department/cargo,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/engi,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/civ,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/med,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/science,
+ /obj/item/circuitboard/machine/circuit_imprinter/department/sec
+ )
+
+/obj/effect/spawner/lootdrop/randomtechfab
+ name = "random departmental techfab"
+ loot = list(
+ /obj/item/circuitboard/machine/techfab/department/service,
+ /obj/item/circuitboard/machine/techfab/department/cargo,
+ /obj/item/circuitboard/machine/techfab/department/engineering,
+ /obj/item/circuitboard/machine/techfab/department/service,
+ /obj/item/circuitboard/machine/techfab/department/medical,
+ /obj/item/circuitboard/machine/techfab/department/science,
+ /obj/item/circuitboard/machine/techfab/department/security
+ )
+
/obj/effect/spawner/lootdrop/ration
loot = list (
/obj/item/storage/ration/vegan_chili = 5,
diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
index 99eac4828932..1eb4fd0dda94 100644
--- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm
+++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
@@ -15,4 +15,4 @@
message_admins("An alien egg has been delivered to [ADMIN_VERBOSEJMP(T)].")
log_game("An alien egg has been delivered to [AREACOORD(T)]")
var/message = "Attention [station_name()], we have entrusted you with a research specimen in [get_area_name(T, TRUE)]. Remember to follow all safety precautions when dealing with the specimen."
- SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, CALLBACK(GLOBAL_PROC, /proc/print_command_report, message), announcement_time))
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(print_command_report), message), announcement_time))
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index b1134e471d03..b986ae41808b 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -161,7 +161,7 @@
forceMove(exit_vent)
var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
- addtimer(CALLBACK(src, .proc/do_vent_move, exit_vent, travel_time), travel_time)
+ addtimer(CALLBACK(src, PROC_REF(do_vent_move), exit_vent, travel_time), travel_time)
/obj/structure/spider/spiderling/proc/do_vent_move(obj/machinery/atmospherics/components/unary/vent_pump/exit_vent, travel_time)
if(QDELETED(exit_vent) || exit_vent.welded)
@@ -171,7 +171,7 @@
if(prob(50))
audible_message("You hear something scampering through the ventilation ducts.")
- addtimer(CALLBACK(src, .proc/finish_vent_move, exit_vent), travel_time)
+ addtimer(CALLBACK(src, PROC_REF(finish_vent_move), exit_vent), travel_time)
/obj/structure/spider/spiderling/proc/finish_vent_move(obj/machinery/atmospherics/components/unary/vent_pump/exit_vent)
if(QDELETED(exit_vent) || exit_vent.welded)
@@ -199,7 +199,7 @@
visible_message("[src] scrambles into the ventilation ducts!", \
"You hear something scampering through the ventilation ducts.")
- addtimer(CALLBACK(src, .proc/vent_move, exit_vent), rand(20,60))
+ addtimer(CALLBACK(src, PROC_REF(vent_move), exit_vent), rand(20,60))
//=================
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 7d0612a8da65..76412acf2a5b 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -10,7 +10,7 @@
/obj/effect/step_trigger/Initialize(mapload)
. = ..()
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -26,7 +26,7 @@
return
if(!ismob(H) && mobs_only)
return
- INVOKE_ASYNC(src, .proc/Trigger, H)
+ INVOKE_ASYNC(src, PROC_REF(Trigger), H)
/obj/effect/step_trigger/singularity_act()
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index d825f49c811d..8c8c8f900aab 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -514,7 +514,7 @@
status = rcd_status
delay = rcd_delay
if (status == RCD_DECONSTRUCT)
- addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1.1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 1.1 SECONDS)
delay -= 11
icon_state = "rcd_end_reverse"
else
@@ -540,7 +540,20 @@
qdel(src)
else
icon_state = "rcd_end"
- addtimer(CALLBACK(src, .proc/end), 15)
+ addtimer(CALLBACK(src, PROC_REF(end)), 15)
/obj/effect/constructing_effect/proc/end()
qdel(src)
+
+/obj/effect/muzzle_flash
+ icon = 'icons/obj/projectiles.dmi'
+ icon_state = "muzzle_flash"
+ layer = ABOVE_MOB_LAYER
+ plane = GAME_PLANE
+ appearance_flags = KEEP_APART|TILE_BOUND
+ var/applied = FALSE
+
+/obj/effect/muzzle_flash/Initialize(mapload, new_icon_state)
+ . = ..()
+ if(new_icon_state)
+ icon_state = new_icon_state
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
index 6460937bfe57..a89e65715d6a 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
@@ -40,3 +40,11 @@
/obj/effect/projectile/impact/laser/emitter
name = "emitter impact"
icon_state = "impact_emitter"
+
+/obj/effect/projectile/impact/kalix
+ name = "beam impact"
+ icon_state = "impact_pgf"
+
+/obj/effect/projectile/impact/pgf
+ name = "beam impact"
+ icon_state = "impact_pgf"
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
index 697a3f633d81..e684c2826bca 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
@@ -32,3 +32,9 @@
/obj/effect/projectile/muzzle/wormhole
icon_state = "wormhole_g"
+
+/obj/effect/projectile/muzzle/pgf
+ icon_state = "muzzle_pgf"
+
+/obj/effect/projectile/muzzle/kalix
+ icon_state = "muzzle_kalix"
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
index be7962324f6d..776e6841d29c 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -70,3 +70,9 @@
/obj/effect/projectile/tracer/wormhole
icon_state = "wormhole_g"
+
+/obj/effect/projectile/tracer/pgf
+ icon_state = "beam_pgf"
+
+/obj/effect/projectile/tracer/kalix
+ icon_state = "beam_kalix"
diff --git a/code/game/objects/effects/turf_fire.dm b/code/game/objects/effects/turf_fire.dm
index 01973670d608..a0c9e0f95a9b 100644
--- a/code/game/objects/effects/turf_fire.dm
+++ b/code/game/objects/effects/turf_fire.dm
@@ -71,7 +71,7 @@
return INITIALIZE_HINT_QDEL
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index e13cca64caf9..df7c5ae431c5 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -32,7 +32,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
///Icon file for mob worn overlays.
var/icon/mob_overlay_icon
///icon state for mob worn overlays, if null the normal icon_state will be used.
- var/mob_overlay_state //WS EDIT - Mob Overlay State
+ var/mob_overlay_state
///Forced mob worn layer instead of the standard preferred ssize.
var/alternate_worn_layer
@@ -453,14 +453,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args)
if((prob(final_block_chance) && COOLDOWN_FINISHED(src, block_cooldown)) || (prob(final_block_chance) && istype(src, /obj/item/shield)))
owner.visible_message("[owner] blocks [attack_text] with [src]!")
- var/rand_ricochet = pick(list(
- 'sound/weapons/effects/ric1.ogg',
- 'sound/weapons/effects/ric2.ogg',
- 'sound/weapons/effects/ric3.ogg',
- 'sound/weapons/effects/ric4.ogg',
- 'sound/weapons/effects/ric5.ogg'
- ))
- playsound(src, rand_ricochet, 100)
+ playsound(src, 'sound/weapons/effects/deflect.ogg', 100)
if(!istype(src, /obj/item/shield))
COOLDOWN_START(src, block_cooldown, block_cooldown_time)
return 1
@@ -684,7 +677,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
if(HAS_TRAIT(src, TRAIT_NODROP))
return
thrownby = WEAKREF(thrower)
- callback = CALLBACK(src, .proc/after_throw, callback) //replace their callback with our own
+ callback = CALLBACK(src, PROC_REF(after_throw), callback) //replace their callback with our own
. = ..(target, range, speed, thrower, spin, diagonals_first, callback, force, gentle, quickstart = quickstart)
/obj/item/proc/after_throw(datum/callback/callback)
@@ -852,7 +845,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
if((item_flags & IN_INVENTORY || item_flags & IN_STORAGE) && usr.client.prefs.enable_tips && !QDELETED(src))
var/timedelay = usr.client.prefs.tip_delay/100
var/user = usr
- tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it.
+ tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, user), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it.
var/mob/living/L = usr
if(istype(L) && L.incapacitated())
apply_outline(COLOR_RED_GRAY)
@@ -911,7 +904,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
if(delay)
// Create a callback with checks that would be called every tick by do_after.
- var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, amount, extra_checks)
+ var/datum/callback/tool_check = CALLBACK(src, PROC_REF(tool_check_callback), user, amount, extra_checks)
if(ismob(target))
if(!do_mob(user, target, delay, extra_checks=tool_check))
@@ -1099,6 +1092,10 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
if(SEND_SIGNAL(src, COMSIG_ITEM_OFFER_TAKEN, offerer, taker) & COMPONENT_OFFER_INTERRUPT)
return TRUE
+///Intended for interactions with guns, like racking
+/obj/item/proc/unique_action(mob/living/user)
+ return
+
/**
* Returns null if this object cannot be used to interact with physical writing mediums such as paper.
* Returns a list of key attributes for this object interacting with paper otherwise.
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index b84ccff2b8c9..7548625b31f6 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -256,7 +256,7 @@ RLD
"SOUTH" = image(icon = 'icons/mob/radial.dmi', icon_state = "csouth"),
"WEST" = image(icon = 'icons/mob/radial.dmi', icon_state = "cwest")
)
- var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(computerdirs)
@@ -313,13 +313,13 @@ RLD
"External Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance/external/glass)
)
- var/airlockcat = show_radial_menu(user, src, solid_or_glass_choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/airlockcat = show_radial_menu(user, src, solid_or_glass_choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(airlockcat)
if("Solid")
if(advanced_airlock_setting == 1)
- var/airlockpaint = show_radial_menu(user, src, solid_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/airlockpaint = show_radial_menu(user, src, solid_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(airlockpaint)
@@ -362,7 +362,7 @@ RLD
if("Glass")
if(advanced_airlock_setting == 1)
- var/airlockpaint = show_radial_menu(user, src , glass_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/airlockpaint = show_radial_menu(user, src , glass_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(airlockpaint)
@@ -455,7 +455,7 @@ RLD
choices += list(
"Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
)
- var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(choice)
@@ -507,7 +507,7 @@ RLD
buzz loudly!","[src] begins \
vibrating violently!")
// 5 seconds to get rid of it
- addtimer(CALLBACK(src, .proc/detonate_pulse_explode), 50)
+ addtimer(CALLBACK(src, PROC_REF(detonate_pulse_explode)), 50)
/obj/item/construction/rcd/proc/detonate_pulse_explode()
explosion(src, 0, 0, 3, 1, flame_range = 1)
@@ -822,7 +822,7 @@ RLD
machinery_data["cost"][A] = initial(M.rcd_cost)
machinery_data["delay"][A] = initial(M.rcd_delay)
- var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm
index 18661712b6e4..be7cafe22df9 100644
--- a/code/game/objects/items/RCL.dm
+++ b/code/game/objects/items/RCL.dm
@@ -25,8 +25,8 @@
/obj/item/rcl/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/rcl/ComponentInitialize()
. = ..()
@@ -171,7 +171,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
- RegisterSignal(to_hook, COMSIG_MOVABLE_MOVED, .proc/trigger)
+ RegisterSignal(to_hook, COMSIG_MOVABLE_MOVED, PROC_REF(trigger))
listeningTo = to_hook
/obj/item/rcl/proc/trigger(mob/user)
@@ -255,7 +255,7 @@
/obj/item/rcl/proc/showWiringGui(mob/user)
var/list/choices = wiringGuiGenerateChoices(user)
- wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, .proc/wiringGuiReact, user), radius = 42)
+ wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, PROC_REF(wiringGuiReact), user), radius = 42)
/obj/item/rcl/proc/wiringGuiUpdate(mob/user)
if(!wiring_gui_menu)
diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm
index a6bdb4534b9b..d82a37d5ee6d 100644
--- a/code/game/objects/items/RSF.dm
+++ b/code/game/objects/items/RSF.dm
@@ -75,7 +75,7 @@ RSF
var/cost = 0
//Warning, prepare for bodgecode
while(islist(target))//While target is a list we continue the loop
- var/picked = show_radial_menu(user, src, formRadial(target), custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE)
+ var/picked = show_radial_menu(user, src, formRadial(target), custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE)
if(!check_menu(user) || picked == null)
return
for(var/emem in target)//Back through target agian
diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm
index 97c3419f6fac..6d04e2e505ff 100644
--- a/code/game/objects/items/binoculars.dm
+++ b/code/game/objects/items/binoculars.dm
@@ -13,8 +13,8 @@
/obj/item/binoculars/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/binoculars/ComponentInitialize()
. = ..()
@@ -27,8 +27,8 @@
/obj/item/binoculars/proc/on_wield(obj/item/source, mob/user)
SIGNAL_HANDLER
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_walk)
- RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, .proc/rotate)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_walk))
+ RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, PROC_REF(rotate))
listeningTo = user
user.visible_message("[user] holds [src] up to [user.p_their()] eyes.", "You hold [src] up to your eyes.")
item_state = "binoculars_wielded"
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index cc4fd287c8b7..59fef712b505 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -19,14 +19,14 @@
ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, "xeno immune")
owner.med_hud_set_status()
- INVOKE_ASYNC(src, .proc/AddInfectionImages, owner)
+ INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), owner)
/obj/item/organ/body_egg/Remove(mob/living/carbon/M, special = 0)
if(owner)
REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, "xeno immune")
owner.med_hud_set_status()
- INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner)
+ INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), owner)
..()
/obj/item/organ/body_egg/on_death()
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index faf1f22a651a..52af9852be5c 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -45,7 +45,7 @@
/obj/item/bodybag/bluespace/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_ATOM_CANREACH, .proc/CanReachReact)
+ RegisterSignal(src, COMSIG_ATOM_CANREACH, PROC_REF(CanReachReact))
/obj/item/bodybag/bluespace/examine(mob/user)
. = ..()
diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm
index 78ee6cc25d3c..b370c5ebc6c3 100644
--- a/code/game/objects/items/broom.dm
+++ b/code/game/objects/items/broom.dm
@@ -17,8 +17,8 @@
/obj/item/pushbroom/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/pushbroom/ComponentInitialize()
. = ..()
@@ -33,7 +33,7 @@
SIGNAL_HANDLER
to_chat(user, "You brace the [src] against the ground in a firm sweeping stance.")
- RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/sweep)
+ RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(sweep))
/// triggered on unwield of two handed item
/obj/item/pushbroom/proc/on_unwield(obj/item/source, mob/user)
diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index 8a84ae2b3a35..f44359ca656c 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -101,7 +101,7 @@
* * user The mob choosing a skin of the cardboard cutout
*/
/obj/item/cardboard_cutout/proc/change_appearance(obj/item/toy/crayon/crayon, mob/living/user)
- var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, .proc/check_menu, user, crayon), radius = 36, require_near = TRUE)
+ var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, PROC_REF(check_menu), user, crayon), radius = 36, require_near = TRUE)
if(!new_appearance)
return FALSE
if(!do_after(user, 10, FALSE, src, TRUE))
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 58eba6e70e88..c4e48f1a629a 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -167,7 +167,7 @@
if(mapload && access_txt)
access = text2access(access_txt)
update_label()
- RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, .proc/update_in_wallet)
+ RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet))
/obj/item/card/id/Destroy()
if (registered_account)
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index 8d0d89a88638..f9181ef3ac6a 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/chainsaw.dm
@@ -25,8 +25,8 @@
/obj/item/chainsaw/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/chainsaw/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm
index 772a80d6c0e4..29a8ff25c38a 100644
--- a/code/game/objects/items/charter.dm
+++ b/code/game/objects/items/charter.dm
@@ -57,7 +57,7 @@
to_chat(user, "Your name has been sent to your employers for approval.")
// Autoapproves after a certain time
- response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
+ response_timer_id = addtimer(CALLBACK(src, PROC_REF(rename_station), new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]")
/obj/item/sector_charter/proc/reject_proposed(user)
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 44857142e4db..8800dee20016 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -342,10 +342,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
smoke_all = TRUE
list_reagents = list(/datum/reagent/drug/nicotine = 10, /datum/reagent/medicine/omnizine = 15)
-/obj/item/clothing/mask/cigarette/shadyjims
- desc = "A Shady Jim's Super Slims cigarette."
- list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/toxin/lipolicide = 4, /datum/reagent/ammonia = 2, /datum/reagent/toxin/plantbgone = 1, /datum/reagent/toxin = 1.5)
-
/obj/item/clothing/mask/cigarette/xeno
desc = "A Xeno Filtered brand cigarette."
list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 7e7bd499a19b..faa366f893b0 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -802,13 +802,6 @@
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 4)
-/obj/item/circuitboard/machine/fat_sucker
- name = "Lipid Extractor (Machine Board)"
- icon_state = "medical"
- build_path = /obj/machinery/fat_sucker
- req_components = list(/obj/item/stock_parts/micro_laser = 1,
- /obj/item/kitchen/fork = 1)
-
/obj/item/circuitboard/machine/harvester
name = "Harvester (Machine Board)"
icon_state = "medical"
@@ -1502,3 +1495,23 @@
/obj/item/stock_parts/cell = 3,
/obj/item/stock_parts/capacitor = 2
)
+
+/obj/item/circuitboard/machine/coffeemaker
+ name = "Modello 3 Coffeemaker"
+ build_path = /obj/machinery/coffeemaker
+ req_components = list(
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/stock_parts/capacitor = 1,
+ /obj/item/stock_parts/micro_laser = 2,
+ )
+
+/obj/item/circuitboard/machine/coffeemaker/impressa
+ name = "Impressa Coffeemaker"
+ build_path = /obj/machinery/coffeemaker/impressa
+ req_components = list(
+ /obj/item/stack/sheet/glass = 1,
+ /obj/item/reagent_containers/glass/beaker = 2,
+ /obj/item/stock_parts/capacitor = 1,
+ /obj/item/stock_parts/micro_laser = 2,
+ )
diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm
index e800eaed6846..14edc15f7d18 100644
--- a/code/game/objects/items/debug_items.dm
+++ b/code/game/objects/items/debug_items.dm
@@ -64,7 +64,7 @@
"Scalpel" = image(icon = 'icons/obj/surgery.dmi', icon_state = "scalpel"),
"Saw" = image(icon = 'icons/obj/surgery.dmi', icon_state = "saw")
)
- var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
return
switch(tool_result)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index bf61f194b9b7..577cfb5a62d4 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -221,7 +221,7 @@
return FALSE
/obj/item/defibrillator/proc/cooldowncheck(mob/user)
- addtimer(CALLBACK(src, .proc/finish_charging), cooldown_duration)
+ addtimer(CALLBACK(src, PROC_REF(finish_charging)), cooldown_duration)
/obj/item/defibrillator/proc/finish_charging()
if(cell)
@@ -329,7 +329,7 @@
. = ..()
if(!req_defib)
return
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/check_range)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(check_range))
/obj/item/shockpaddles/Moved()
. = ..()
@@ -369,8 +369,8 @@
/obj/item/shockpaddles/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NO_STORAGE_INSERT, GENERIC_ITEM_TRAIT) //stops shockpaddles from being inserted in BoH
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
if(!req_defib)
return //If it doesn't need a defib, just say it exists
if (!loc || !istype(loc, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
@@ -468,7 +468,7 @@
M.adjustStaminaLoss(60)
M.Knockdown(75)
M.Jitter(50)
- M.apply_status_effect(STATUS_EFFECT_CONVULSING)
+ M.apply_status_effect(/datum/status_effect/convulsing)
playsound(src, 'sound/machines/defib_zap.ogg', 50, TRUE, -1)
if(HAS_TRAIT(M,MOB_ORGANIC))
M.emote("gasp")
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 9dd00660d362..34fdcad9f16b 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -229,9 +229,9 @@ GLOBAL_LIST_EMPTY(PDAs)
if(id)
dat += text("ID: [id ? "[id.registered_name], [id.assignment]" : "----------"] [id ? "Update PDA Info" : ""]
")
- dat += "[worldtime2text()]
" //:[world.time / 100 % 6][world.time / 100 % 10]"
- dat += "[time2text(world.realtime, "MMM DD")] 504 FS"
- dat += "
"
+ dat += "[station_time_timestamp()]
"
+ dat += "[sector_datestamp()]
"
+ dat += "
"
dat += "General Functions
"
dat += ""
dat += "- [PDAIMG(notes)] Notekeeper
"
@@ -1097,7 +1097,7 @@ GLOBAL_LIST_EMPTY(PDAs)
AM.emp_act(severity)
if (!(. & EMP_PROTECT_SELF))
emped++
- addtimer(CALLBACK(src, .proc/emp_end), 200 * severity)
+ addtimer(CALLBACK(src, PROC_REF(emp_end)), 200 * severity)
/obj/item/pda/proc/emp_end()
emped--
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index 39b3545c1400..37613679e628 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -10,8 +10,8 @@
/obj/item/pda/clown/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip))
- AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, .proc/after_sitcom_laugh))
+ AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, PROC_REF(AfterSlip)))
+ AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, PROC_REF(after_sitcom_laugh)))
/obj/item/pda/clown/proc/AfterSlip(mob/living/carbon/human/M)
if (istype(M) && (M.real_name != owner))
@@ -61,7 +61,7 @@
/obj/item/pda/ai/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, .proc/pda_no_detonate)
+ RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, PROC_REF(pda_no_detonate))
/obj/item/pda/medical
name = "medical PDA"
@@ -144,7 +144,7 @@
/obj/item/pda/captain/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, .proc/pda_no_detonate)
+ RegisterSignal(src, COMSIG_PDA_CHECK_DETONATE, PROC_REF(pda_no_detonate))
/obj/item/pda/cargo
name = "cargo technician PDA"
@@ -239,8 +239,3 @@
name = "brig physician PDA"
default_cartridge = /obj/item/cartridge/medical
icon_state = "pda-brig_phys"
-
-/obj/item/pda/lieutenant
- name = "lieutenant PDA"
- default_cartridge = /obj/item/cartridge/hos
- icon_state = "pda-h"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 1e96a5b3ce01..65bda2aa1f54 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -486,7 +486,7 @@ Code:
active1 = null
if("Send Signal")
- INVOKE_ASYNC(radio, /obj/item/integrated_signaler.proc/send_activation)
+ INVOKE_ASYNC(radio, TYPE_PROC_REF(/obj/item/integrated_signaler, send_activation))
if("Signal Frequency")
var/new_frequency = sanitize_frequency(radio.frequency + text2num(href_list["sfreq"]))
diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm
index f5b7cd58fddb..ae57fe3d61eb 100644
--- a/code/game/objects/items/devices/desynchronizer.dm
+++ b/code/game/objects/items/devices/desynchronizer.dm
@@ -55,7 +55,7 @@
SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION)
last_use = world.time
icon_state = "desynchronizer-on"
- resync_timer = addtimer(CALLBACK(src, .proc/resync), duration , TIMER_STOPPABLE)
+ resync_timer = addtimer(CALLBACK(src, PROC_REF(resync)), duration , TIMER_STOPPABLE)
/obj/item/desynchronizer/proc/resync()
new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location())
diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
index 3833b63d7ac7..8986f8443698 100644
--- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
+++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
@@ -43,7 +43,7 @@
maptext = "[circuits]"
icon_state = "[initial(icon_state)]_recharging"
var/recharge_time = min(600, circuit_cost * 5) //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming
- addtimer(CALLBACK(src, .proc/recharge), recharge_time)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time)
return TRUE //The actual circuit magic itself is done on a per-object basis
/obj/item/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity)
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
index e9da1f126aab..4abc1a3786bb 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -138,7 +138,7 @@
if(user.a_intent == INTENT_HELP)
if(!(obj_flags & EMAGGED))
user.visible_message("[user] scans [target] with [src].", "You scan [target]'s radiation levels with [src]...")
- addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
+ addtimer(CALLBACK(src, PROC_REF(scan), target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
else
user.visible_message("[user] scans [target] with [src].", "You project [src]'s stored radiation into [target]!")
target.rad_act(radiation_count)
@@ -212,7 +212,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
- RegisterSignal(user, COMSIG_ATOM_RAD_ACT, .proc/redirect_rad_act)
+ RegisterSignal(user, COMSIG_ATOM_RAD_ACT, PROC_REF(redirect_rad_act))
listeningTo = user
/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount)
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 2f3429995845..fa95991750ec 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -14,7 +14,7 @@
/obj/item/megaphone/equipped(mob/M, slot)
. = ..()
if (slot == ITEM_SLOT_HANDS)
- RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
else
UnregisterSignal(M, COMSIG_MOB_SAY)
diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
index 6368a4b3d17f..60cfe4eb89b3 100644
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -31,10 +31,10 @@
sigdev.frequency = roundstart_signaller_freq
AddElement(/datum/element/undertile, tile_overlay = tile_overlay, use_anchor = TRUE)
- RegisterSignal(src, COMSIG_OBJ_HIDE, .proc/ToggleActive)
+ RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(ToggleActive))
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -50,7 +50,7 @@
else if(!trigger_item)
return
can_trigger = FALSE
- addtimer(CALLBACK(src, .proc/trigger), trigger_delay)
+ addtimer(CALLBACK(src, PROC_REF(trigger)), trigger_delay)
/obj/item/pressure_plate/proc/trigger()
can_trigger = TRUE
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index e37cd1859094..36b1090fd7e0 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -411,20 +411,6 @@ GLOBAL_LIST_INIT(channel_tokens, list(
desc = "A headset allowing the wearer to communicate with medbay and service."
icon_state = "med_headset"
-/obj/item/radio/headset/heads/lieutenant
- name = "lieutenant's headset"
- desc = "A lieutenant's headset."
- icon_state = "com_headset"
-
-/obj/item/radio/headset/heads/lieutenant/alt
- name = "lieutenant's bowman headset"
- desc = "A lieutenant's headset. Protects ears from flashbangs."
- icon_state = "com_headset_alt"
-
-/obj/item/radio/headset/heads/lieutenant/alt/ComponentInitialize()
- . = ..()
- AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS))
-
/obj/item/radio/headset/heads/rd
name = "\proper the research director's headset"
desc = "Headset of the fellow who keeps society marching towards technological singularity."
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 3c35294f8e3f..a91789c542cd 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -22,7 +22,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 31)
var/area/current_area = get_area(src)
if(!current_area)
return
- RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, .proc/AreaPowerCheck)
+ RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(AreaPowerCheck))
/obj/item/radio/intercom/examine(mob/user)
. = ..()
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 2a5a043656c2..e95ab85cda9d 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -200,7 +200,7 @@
spans = list(M.speech_span)
if(!language)
language = M.get_selected_language()
- INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language, message_mods)
+ INVOKE_ASYNC(src, PROC_REF(talk_into_impl), M, message, channel, spans.Copy(), language, message_mods)
return ITALICS | REDUCE_RANGE
/obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language, list/message_mods)
@@ -272,7 +272,7 @@
// Non-subspace radios will check in a couple of seconds, and if the signal
// was never received, send a mundane broadcast (no headsets).
- addtimer(CALLBACK(src, .proc/backup_transmission, signal), 20)
+ addtimer(CALLBACK(src, PROC_REF(backup_transmission), signal), 20)
/obj/item/radio/proc/backup_transmission(datum/signal/subspace/vocal/signal)
var/turf/T = get_turf(src)
@@ -367,7 +367,7 @@
for (var/ch_name in channels)
channels[ch_name] = 0
on = FALSE
- addtimer(CALLBACK(src, .proc/end_emp_effect, curremp), 200)
+ addtimer(CALLBACK(src, PROC_REF(end_emp_effect), curremp), 200)
/obj/item/radio/proc/end_emp_effect(curremp)
if(emped != curremp) //Don't fix it if it's been EMP'd again
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index e04e2bdc422b..5d90c839bebf 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -43,7 +43,7 @@
soundloop.stop()
soundloop2.stop()
to_chat(loc, "*ding*")
- addtimer(CALLBACK(src, .proc/snap), 2)
+ addtimer(CALLBACK(src, PROC_REF(snap)), 2)
/obj/item/reverse_bear_trap/attack_hand(mob/user)
if(iscarbon(user))
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 1e36f8bd328f..6f11fe4ebac1 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -550,7 +550,7 @@ GENE SCANNER
else
to_chat(user, "[src]'s barometer function says a storm will land in approximately [butchertime(fixed)].")
cooldown = TRUE
- addtimer(CALLBACK(src,/obj/item/analyzer/proc/ping), cooldown_time)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/analyzer, ping)), cooldown_time)
/obj/item/analyzer/proc/ping()
if(isliving(loc))
@@ -793,7 +793,7 @@ GENE SCANNER
ready = FALSE
icon_state = "[icon_state]_recharging"
- addtimer(CALLBACK(src, .proc/recharge), cooldown, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), cooldown, TIMER_UNIQUE)
/obj/item/sequence_scanner/proc/recharge()
icon_state = initial(icon_state)
diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm
index 1c103b1dd950..1edec8edb7db 100644
--- a/code/game/objects/items/devices/spyglasses.dm
+++ b/code/game/objects/items/devices/spyglasses.dm
@@ -54,7 +54,7 @@
/obj/item/spy_bug/Initialize()
. = ..()
- tracker = new /datum/movement_detector(src, CALLBACK(src, .proc/update_view))
+ tracker = new /datum/movement_detector(src, CALLBACK(src, PROC_REF(update_view)))
cam_screen = new
cam_screen.name = "screen"
diff --git a/code/game/objects/items/devices/swapper.dm b/code/game/objects/items/devices/swapper.dm
index b152504a3431..e1a5cbaf02e9 100644
--- a/code/game/objects/items/devices/swapper.dm
+++ b/code/game/objects/items/devices/swapper.dm
@@ -55,7 +55,7 @@
var/mob/holder = linked_swapper.loc
to_chat(holder, "[linked_swapper] starts buzzing.")
next_use = world.time + cooldown //only the one used goes on cooldown
- addtimer(CALLBACK(src, .proc/swap, user), 25)
+ addtimer(CALLBACK(src, PROC_REF(swap), user), 25)
/obj/item/swapper/examine(mob/user)
. = ..()
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 3d054927d2c8..4f034824e2f4 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -89,7 +89,7 @@ effective or pretty fucking useless.
addtimer(VARSET_CALLBACK(src, used, FALSE), cooldown)
addtimer(VARSET_CALLBACK(src, icon_state, "health"), cooldown)
to_chat(user, "Successfully irradiated [M].")
- addtimer(CALLBACK(src, .proc/radiation_aftereffect, M), (wavelength+(intensity*4))*5)
+ addtimer(CALLBACK(src, PROC_REF(radiation_aftereffect), M), (wavelength+(intensity*4))*5)
else
to_chat(user, "The radioactive microlaser is still recharging.")
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index b26ec181525b..f6687ffec110 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -90,7 +90,7 @@
if(toggle)
toggle = FALSE
toggle_valve()
- addtimer(CALLBACK(src, .proc/toggle_off), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever
+ addtimer(CALLBACK(src, PROC_REF(toggle_off)), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever
/obj/item/transfer_valve/proc/toggle_off()
toggle = TRUE
@@ -181,7 +181,7 @@
merge_gases()
for(var/i in 1 to 6)
- addtimer(CALLBACK(src, /atom/.proc/update_appearance), 20 + (i - 1) * 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 20 + (i - 1) * 10)
else if(valve_open && tank_one && tank_two)
split_gases()
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 39fe7d490320..dc49ee2dc6ae 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -70,8 +70,8 @@
/obj/item/dualsaber/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
if(LAZYLEN(possible_colors))
saber_color = pick(possible_colors)
switch(saber_color)
@@ -102,10 +102,10 @@
impale(user)
return
if(wielded && prob(50))
- INVOKE_ASYNC(src, .proc/jedi_spin, user)
+ INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
/obj/item/dualsaber/proc/jedi_spin(mob/living/user)
- dance_rotate(user, CALLBACK(user, /mob.proc/dance_flip))
+ dance_rotate(user, CALLBACK(user, TYPE_PROC_REF(/mob, dance_flip)))
/obj/item/dualsaber/proc/impale(mob/living/user)
to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].")
@@ -144,7 +144,7 @@
playsound(loc, hitsound, get_clamped_volume(), TRUE, -1)
add_fingerprint(user)
// Light your candles while spinning around the room
- INVOKE_ASYNC(src, .proc/jedi_spin, user)
+ INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
/obj/item/dualsaber/green
possible_colors = list("green")
diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm
index 7554614495ae..111dd3aa96bc 100644
--- a/code/game/objects/items/eightball.dm
+++ b/code/game/objects/items/eightball.dm
@@ -64,7 +64,7 @@
say(answer)
on_cooldown = TRUE
- addtimer(CALLBACK(src, .proc/clear_cooldown), cooldown_time)
+ addtimer(CALLBACK(src, PROC_REF(clear_cooldown)), cooldown_time)
shaking = FALSE
diff --git a/code/game/objects/items/energyhalberd.dm b/code/game/objects/items/energyhalberd.dm
index fb03f24fbeb6..416964bbfded 100644
--- a/code/game/objects/items/energyhalberd.dm
+++ b/code/game/objects/items/energyhalberd.dm
@@ -76,8 +76,8 @@
/obj/item/energyhalberd/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_halberdwield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_halberdunwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_halberdwield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_halberdunwield))
if(LAZYLEN(possible_colors))
halberd_color = pick(possible_colors)
switch(halberd_color)
diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm
index a695bd70e410..94f1ae2a6062 100644
--- a/code/game/objects/items/etherealdiscoball.dm
+++ b/code/game/objects/items/etherealdiscoball.dm
@@ -59,7 +59,7 @@
set_light(range, power, current_color)
add_atom_colour("#[current_color]", FIXED_COLOUR_PRIORITY)
update_appearance()
- TimerID = addtimer(CALLBACK(src, .proc/DiscoFever), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors
+ TimerID = addtimer(CALLBACK(src, PROC_REF(DiscoFever)), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors
/obj/structure/etherealball/update_icon_state()
icon_state = "ethdisco_head_[TurnedOn]"
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index 75f96e4786ad..106ee2a50525 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -148,7 +148,7 @@
if(user.buckled && isobj(user.buckled) && !user.buckled.anchored)
var/obj/B = user.buckled
var/movementdirection = turn(direction,180)
- addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection), 1)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_chair), B, movementdirection), 1)
else user.newtonian_move(turn(direction, 180))
@@ -176,7 +176,7 @@
reagents.trans_to(W,1, transfered_by = user)
//Make em move dat ass, hun
- addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_particles, water_particles), 2)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_particles), water_particles), 2)
//Particle movement loop
/obj/item/extinguisher/proc/move_particles(list/particles, repetition=0)
@@ -198,7 +198,7 @@
particles -= W
if(repetition < power)
repetition++
- addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_particles, particles, repetition), 2)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_particles), particles, repetition), 2)
//Chair movement loop
/obj/item/extinguisher/proc/move_chair(obj/B, movementdirection, repetition=0)
@@ -216,7 +216,7 @@
return
repetition++
- addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_chair, B, movementdirection, repetition), timer_seconds)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/extinguisher, move_chair), B, movementdirection, repetition), timer_seconds)
/obj/item/extinguisher/AltClick(mob/user)
if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index 8203880b2b27..b2e5534a92b0 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -23,8 +23,8 @@
/obj/item/fireaxe/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/fireaxe/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index 7412c1892676..6a1e439422a4 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -213,8 +213,8 @@
if(get_dist(src, turf_target) > FLAMETHROWER_RANGE) //thiss shit doesnt work aaaaa
flamer_proj.range = FLAMETHROWER_RANGE
- RegisterSignal(flamer_proj, COMSIG_MOVABLE_MOVED, .proc/handle_flaming)
- RegisterSignal(flamer_proj, COMSIG_PARENT_QDELETING, .proc/stop_operating)
+ RegisterSignal(flamer_proj, COMSIG_MOVABLE_MOVED, PROC_REF(handle_flaming))
+ RegisterSignal(flamer_proj, COMSIG_PARENT_QDELETING, PROC_REF(stop_operating))
flamer_proj.fire() //off it goes
diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm
index 313b91acd71b..1c3bc9d5034c 100644
--- a/code/game/objects/items/grenades/antigravity.dm
+++ b/code/game/objects/items/grenades/antigravity.dm
@@ -13,6 +13,6 @@
for(var/turf/T in view(range,src))
T.AddElement(/datum/element/forced_gravity, forced_value)
- addtimer(CALLBACK(T, /datum/.proc/_RemoveElement, list(forced_value)), duration)
+ addtimer(CALLBACK(T, TYPE_PROC_REF(/datum, _RemoveElement), list(forced_value)), duration)
resolve()
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 5d42e6b7d469..b675a0012152 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -172,7 +172,7 @@
landminemode.activate()
return
active = TRUE
- addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride)
+ addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride)
/obj/item/grenade/chem_grenade/prime()
if(stage != GRENADE_READY)
@@ -298,7 +298,7 @@
chem_splash(get_turf(src), affected_area, list(reactants), ignition_temp, threatscale)
var/turf/DT = get_turf(src)
- addtimer(CALLBACK(src, .proc/prime), det_time)
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time)
log_game("A grenade detonated at [AREACOORD(DT)]")
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 0c7203f0a5c0..5326b303d977 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -58,7 +58,7 @@
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
- addtimer(CALLBACK(src, .proc/prime), rand(15,60))
+ addtimer(CALLBACK(src, PROC_REF(prime)), rand(15,60))
/obj/item/grenade/clusterbuster/segment/prime()
new payload_spawner(drop_location(), payload, rand(min_spawned,max_spawned))
@@ -79,7 +79,7 @@
var/obj/item/grenade/P = new type(loc)
if(istype(P))
P.active = TRUE
- addtimer(CALLBACK(P, /obj/item/grenade/proc/prime), rand(15,60))
+ addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
@@ -108,7 +108,7 @@
var/chosen = pick(subtypesof(/obj/item/slime_extract))
var/obj/item/slime_extract/P = new chosen(loc)
if(volatile)
- addtimer(CALLBACK(P, /obj/item/slime_extract/proc/activate_slime), rand(15,60))
+ addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/item/slime_extract, activate_slime)), rand(15,60))
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
diff --git a/code/game/objects/items/grenades/discogrenade.dm b/code/game/objects/items/grenades/discogrenade.dm
index 181feff62147..be2ec68f0cb1 100644
--- a/code/game/objects/items/grenades/discogrenade.dm
+++ b/code/game/objects/items/grenades/discogrenade.dm
@@ -55,7 +55,7 @@
var/launch_distance = rand(2, 6)
for(var/i in 1 to launch_distance)
step_away(src, loc)
- addtimer(CALLBACK(src, .proc/prime), rand(10, 60))
+ addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60))
randomiseLightColor()
/obj/item/grenade/discogrenade/subgrenade/prime(mob/living/lanced_by)
@@ -84,7 +84,7 @@
set_light(range, power, lightcolor)
add_atom_colour("#[lightcolor]", FIXED_COLOUR_PRIORITY)
update_appearance()
- timerID = addtimer(CALLBACK(src, .proc/randomiseLightColor), 2, TIMER_STOPPABLE)
+ timerID = addtimer(CALLBACK(src, PROC_REF(randomiseLightColor)), 2, TIMER_STOPPABLE)
/obj/item/grenade/discogrenade/subgrenade/proc/forcedance(turf/target_turf , mob/living/carbon/human/target)
if(!target_turf)
diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm
index 7bf5fd65bf08..c6200d69ae9e 100644
--- a/code/game/objects/items/grenades/festive.dm
+++ b/code/game/objects/items/grenades/festive.dm
@@ -106,7 +106,7 @@
playsound(src, 'sound/effects/fuse.ogg', volume, TRUE)
active = TRUE
icon_state = initial(icon_state) + "_active"
- addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride)
+ addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride)
/obj/item/grenade/firecracker/prime()
. = ..()
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index cf5fab1d4a0a..f0198b7f1a0b 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -95,7 +95,7 @@
active = TRUE
icon_state = initial(icon_state) + "_active"
SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride)
- addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride)
+ addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride)
/obj/item/grenade/proc/prime()
if(shrapnel_type && shrapnel_radius && !shrapnel_initialized) // add a second check for adding the component in case whatever triggered the grenade went straight to prime (badminnery for example)
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 490c5c0aebaa..f3f891bad11d 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -109,7 +109,7 @@
target.add_overlay(plastic_overlay)
to_chat(user, "You plant the bomb. Timer counting down from [det_time].")
- addtimer(CALLBACK(src, .proc/prime), det_time*10)
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
// X4 is an upgraded directional variant of c4 which is relatively safe to be standing next to. And much less safe to be standing on the other side of.
// C4 is intended to be used for infiltration, and destroying tech. X4 is intended to be used for heavy breaching and tight spaces.
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 764bf8a61ccd..eb7422257d24 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -217,7 +217,7 @@
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "handcuff"
+ icon_state = "legcuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
flags_1 = CONDUCT_1
@@ -235,12 +235,23 @@
var/armed = 0
var/trap_damage = 20
+/obj/item/restraints/legcuffs/beartrap/goliath
+ name = "tentacle mass"
+ desc = "Ew."
+ icon_state = "goliathtrap"
+ flags_1 = NONE
+ slowdown = 10
+ breakouttime = 5 SECONDS
+ item_flags = DROPDEL
+ armed = 1
+ trap_damage = 0
+
/obj/item/restraints/legcuffs/beartrap/Initialize()
. = ..()
update_appearance()
var/static/list/loc_connections = list(
- COMSIG_ATOM_ENTERED = .proc/on_entered,
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
@@ -294,8 +305,8 @@
snap = FALSE
if(snap)
close_trap()
- L.visible_message("[L] triggers \the [src].", \
- "You trigger \the [src]!")
+ L.visible_message("[L] gets caught by \the [src]!", \
+ "You get caught by \the [src]!")
L.apply_damage(trap_damage, BRUTE, def_zone)
/obj/item/restraints/legcuffs/beartrap/energy
@@ -309,7 +320,7 @@
/obj/item/restraints/legcuffs/beartrap/energy/Initialize()
. = ..()
- addtimer(CALLBACK(src, .proc/dissipate), 100)
+ addtimer(CALLBACK(src, PROC_REF(dissipate)), 100)
/obj/item/restraints/legcuffs/beartrap/energy/proc/dissipate()
if(!ismob(loc))
@@ -393,18 +404,18 @@
item_state = "bola_r"
breakouttime = 300
slowdown = 0
- var/datum/status_effect/gonbolaPacify/effectReference
+ var/datum/status_effect/gonbola_pacify/effect_reference
/obj/item/restraints/legcuffs/bola/gonbola/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
if(iscarbon(hit_atom))
var/mob/living/carbon/C = hit_atom
- effectReference = C.apply_status_effect(STATUS_EFFECT_GONBOLAPACIFY)
+ effect_reference = C.apply_status_effect(/datum/status_effect/gonbola_pacify)
/obj/item/restraints/legcuffs/bola/gonbola/dropped(mob/user)
. = ..()
- if(effectReference)
- QDEL_NULL(effectReference)
+ if(effect_reference)
+ QDEL_NULL(effect_reference)
/obj/item/restraints/legcuffs/bola/watcher //tribal bola for tribal lizards
name = "watcher Bola"
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index a1612fd7c4dd..3ffcca22bf11 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -230,7 +230,7 @@
nullrod_icons += list(initial(rodtype.name) = image(icon = initial(rodtype.icon), icon_state = initial(rodtype.icon_state)))
nullrod_icons = sortList(nullrod_icons)
- var/choice = show_radial_menu(M, src , nullrod_icons, custom_check = CALLBACK(src, .proc/check_menu, M), radius = 42, require_near = TRUE)
+ var/choice = show_radial_menu(M, src , nullrod_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), M), radius = 42, require_near = TRUE)
if(!choice || !check_menu(M))
return
@@ -521,9 +521,9 @@
/obj/item/nullrod/scythe/talking/necro/attack(mob/living/target)
..()
- var/datum/status_effect/stacking/saw_bleed/B = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
+ var/datum/status_effect/stacking/saw_bleed/B = target.has_status_effect(/datum/status_effect/stacking/saw_bleed)
if(!B)
- target.apply_status_effect(STATUS_EFFECT_SAWBLEED,bleed_stacks_per_hit)
+ target.apply_status_effect(/datum/status_effect/stacking/saw_bleed,bleed_stacks_per_hit)
else
B.add_stacks(bleed_stacks_per_hit)
diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm
index 915c7e36cc90..e3f21a70463e 100644
--- a/code/game/objects/items/hot_potato.dm
+++ b/code/game/objects/items/hot_potato.dm
@@ -139,7 +139,7 @@
ADD_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT)
name = "primed [name]"
activation_time = timer + world.time
- detonation_timerid = addtimer(CALLBACK(src, .proc/detonate), delay, TIMER_STOPPABLE)
+ detonation_timerid = addtimer(CALLBACK(src, PROC_REF(detonate)), delay, TIMER_STOPPABLE)
START_PROCESSING(SSfastprocess, src)
if(user)
log_bomber(user, "has primed a", src, "for detonation (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range])")
diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm
index acfe971b0337..8dd464481a15 100644
--- a/code/game/objects/items/hourglass.dm
+++ b/code/game/objects/items/hourglass.dm
@@ -35,7 +35,7 @@
/obj/item/hourglass/proc/start()
finish_time = world.time + time
- timing_id = addtimer(CALLBACK(src, .proc/finish), time, TIMER_STOPPABLE)
+ timing_id = addtimer(CALLBACK(src, PROC_REF(finish)), time, TIMER_STOPPABLE)
countdown.start()
timing_animation()
diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm
index d225e7180db8..893721e7a49b 100644
--- a/code/game/objects/items/implants/implant_stealth.dm
+++ b/code/game/objects/items/implants/implant_stealth.dm
@@ -33,7 +33,7 @@
/obj/structure/closet/cardboard/agent/proc/reveal()
alpha = 255
- addtimer(CALLBACK(src, .proc/go_invisible), 10, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(go_invisible)), 10, TIMER_OVERRIDE|TIMER_UNIQUE)
/obj/structure/closet/cardboard/agent/Bump(atom/A)
. = ..()
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
index e8122bd34263..8247d02cb549 100644
--- a/code/game/objects/items/implants/implantchair.dm
+++ b/code/game/objects/items/implants/implantchair.dm
@@ -77,10 +77,10 @@
ready_implants--
if(!replenishing && auto_replenish)
replenishing = TRUE
- addtimer(CALLBACK(src,.proc/replenish),replenish_cooldown)
+ addtimer(CALLBACK(src, PROC_REF(replenish)),replenish_cooldown)
if(injection_cooldown > 0)
ready = FALSE
- addtimer(CALLBACK(src,.proc/set_ready),injection_cooldown)
+ addtimer(CALLBACK(src, PROC_REF(set_ready)),injection_cooldown)
else
playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, TRUE)
update_appearance()
@@ -158,23 +158,6 @@
if(auto_inject && ready && ready_implants > 0)
implant(user,null)
-/obj/machinery/implantchair/genepurge
- name = "Genetic purifier"
- desc = "Used to purge a human genome of foreign influences."
- special = TRUE
- special_name = "Purge genome"
- injection_cooldown = 0
- replenish_cooldown = 300
-
-/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user)
- if(!istype(H))
- return 0
- H.set_species(/datum/species/human, 1)//lizards go home
- H.purrbation_remove()//remove cats
- H.dna.remove_all_mutations()//hulks out
- return 1
-
-
/obj/machinery/implantchair/brainwash
name = "Neural Imprinter"
desc = "Used to indoctrinate rehabilitate hardened recidivists."
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index c0773b2032cf..da1906143abc 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -242,7 +242,7 @@
/obj/item/book/manual/trickwines_4_brewers
name = "Trickwines for brewers"
icon_state = "book2"
- author = "Baxter Baxter"
+ author = "Bridget Saint-Baskett"
title = "Trickwines for brewers"
dat = {"
@@ -262,7 +262,16 @@
Breakaway flasks
Honestly, I love these things. I'm not a scientist so I cant exactly explain how it works but somehow when you fuse plasma into glass it makes it ultra sharp and makes it really good for cracking over fauna heads.
The simplest way I have found of making them is crafting them with a chunk of glass, plasma, and a welder.
- I should note: trickwines don't seem to form without flasks. I think it's something to do with the plasma reacting with the mixture.
+
+ Bacteria
+ A speical speices of bacteria native to Illestren is what allows Trickwines form.
+ Now we use a special distiller that keeps just enough bacertia alive to ferment without turning the batch sour.
+ Now you should still have one on board but if you dont its fine.
+ It just so happens we have trees on board our ships host to the Bacteria.
+ To get enough Bacteria your going to need to feed it anything that would help a plant.
+ Water, Fertilizer, Ashwine are all good options.
+ Soon it will drops some apples and you can grind them for the bacteria.
+ Once you have enough you can fabricate it the same way you would a normal barrel.
Ashwine
It's kind of our trademark, and it's one of the simplest trickwines to make. The Montagnes love using this stuff in ceremonies as well so it should get you some good boy points.
@@ -285,11 +294,30 @@
It's a nice upper. Great if you're trying to run away.
This one's really flashy. Expect some severe burns on your target
-
Baxter Baxter, Senior Brewer
- P.S.: please stop asking how the uranium got into those flasks.
+ Hearthwine
+ I once threw back a flask of this stuff in the heat of a really bad battle and it sealed my wounds within seconds its honestly increadible.
+ It also acts like the inverse of Icewine heating you up more then a fever.
+ Last time I threw it at someone though i almost burnt down the forest I was in.
+ Its made out of ground up fireblossems with some nice hard cider and a bit of welding fuel with of course a ratio of 3:1:1.
-
- "}
+ Forcewine
+ I once had a duel with a wizard and and I was able to completly ignore a few of his spells! Its like they just fizzled out when they hit me.
+ Would recomend for any esoteric senarios even though I have only been in a few of those.
+ You can also use it to entrap Fauna inside of a forcefield like bubble, Gives you time to breath and laugh at them.
+ 3:1:1 Tequila, Space Montain Wind, and I know its strange but hollow water, Its that stuff you can extract from geysers
+
+ Prismwine
+ Gives you a nice shiny layer of armour, fire seems to have alot harder time sticking to me when i tested it.
+ Throwing it seeems to do the reverse acting like a magnifying glass to burns and lasers
+ Made 3:1:1 with good ol Gin, then add plasma and tinea luxor which is found from mushroom stems
+
+ Some of these can be a bit situatinal but its always nice to have a few in your bag for emergecys.
+ As a bonus, most of the other factions have no clue how to make these so you can sell them for a fair chunk of cash.
+
+
Bridget Saint-Baskett, Senior Brewer
+
+