diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index fcc81509c88..9e454ed6d68 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -2,7 +2,7 @@ Contains helper procs for airflow, handled in /connection_group. */ -/mob/var/tmp/last_airflow_stun = 0 +/mob/var/last_airflow_stun = 0 /mob/proc/airflow_stun() if(stat == 2) return 0 @@ -64,10 +64,10 @@ Contains helper procs for airflow, handled in /connection_group. else if(n < vsc.airflow_dense_pressure) return 0 -/atom/movable/var/tmp/turf/airflow_dest -/atom/movable/var/tmp/airflow_speed = 0 -/atom/movable/var/tmp/airflow_time = 0 -/atom/movable/var/tmp/last_airflow = 0 +/atom/movable/var/turf/airflow_dest +/atom/movable/var/airflow_speed = 0 +/atom/movable/var/airflow_time = 0 +/atom/movable/var/last_airflow = 0 /atom/movable/proc/AirflowCanMove(n) return 1 diff --git a/code/ZAS/ConnectionManager.dm b/code/ZAS/ConnectionManager.dm index 3890cd85f5c..30f71d1680b 100644 --- a/code/ZAS/ConnectionManager.dm +++ b/code/ZAS/ConnectionManager.dm @@ -34,7 +34,7 @@ Macros: // macro-ized to cut down on proc calls #define check(c) (c && c.valid()) -/turf/var/tmp/connection_manager/connections +/turf/var/connection_manager/connections /connection_manager/var/connection/N /connection_manager/var/connection/S diff --git a/code/ZAS/Debug.dm b/code/ZAS/Debug.dm index 5d8af083658..7f16b34978d 100644 --- a/code/ZAS/Debug.dm +++ b/code/ZAS/Debug.dm @@ -9,7 +9,7 @@ var/global/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark") /connection_edge/var/dbg_out = 0 -/turf/var/tmp/dbg_img +/turf/var/dbg_img /turf/proc/dbg(image/img, d = 0) if(d > 0) img.dir = d cut_overlay(dbg_img) @@ -17,4 +17,4 @@ var/global/image/mark = image('icons/Testing/Zone.dmi', icon_state = "mark") dbg_img = img /proc/soft_assert(thing,fail) - if(!thing) message_admins(fail) \ No newline at end of file + if(!thing) message_admins(fail) diff --git a/code/controllers/subsystems/ai.dm b/code/controllers/subsystems/ai.dm index 870f76bcfce..7708b596810 100644 --- a/code/controllers/subsystems/ai.dm +++ b/code/controllers/subsystems/ai.dm @@ -6,10 +6,10 @@ SUBSYSTEM_DEF(ai) wait = 2 SECONDS /// The list of AI datums to be processed. - var/static/tmp/list/queue = list() + var/static/list/queue = list() /// The list of AI datums currently being processed. - var/static/tmp/list/current = list() + var/static/list/current = list() /datum/controller/subsystem/ai/stat_entry(msg_prefix) diff --git a/code/controllers/subsystems/aifast.dm b/code/controllers/subsystems/aifast.dm index 7859e8e6798..e668302beff 100644 --- a/code/controllers/subsystems/aifast.dm +++ b/code/controllers/subsystems/aifast.dm @@ -6,10 +6,10 @@ SUBSYSTEM_DEF(aifast) wait = 0.25 SECONDS /// The list of AI datums to be processed. - var/static/tmp/list/queue = list() + var/static/list/queue = list() /// The list of AI datums currently being processed. - var/static/tmp/list/current = list() + var/static/list/current = list() /datum/controller/subsystem/aifast/stat_entry(msg_prefix) diff --git a/code/controllers/subsystems/airflow.dm b/code/controllers/subsystems/airflow.dm index c4d8d554b4b..791fdda7fe9 100644 --- a/code/controllers/subsystems/airflow.dm +++ b/code/controllers/subsystems/airflow.dm @@ -101,11 +101,11 @@ SUBSYSTEM_DEF(airflow) #undef CLEAR_OBJECT /atom/movable - var/tmp/airflow_xo - var/tmp/airflow_yo - var/tmp/airflow_od - var/tmp/airflow_process_delay - var/tmp/airflow_skip_speedcheck + var/airflow_xo + var/airflow_yo + var/airflow_od + var/airflow_process_delay + var/airflow_skip_speedcheck /atom/movable/proc/prepare_airflow(n) if (!airflow_dest || airflow_speed < 0 || last_airflow > world.time - vsc.airflow_delay) diff --git a/code/controllers/subsystems/alarm.dm b/code/controllers/subsystems/alarm.dm index 9dc14a741b4..2de43e74078 100644 --- a/code/controllers/subsystems/alarm.dm +++ b/code/controllers/subsystems/alarm.dm @@ -5,13 +5,13 @@ SUBSYSTEM_DEF(alarm) init_order = INIT_ORDER_ALARM /// The list of alarm handlers this subsystem processes - var/static/tmp/list/datum/alarm_handler/handlers + var/static/list/datum/alarm_handler/handlers /// The list of alarm handlers currently being processed - var/static/tmp/list/current = list() + var/static/list/current = list() /// The list of active alarms - var/static/tmp/list/active = list() + var/static/list/active = list() /datum/controller/subsystem/alarm/Initialize(timeofday) diff --git a/code/controllers/subsystems/events.dm b/code/controllers/subsystems/events.dm index 50fae383cf3..ef291e18cf1 100644 --- a/code/controllers/subsystems/events.dm +++ b/code/controllers/subsystems/events.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(events) name = "Events (Legacy)" wait = 2 SECONDS - var/tmp/list/currentrun = null + var/list/currentrun = null var/list/datum/event/active_events = list() var/list/datum/event/finished_events = list() diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm index d05f8c10f78..123920c6f13 100644 --- a/code/controllers/subsystems/inactivity.dm +++ b/code/controllers/subsystems/inactivity.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(inactivity) name = "Inactivity" wait = 60 SECONDS flags = SS_NO_INIT | SS_BACKGROUND - var/tmp/list/client_list + var/list/client_list var/number_kicked = 0 /datum/controller/subsystem/inactivity/fire(resumed, no_mc_tick) diff --git a/code/controllers/subsystems/overlays.dm b/code/controllers/subsystems/overlays.dm index a9eb3c4e26d..58e2753957a 100644 --- a/code/controllers/subsystems/overlays.dm +++ b/code/controllers/subsystems/overlays.dm @@ -6,16 +6,16 @@ SUBSYSTEM_DEF(overlays) init_order = INIT_ORDER_OVERLAY /// The queue of atoms that need overlay updates. - var/static/tmp/list/queue = list() + var/static/list/queue = list() /// A list([icon] = list([state] = [appearance], ...), ...) cache of appearances. - var/static/tmp/list/state_cache = list() + var/static/list/state_cache = list() /// A list([icon] = [appearance], ...) cache of appearances. - var/static/tmp/list/icon_cache = list() + var/static/list/icon_cache = list() /// The number of appearances currently cached. - var/static/tmp/cache_size = 0 + var/static/cache_size = 0 /datum/controller/subsystem/overlays/Recover() diff --git a/code/controllers/subsystems/radiation.dm b/code/controllers/subsystems/radiation.dm index 58925d82f47..85ce8909f2b 100644 --- a/code/controllers/subsystems/radiation.dm +++ b/code/controllers/subsystems/radiation.dm @@ -7,9 +7,9 @@ SUBSYSTEM_DEF(radiation) var/list/sources_assoc = list() // Sources indexed by turf for de-duplication. var/list/resistance_cache = list() // Cache of turf's radiation resistance. - var/tmp/list/current_sources = list() - var/tmp/list/current_res_cache = list() - var/tmp/list/listeners = list() + var/list/current_sources = list() + var/list/current_res_cache = list() + var/list/listeners = list() /datum/controller/subsystem/radiation/fire(resumed, no_mc_tick) if (!resumed) diff --git a/code/controllers/subsystems/shuttles.dm b/code/controllers/subsystems/shuttles.dm index ccc64bbe2ef..ae031be7151 100644 --- a/code/controllers/subsystems/shuttles.dm +++ b/code/controllers/subsystems/shuttles.dm @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(shuttles) var/list/sectors_to_initialize // Used to find all sector objects at the appropriate time. var/block_init_queue = TRUE // Block initialization of new shuttles/sectors - var/tmp/list/current_run // Shuttles remaining to process this fire() tick + var/list/current_run // Shuttles remaining to process this fire() tick /datum/controller/subsystem/shuttles/OnNew() global.shuttle_controller = src // TODO - Remove this! Change everything to point at SSshuttles instead diff --git a/code/controllers/subsystems/tgui.dm b/code/controllers/subsystems/tgui.dm index 51fb7865c54..90e552fdafb 100644 --- a/code/controllers/subsystems/tgui.dm +++ b/code/controllers/subsystems/tgui.dm @@ -6,16 +6,16 @@ SUBSYSTEM_DEF(tgui) runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT /// The current queue of UIs to be processed - var/static/tmp/list/current = list() + var/static/list/current = list() /// The whole set of open UIs - var/static/tmp/list/open_uis = list() + var/static/list/open_uis = list() /// The whole set of open UIs as ("\ref[owner]" = /datum/tgui?) - var/static/tmp/list/open_uis_by_src = list() + var/static/list/open_uis_by_src = list() /// The template document used by all tgui instances - var/static/tmp/base_html + var/static/base_html /datum/controller/subsystem/tgui/Recover() @@ -346,4 +346,4 @@ SUBSYSTEM_DEF(tgui) target.tgui_open_uis.Add(ui) // Clear the old list. source.tgui_open_uis.Cut() - return TRUE \ No newline at end of file + return TRUE diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 21e9c247e7f..3a61bff21e2 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -14,8 +14,8 @@ var/datum_flags = EMPTY_BITFIELD #ifdef TESTING - var/tmp/running_find_references - var/tmp/last_find_references = 0 + var/running_find_references + var/last_find_references = 0 #endif // Default implementation of clean-up code. diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 781103d1006..5d451222127 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -7,7 +7,7 @@ name="beam" icon='icons/effects/beam.dmi' icon_state="b_beam" - var/tmp/atom/BeamSource + var/atom/BeamSource /obj/effect/overlay/beam/Initialize() . = ..() @@ -111,7 +111,7 @@ pixel_x = -32 pixel_y = -32 -// For skathari empress' telegrab warning, could replace down the line. +// For skathari empress' telegrab warning, could replace down the line. /obj/effect/overlay/skathari_telegrab name = "bluespace displacement" desc = "An eerie field of bluespace energy, you might want to run!" @@ -119,7 +119,7 @@ icon_state = "emfield_s3" alpha = 100 pixel_x = -32 - pixel_y = -16 /// Line up with the big sprite that spawns it! + pixel_y = -16 /// Line up with the big sprite that spawns it! plane = MOB_PLANE layer = BELOW_MOB_LAYER @@ -128,4 +128,4 @@ plane = FLOAT_PLANE layer = FLOAT_LAYER vis_flags = VIS_INHERIT_ID - appearance_flags = KEEP_TOGETHER | LONG_GLIDE | PIXEL_SCALE \ No newline at end of file + appearance_flags = KEEP_TOGETHER | LONG_GLIDE | PIXEL_SCALE diff --git a/code/game/periodic_news.dm b/code/game/periodic_news.dm index a3d89313c53..fd5999e36ee 100644 --- a/code/game/periodic_news.dm +++ b/code/game/periodic_news.dm @@ -107,7 +107,7 @@ var/global/list/newscaster_standard_feeds = list(/datum/news_announcement/bluesp /proc/process_newscaster() check_for_newscaster_updates(ticker.mode.newscaster_announcements) -var/global/tmp/announced_news_types = list() +var/global/announced_news_types = list() /proc/check_for_newscaster_updates(type) for(var/subtype in typesof(type)-type) var/datum/news_announcement/news = new subtype() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 2b2b91ee7a7..7c6f27a19c0 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -34,7 +34,7 @@ var/block_tele = FALSE // If true, most forms of teleporting to or from this turf tile will fail. var/can_build_into_floor = FALSE // Used for things like RCDs (and maybe lattices/floor tiles in the future), to see if a floor should replace it. var/list/dangerous_objects // List of 'dangerous' objs that the turf holds that can cause something bad to happen when stepped on, used for AI mobs. - var/tmp/changing_turf + var/changing_turf /turf/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/under/accessories/xeno/teshari.dm b/code/modules/clothing/under/accessories/xeno/teshari.dm index 9156f184d3d..8a9cb210890 100644 --- a/code/modules/clothing/under/accessories/xeno/teshari.dm +++ b/code/modules/clothing/under/accessories/xeno/teshari.dm @@ -32,9 +32,9 @@ 'sound/misc/dingaling3.ogg', 'sound/misc/dingaling4.ogg' ) - var/tmp/dingaling_volume = 260 - var/tmp/dingaling_chance = 30 - var/tmp/dingaling_vary = FALSE + var/dingaling_volume = 260 + var/dingaling_chance = 30 + var/dingaling_vary = FALSE /obj/item/clothing/accessory/teshtail/bells/is_mob_movement_sensitive() return TRUE @@ -83,4 +83,4 @@ /obj/item/clothing/accessory/teshtail/plumage name = "artifical tailplume" desc = "A set of tied together tail feathers for a teshari that has lost their real ones. Often used with prosthetic tails." - icon_state = "tailplume" \ No newline at end of file + icon_state = "tailplume" diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index b7040258de6..b8267ae3472 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -3,8 +3,8 @@ startWhen = 30 // 1 minute endWhen = 60 // Set in setup() has_skybox_image = TRUE - var/tmp/lightning_color - var/tmp/list/valid_apcs // List of valid APCs. + var/lightning_color + var/list/valid_apcs // List of valid APCs. /datum/event/electrical_storm/get_skybox_image() if(!lightning_color) @@ -62,4 +62,4 @@ // Overmap version /datum/event/electrical_storm/overmap/announce() - return \ No newline at end of file + return diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 2a9fe3d2054..36d87e9d600 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -2,7 +2,7 @@ // Tracks precooked food to stop deep fried baked grilled grilled grilled Diona nymph cereal. /obj/item/reagent_containers/food/snacks - var/tmp/list/cooked = list() + var/list/cooked = list() // Root type for cooking machines. See following files for specific implementations. /obj/machinery/appliance diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index ec72e529029..d8aa4f435e5 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -17,9 +17,9 @@ var/global/total_lighting_sources = 0 var/lum_b // The lumcount values used to apply the light. - var/tmp/applied_lum_r - var/tmp/applied_lum_g - var/tmp/applied_lum_b + var/applied_lum_r + var/applied_lum_g + var/applied_lum_b var/list/datum/lighting_corner/effect_str // List used to store how much we're affecting corners. var/list/turf/affecting_turfs diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index dcd8b902af7..58dcbb598b8 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -2,12 +2,12 @@ var/dynamic_lighting = TRUE // Does the turf use dynamic lighting? luminosity = 1 - var/tmp/lighting_corners_initialised = FALSE + var/lighting_corners_initialised = FALSE - var/tmp/list/datum/light_source/affecting_lights // List of light sources affecting this turf. - var/tmp/atom/movable/lighting_overlay/lighting_overlay // Our lighting overlay. - var/tmp/list/datum/lighting_corner/corners - var/tmp/has_opaque_atom = FALSE // Not to be confused with opacity, this will be TRUE if there's any opaque atom on the tile. + var/list/datum/light_source/affecting_lights // List of light sources affecting this turf. + var/atom/movable/lighting_overlay/lighting_overlay // Our lighting overlay. + var/list/datum/lighting_corner/corners + var/has_opaque_atom = FALSE // Not to be confused with opacity, this will be TRUE if there's any opaque atom on the tile. // Causes any affecting light sources to be queued for a visibility update, for example a door got opened. /turf/proc/reconsider_lights() diff --git a/code/modules/maps/swapmaps.dm b/code/modules/maps/swapmaps.dm index 9ff14e5505d..7a52fab5b11 100644 --- a/code/modules/maps/swapmaps.dm +++ b/code/modules/maps/swapmaps.dm @@ -134,8 +134,8 @@ swapmap var/x2 // maximum x,y,z coords (also used as width,height,depth until positioned) var/y2 var/z2 - var/tmp/locked // don't move anyone to this map; it's saving or loading - var/tmp/mode // save as text-mode + var/locked // don't move anyone to this map; it's saving or loading + var/mode // save as text-mode var/ischunk // tells the load routine to load to the specified location New(_id,x,y,z) diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm index db4c8dd97db..9dc8e7de9a4 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm @@ -24,10 +24,10 @@ var/has_had_player = FALSE var/const/platform_respawn_time = 3 MINUTES - var/tmp/last_recharge_state = FALSE - var/tmp/recharge_complete = FALSE - var/tmp/recharger_charge_amount = 10 KILOWATTS - var/tmp/recharger_tick_cost = 80 KILOWATTS + var/last_recharge_state = FALSE + var/recharge_complete = FALSE + var/recharger_charge_amount = 10 KILOWATTS + var/recharger_tick_cost = 80 KILOWATTS var/weakref/recharging /mob/living/silicon/robot/platform/Login() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka.dm index 5aebefb2cae..bb00010ae61 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka/grafadreka.dm @@ -73,12 +73,12 @@ You can eat glowing tree fruit to fuel your ranged spitting attack and