removes var/ inside all procs (#19450)

* removes var/ inside all procs

* .

* ugh
This commit is contained in:
Kashargul
2026-05-05 10:55:17 +02:00
committed by GitHub
parent 13162d13a2
commit 5926589c16
1987 changed files with 7376 additions and 7377 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effect/overmap/visitable/sector/Crossed(var/obj/effect/overmap/visitable/ship/enterer)
/obj/effect/overmap/visitable/sector/Crossed(obj/effect/overmap/visitable/ship/enterer)
. = ..()
if(istype(enterer))
for(var/mob/potential_mob as anything in GLOB.player_list)
+5 -5
View File
@@ -9,28 +9,28 @@
var/obj/effect/overmap/bluespace_rift/partner
var/paused
/obj/effect/overmap/bluespace_rift/Initialize(mapload, var/new_partner)
/obj/effect/overmap/bluespace_rift/Initialize(mapload, new_partner)
. = ..()
if(new_partner)
pair(new_partner)
/obj/effect/overmap/bluespace_rift/proc/pair(var/obj/effect/overmap/bluespace_rift/new_partner)
/obj/effect/overmap/bluespace_rift/proc/pair(obj/effect/overmap/bluespace_rift/new_partner)
if(istype(new_partner))
partner = new_partner
new_partner.partner = src
/obj/effect/overmap/bluespace_rift/proc/take_this(var/atom/movable/AM)
/obj/effect/overmap/bluespace_rift/proc/take_this(atom/movable/AM)
paused = TRUE
AM.forceMove(get_turf(src))
paused = FALSE
/obj/effect/overmap/bluespace_rift/Crossed(var/atom/movable/AM)
/obj/effect/overmap/bluespace_rift/Crossed(atom/movable/AM)
if(istype(AM, /obj/effect/overmap/visitable/ship) && !paused && partner)
partner.take_this(AM)
else
return ..()
/obj/effect/overmap/bluespace_rift/attack_ghost(var/mob/observer/dead/user)
/obj/effect/overmap/bluespace_rift/attack_ghost(mob/observer/dead/user)
if(!partner && check_rights_for(user?.client, R_HOLDER))
var/response = tgui_alert(user, "You appear to be staff. This rift has no exit point. If you want to make one, move to where you want it to go, and click 'Make Here', otherwise click 'Cancel'", "Bluespace Rift", list("Cancel","Make Here"))
if(response == "Make Here")
+2 -2
View File
@@ -15,7 +15,7 @@
var/max_name_len = 32 // Refuse if shuttle tag is longer than this.
var/max_area_turfs = 256 // Refuse if area has more than this many turfs.
/obj/item/champagne/afterattack(var/atom/A, mob/user, proximity)
/obj/item/champagne/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
var/obj/machinery/computer/shuttle_control/explore/comp = A
@@ -65,7 +65,7 @@
return TRUE
/obj/item/champagne/proc/create_landable_shuttle(var/shuttle_name, var/turf/start_loc, var/area/shuttle_area)
/obj/item/champagne/proc/create_landable_shuttle(shuttle_name, turf/start_loc, area/shuttle_area)
// First things first, create the starting location landmark.
// WARNING - We can't figure out a good base_area or base_turf from inspecttion, as the shuttle is already built!
// For now its going to just do world.area and z level base turf. Beware!
+11 -11
View File
@@ -5,7 +5,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
var/list/ship_events = list()
// Populates overmap with random events! Should be called once at startup at some point.
/datum/decl/overmap_event_handler/proc/create_events(var/z_level, var/overmap_size, var/number_of_events)
/datum/decl/overmap_event_handler/proc/create_events(z_level, overmap_size, number_of_events)
// Acquire the list of not-yet utilized overmap turfs on this Z-level
var/list/overmap_turfs = block(locate(OVERMAP_EDGE, OVERMAP_EDGE, z_level), locate(overmap_size - OVERMAP_EDGE, overmap_size - OVERMAP_EDGE, z_level))
var/list/candidate_turfs = list()
@@ -29,7 +29,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
qdel(datum_spawn)//idk help how do I do this better?
/datum/decl/overmap_event_handler/proc/acquire_event_turfs(var/number_of_turfs, var/distance_from_origin, var/list/candidate_turfs, var/continuous = TRUE)
/datum/decl/overmap_event_handler/proc/acquire_event_turfs(number_of_turfs, distance_from_origin, list/candidate_turfs, continuous = TRUE)
number_of_turfs = min(number_of_turfs, candidate_turfs.len)
candidate_turfs = candidate_turfs.Copy() // Not this proc's responsibility to adjust the given lists
@@ -52,7 +52,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
return selected_turfs
/datum/decl/overmap_event_handler/proc/get_random_neighbour(var/turf/origin_turf, var/list/candidate_turfs, var/continuous = TRUE, var/range)
/datum/decl/overmap_event_handler/proc/get_random_neighbour(turf/origin_turf, list/candidate_turfs, continuous = TRUE, range)
var/fitting_turfs
if(continuous)
fitting_turfs = origin_turf.CardinalTurfs(FALSE)
@@ -63,7 +63,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
if(T in candidate_turfs)
return T
/datum/decl/overmap_event_handler/proc/start_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)//make these accept both hazards or events
/datum/decl/overmap_event_handler/proc/start_hazard(obj/effect/overmap/visitable/ship/ship, obj/effect/overmap/event/hazard)//make these accept both hazards or events
if(!(ship in ship_events))
ship_events += ship
@@ -79,20 +79,20 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
E.victim = ship
LAZYADD(ship_events[ship], E)
/datum/decl/overmap_event_handler/proc/stop_hazard(var/obj/effect/overmap/visitable/ship/ship, var/obj/effect/overmap/event/hazard)
/datum/decl/overmap_event_handler/proc/stop_hazard(obj/effect/overmap/visitable/ship/ship, obj/effect/overmap/event/hazard)
for(var/event_type in hazard.events)
var/datum/event/E = is_event_active(ship, event_type, hazard.difficulty)
if(E)
E.kill()
LAZYREMOVE(ship_events[ship], E)
/datum/decl/overmap_event_handler/proc/is_event_active(var/ship, var/event_type, var/severity)
/datum/decl/overmap_event_handler/proc/is_event_active(ship, event_type, severity)
if(!ship_events[ship]) return
for(var/datum/event/E in ship_events[ship])
if(E.type == event_type && E.severity == severity)
return E
/datum/decl/overmap_event_handler/proc/on_turf_entered(var/turf/new_loc, var/obj/effect/overmap/visitable/ship/ship, var/old_loc)
/datum/decl/overmap_event_handler/proc/on_turf_entered(turf/new_loc, obj/effect/overmap/visitable/ship/ship, old_loc)
if(!istype(ship))
return
if(new_loc == old_loc)
@@ -101,7 +101,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
for(var/obj/effect/overmap/event/E in hazard_by_turf[new_loc])
start_hazard(ship, E)
/datum/decl/overmap_event_handler/proc/on_turf_exited(var/turf/old_loc, var/obj/effect/overmap/visitable/ship/ship, var/new_loc)
/datum/decl/overmap_event_handler/proc/on_turf_exited(turf/old_loc, obj/effect/overmap/visitable/ship/ship, new_loc)
if(!istype(ship))
return
if(new_loc == old_loc)
@@ -112,7 +112,7 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
continue // If new turf has the same event as well... keep it going!
stop_hazard(ship, E)
/datum/decl/overmap_event_handler/proc/update_hazards(var/turf/T)//catch all updater
/datum/decl/overmap_event_handler/proc/update_hazards(turf/T)//catch all updater
if(!istype(T))
return
@@ -138,12 +138,12 @@ GLOBAL_DATUM_INIT(overmap_event_handler, /datum/decl/overmap_event_handler, new)
for(var/obj/effect/overmap/event/E in active_hazards)
start_hazard(ship, E)
/datum/decl/overmap_event_handler/proc/is_event_in_turf(var/datum/event/E, var/turf/T)
/datum/decl/overmap_event_handler/proc/is_event_in_turf(datum/event/E, turf/T)
for(var/obj/effect/overmap/event/hazard in hazard_by_turf[T])
if((E in hazard.events) && E.severity == hazard.difficulty)
return TRUE
/datum/decl/overmap_event_handler/proc/is_event_included(var/list/hazards, var/obj/effect/overmap/event/E, var/equal_or_better)//this proc is only used so it can break out of 2 loops cleanly
/datum/decl/overmap_event_handler/proc/is_event_included(list/hazards, obj/effect/overmap/event/E, equal_or_better)//this proc is only used so it can break out of 2 loops cleanly
for(var/obj/effect/overmap/event/A in hazards)
if(istype(A, E.type) || istype(E, A.type))
if(same_entries(A.events, E.events))
+1 -1
View File
@@ -1,4 +1,4 @@
/proc/get_overmap_sector(var/z)
/proc/get_overmap_sector(z)
if(using_map.use_overmap)
return GLOB.map_sectors["[z]"]
else
+2 -2
View File
@@ -104,12 +104,12 @@
return dat
/obj/effect/overmap/Crossed(var/obj/effect/overmap/visitable/other)
/obj/effect/overmap/Crossed(obj/effect/overmap/visitable/other)
if(istype(other))
for(var/obj/effect/overmap/visitable/O in loc)
SSskybox.rebuild_skyboxes(O.map_z)
/obj/effect/overmap/Uncrossed(var/obj/effect/overmap/visitable/other)
/obj/effect/overmap/Uncrossed(obj/effect/overmap/visitable/other)
if(istype(other))
SSskybox.rebuild_skyboxes(other.map_z)
for(var/obj/effect/overmap/visitable/O in loc)
+2 -2
View File
@@ -10,7 +10,7 @@
category = /datum/shuttle/autodock/overmap
/datum/shuttle/autodock/overmap/New(var/_name, var/obj/effect/shuttle_landmark/start_waypoint)
/datum/shuttle/autodock/overmap/New(_name, obj/effect/shuttle_landmark/start_waypoint)
..(_name, start_waypoint)
refresh_fuel_ports_list()
@@ -54,7 +54,7 @@
var/distance_mod = get_dist(waypoint_sector(current_location),waypoint_sector(next_location))
return move_time * (1 + distance_mod)
/datum/shuttle/autodock/overmap/proc/set_destination(var/obj/effect/shuttle_landmark/A)
/datum/shuttle/autodock/overmap/proc/set_destination(obj/effect/shuttle_landmark/A)
if(A != current_location)
next_location = A
+3 -3
View File
@@ -104,7 +104,7 @@
//To be used by GMs and calling through var edits for the overmap object
//It causes the overmap object to "reinitialize" its real_appearance for known = FALSE objects
//Includes an argument that allows GMs/Admins to set a previously known sector to unknown. Set to any value except 0/False/Null to activate
/obj/effect/overmap/visitable/proc/gmtools_update_omobject_vars(var/setToHidden)
/obj/effect/overmap/visitable/proc/gmtools_update_omobject_vars(setToHidden)
real_appearance = image(real_icon, src, real_icon_state)
real_appearance.override = TRUE
if(setToHidden && known) //
@@ -215,7 +215,7 @@
else
generic_waypoints -= landmark
/obj/effect/overmap/visitable/proc/get_waypoints(var/shuttle_name)
/obj/effect/overmap/visitable/proc/get_waypoints(shuttle_name)
. = list()
for(var/obj/effect/overmap/visitable/contained in src)
. += contained.get_waypoints(shuttle_name)
@@ -252,7 +252,7 @@
icon_state = "sector"
anchored = TRUE
/obj/effect/overmap/visitable/sector/proc/announce_atc(var/atom/movable/AM, var/going = FALSE) //Base proc. Used for virgo3b at this time.
/obj/effect/overmap/visitable/sector/proc/announce_atc(atom/movable/AM, going = FALSE) //Base proc. Used for virgo3b at this time.
return
// Because of the way these are spawned, they will potentially have their invisibility adjusted by the turfs they are mapped on
// prior to being moved to the overmap. This blocks that. Use set_invisibility to adjust invisibility as needed instead.
@@ -22,7 +22,7 @@
// No need to do anything else in our power scheme.
// Defining directly here to avoid conflicts with existing set_broken procs in our codebase that behave differently.
/obj/machinery/atmospherics/unary/engine/proc/set_broken(var/new_state, var/cause)
/obj/machinery/atmospherics/unary/engine/proc/set_broken(new_state, cause)
if(!(stat & BROKEN) == !new_state)
return // Nothing changed
stat ^= BROKEN
@@ -33,7 +33,7 @@
// Compoenents
//
/obj/machinery/proc/total_component_rating_of_type(var/part_type)
/obj/machinery/proc/total_component_rating_of_type(part_type)
. = 0
for(var/thing in component_parts)
if(istype(thing, part_type))
@@ -65,7 +65,7 @@
// Return TRUE for handled.
// If you perform direct interactions in here, you are responsible for ensuring that full interactivity checks have been made (i.e CanInteract).
// The checks leading in to here only guarantee that the user should be able to view a UI.
/obj/machinery/computer/ship/proc/interface_interact(var/mob/user)
/obj/machinery/computer/ship/proc/interface_interact(mob/user)
tgui_interact(user)
return TRUE
+1 -1
View File
@@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(all_waypoints)
linked.accelerate(direction, accellimit)
return
/obj/machinery/computer/ship/helm/relaymove(var/mob/user, direction)
/obj/machinery/computer/ship/helm/relaymove(mob/user, direction)
if(viewing_overmap(user) && linked)
linked.relaymove(user, direction, accellimit)
return 1
@@ -196,7 +196,7 @@
else if(health < max_health * 0.75)
. += "It shows signs of damage!"
/obj/machinery/shipsensors/bullet_act(var/obj/item/projectile/Proj)
/obj/machinery/shipsensors/bullet_act(obj/item/projectile/Proj)
take_damage(Proj.get_structure_damage())
..()
+4 -4
View File
@@ -16,7 +16,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
linked = sector
return 1
/obj/machinery/computer/ship/proc/sync_linked(var/user = null)
/obj/machinery/computer/ship/proc/sync_linked(user = null)
var/obj/effect/overmap/visitable/ship/sector = get_overmap_sector(z)
if(!sector)
return
@@ -32,7 +32,7 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
if((. = .(candidate)))
return
/obj/machinery/computer/ship/proc/display_reconnect_dialog(var/mob/user, var/flavor)
/obj/machinery/computer/ship/proc/display_reconnect_dialog(mob/user, flavor)
var/datum/browser/popup = new (user, "[src]", "[src]")
if(viewing_overmap(user))
user.reset_perspective()
@@ -66,12 +66,12 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
// Management of mob view displacement. look to shift view to the ship on the overmap; unlook to shift back.
/obj/machinery/computer/ship/look(var/mob/user)
/obj/machinery/computer/ship/look(mob/user)
if(linked.real_appearance)
user.client?.images += linked.real_appearance
user.set_viewsize(world.view + extra_view)
/obj/machinery/computer/ship/unlook(var/mob/user)
/obj/machinery/computer/ship/unlook(mob/user)
if(linked && linked.real_appearance && user.client)
user.client.images -= linked.real_appearance
user.set_viewsize() // reset to default
@@ -4,7 +4,7 @@ Ships can now be hijacked!
/obj/machinery/computer/ship
var/hacked = 0 // Has been emagged, no access restrictions.
/obj/machinery/computer/ship/emag_act(var/remaining_charges, var/mob/user)
/obj/machinery/computer/ship/emag_act(remaining_charges, mob/user)
if (!hacked)
req_access = list()
req_one_access = list()
@@ -4,7 +4,7 @@
circuit = /obj/item/circuitboard/shuttle_console/explore
tgui_subtemplate = "ShuttleControlConsoleExploration"
/obj/machinery/computer/shuttle_control/explore/shuttlerich_tgui_data(var/datum/shuttle/autodock/overmap/shuttle)
/obj/machinery/computer/shuttle_control/explore/shuttlerich_tgui_data(datum/shuttle/autodock/overmap/shuttle)
. = ..()
if(istype(shuttle))
var/total_gas = 0
+2 -2
View File
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(ship_engines)
var/name = "ship engine"
var/obj/machinery/holder //actual engine object
/datum/ship_engine/New(var/obj/machinery/_holder)
/datum/ship_engine/New(obj/machinery/_holder)
..()
holder = _holder
GLOB.ship_engines += src
@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(ship_engines)
return 1
//Sets thrust limiter, a number between 0 and 1
/datum/ship_engine/proc/set_thrust_limit(var/new_limit)
/datum/ship_engine/proc/set_thrust_limit(new_limit)
return 1
/datum/ship_engine/proc/get_thrust_limit()
@@ -3,7 +3,7 @@
name = "gas thruster"
var/obj/machinery/atmospherics/unary/engine/nozzle
/datum/ship_engine/gas_thruster/New(var/obj/machinery/_holder)
/datum/ship_engine/gas_thruster/New(obj/machinery/_holder)
..()
nozzle = _holder
@@ -20,7 +20,7 @@
/datum/ship_engine/gas_thruster/burn()
return nozzle.thrust_burn()
/datum/ship_engine/gas_thruster/set_thrust_limit(var/new_limit)
/datum/ship_engine/gas_thruster/set_thrust_limit(new_limit)
nozzle.thrust_limit = new_limit
/datum/ship_engine/gas_thruster/get_thrust_limit()
@@ -189,7 +189,7 @@
light_color = "#ed9200"
anchored = TRUE
/obj/effect/engine_exhaust/Initialize(mapload, var/ndir, var/flame)
/obj/effect/engine_exhaust/Initialize(mapload, ndir, flame)
. = ..()
if(flame)
icon_state = "exhaust"
@@ -2,7 +2,7 @@
name = "ion thruster"
var/obj/machinery/ion_engine/thruster
/datum/ship_engine/ion/New(var/obj/machinery/_holder)
/datum/ship_engine/ion/New(obj/machinery/_holder)
..()
thruster = _holder
@@ -19,7 +19,7 @@
/datum/ship_engine/ion/burn()
return thruster.thrust_burn()
/datum/ship_engine/ion/set_thrust_limit(var/new_limit)
/datum/ship_engine/ion/set_thrust_limit(new_limit)
thruster.thrust_limit = new_limit
/datum/ship_engine/ion/get_thrust_limit()
+1 -1
View File
@@ -102,7 +102,7 @@
/obj/effect/shuttle_landmark/ship/is_valid(datum/shuttle/shuttle)
return (isnull(loc) || ..()) // If it doesn't exist yet, its clear
/obj/effect/shuttle_landmark/ship/create_warning_effect(var/datum/shuttle/shuttle)
/obj/effect/shuttle_landmark/ship/create_warning_effect(datum/shuttle/shuttle)
if(isnull(loc))
return
..()
+2 -2
View File
@@ -28,7 +28,7 @@
/obj/effect/overmap/visitable/sector/temporary/find_z_levels()
LAZYADD(map_z, using_map.get_empty_zlevel())
/obj/effect/overmap/visitable/sector/temporary/proc/is_empty(var/mob/observer)
/obj/effect/overmap/visitable/sector/temporary/proc/is_empty(mob/observer)
if(!LAZYLEN(map_z))
log_and_message_admins("CANARY: [src] tried to check is_empty, but map_z is `[map_z || "null"]`")
return TRUE
@@ -89,7 +89,7 @@
return FALSE
// return isnull(client) && !key && stat == DEAD // Allows bodies that players have ghosted from to be deleted - Ater
/proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A)
/proc/overmap_spacetravel(turf/space/T, atom/movable/A)
if (!T || !A)
return
+3 -3
View File
@@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(map_sectors)
wrap_buddy = null
return ..()
/turf/unsimulated/map/edge/Bumped(var/atom/movable/AM)
/turf/unsimulated/map/edge/Bumped(atom/movable/AM)
if(wrap_buddy?.map_is_to_my)
AM.forceMove(get_step(wrap_buddy, wrap_buddy.map_is_to_my))
else
@@ -80,12 +80,12 @@ GLOBAL_LIST_EMPTY(map_sectors)
add_overlay(I)
AddElement(/datum/element/turf_z_transparency)
/turf/unsimulated/map/Entered(var/atom/movable/O, var/atom/oldloc)
/turf/unsimulated/map/Entered(atom/movable/O, atom/oldloc)
..()
if(istype(O, /obj/effect/overmap/visitable/ship))
GLOB.overmap_event_handler.on_turf_entered(src, O, oldloc)
/turf/unsimulated/map/Exited(var/atom/movable/O, var/atom/newloc)
/turf/unsimulated/map/Exited(atom/movable/O, atom/newloc)
..()
if(istype(O, /obj/effect/overmap/visitable/ship))
GLOB.overmap_event_handler.on_turf_exited(src, O, newloc)