mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 14:08:44 +01:00
removes var/ inside all procs (#19450)
* removes var/ inside all procs * . * ugh
This commit is contained in:
@@ -185,12 +185,12 @@ vorestation edit end */
|
||||
explosion(T, 0, 0, 1, 2)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user)
|
||||
/obj/structure/closet/crate/secure/loot/emag_act(remaining_charges, mob/user)
|
||||
if (locked)
|
||||
to_chat(user, span_notice("The crate unlocks!"))
|
||||
locked = 0
|
||||
|
||||
/obj/structure/closet/crate/secure/loot/proc/check_input(var/input)
|
||||
/obj/structure/closet/crate/secure/loot/proc/check_input(input)
|
||||
if(length(input) != codelen)
|
||||
return 0
|
||||
|
||||
|
||||
@@ -231,7 +231,7 @@
|
||||
update_icon()
|
||||
system_error("Resources depleted.")
|
||||
|
||||
/obj/machinery/mining/drill/attack_ai(var/mob/user as mob)
|
||||
/obj/machinery/mining/drill/attack_ai(mob/user as mob)
|
||||
return src.attack_hand(user)
|
||||
|
||||
/obj/machinery/mining/drill/attackby(obj/item/O as obj, mob/user as mob)
|
||||
@@ -366,7 +366,7 @@
|
||||
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/mining/drill/proc/system_error(var/error)
|
||||
/obj/machinery/mining/drill/proc/system_error(error)
|
||||
|
||||
if(error)
|
||||
src.visible_message(span_infoplain(span_bold("\The [src]") + " flashes a '[error]' warning."))
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
to_chat(usr, span_notice("\The [src] will [sediment_scan ? "no longer" : "now"] scan for reagents."))
|
||||
sediment_scan = !sediment_scan
|
||||
|
||||
/obj/item/mining_scanner/proc/ScanTurf(var/atom/target, var/mob/user)
|
||||
/obj/item/mining_scanner/proc/ScanTurf(atom/target, mob/user)
|
||||
var/list/metals = list(
|
||||
"surface minerals" = 0,
|
||||
"industrial metals" = 0,
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
ready_toggle(TRUE) // no? well, shit
|
||||
|
||||
/// toggles twohand. if forced is true, forces an unready state
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/proc/ready_toggle(var/forced = 0)
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/proc/ready_toggle(forced = 0)
|
||||
var/mob/living/M = loc
|
||||
if(istype(M) && forced == 0)
|
||||
if(M.can_wield_item(src) && src.is_held_twohanded(M))
|
||||
@@ -263,7 +263,7 @@
|
||||
else
|
||||
unwield(M)
|
||||
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/proc/wield(var/mob/living/M)
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/proc/wield(mob/living/M)
|
||||
name = initial(name)
|
||||
wielded = TRUE
|
||||
to_chat(M, span_notice("You ready [src]."))
|
||||
@@ -274,7 +274,7 @@
|
||||
M.put_in_inactive_hand(O)
|
||||
offhand = O
|
||||
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/proc/unwield(var/mob/living/M)
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/proc/unwield(mob/living/M)
|
||||
to_chat(M, span_notice("You unready [src]."))
|
||||
name = "[initial(name)] (unreadied)"
|
||||
wielded = FALSE
|
||||
@@ -353,7 +353,7 @@
|
||||
hammer_synced = null
|
||||
return ..()
|
||||
|
||||
/obj/item/projectile/destabilizer/on_impact(var/atom/A)
|
||||
/obj/item/projectile/destabilizer/on_impact(atom/A)
|
||||
if(ismineralturf(A))
|
||||
var/turf/simulated/mineral/M = A
|
||||
new /obj/effect/temp_visual/kinetic_blast(M)
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
return
|
||||
tgui_interact(user)
|
||||
|
||||
/obj/machinery/mineral/processing_unit_console/attackby(var/obj/item/I, var/mob/user)
|
||||
/obj/machinery/mineral/processing_unit_console/attackby(obj/item/I, mob/user)
|
||||
if(istype(I, /obj/item/card/id))
|
||||
if(!powered())
|
||||
return
|
||||
@@ -204,7 +204,7 @@
|
||||
if(src.output) break
|
||||
return
|
||||
|
||||
/obj/machinery/mineral/processing_unit/proc/toggle_speed(var/forced)
|
||||
/obj/machinery/mineral/processing_unit/proc/toggle_speed(forced)
|
||||
var/area/refinery_area = get_area(src)
|
||||
if(forced)
|
||||
speed_process = forced
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
|
||||
if(src.output) break
|
||||
|
||||
/obj/machinery/mineral/stacking_machine/proc/toggle_speed(var/forced)
|
||||
/obj/machinery/mineral/stacking_machine/proc/toggle_speed(forced)
|
||||
if(forced)
|
||||
speed_process = forced
|
||||
else
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
if(output)
|
||||
break
|
||||
|
||||
/obj/machinery/mineral/unloading_machine/proc/toggle_speed(var/forced)
|
||||
/obj/machinery/mineral/unloading_machine/proc/toggle_speed(forced)
|
||||
if(forced)
|
||||
speed_process = forced
|
||||
else
|
||||
|
||||
@@ -154,7 +154,7 @@
|
||||
var/datum/material/material
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
/obj/item/shovel/wood/Initialize(mapload, var/_mat)
|
||||
/obj/item/shovel/wood/Initialize(mapload, _mat)
|
||||
. = ..()
|
||||
material = get_material_by_name(_mat)
|
||||
if(!istype(material))
|
||||
|
||||
@@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
if(SSair)
|
||||
SSair.mark_for_update(src)
|
||||
|
||||
/turf/simulated/mineral/proc/get_cached_border(var/cache_id, var/direction, var/icon_file, var/icon_state, var/offset = 32)
|
||||
/turf/simulated/mineral/proc/get_cached_border(cache_id, direction, icon_file, icon_state, offset = 32)
|
||||
//Cache miss
|
||||
if(!GLOB.mining_overlay_cache["[cache_id]_[direction]"])
|
||||
var/image/new_cached_image = image(icon_state, dir = direction, layer = ABOVE_TURF_LAYER)
|
||||
@@ -221,7 +221,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
if(density && mineral)
|
||||
MineralSpread()
|
||||
|
||||
/turf/simulated/mineral/update_icon(var/update_neighbors, ignore_list)
|
||||
/turf/simulated/mineral/update_icon(update_neighbors, ignore_list)
|
||||
cut_overlays()
|
||||
|
||||
//We are a wall (why does this system work like this??)
|
||||
@@ -303,7 +303,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
new oretype(src)
|
||||
resources[ore] = 0
|
||||
|
||||
/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj) // only emitters for now
|
||||
/turf/simulated/mineral/bullet_act(obj/item/projectile/Proj) // only emitters for now
|
||||
if(Proj.excavation_amount)
|
||||
var/newDepth = excavation_level + Proj.excavation_amount // Used commonly below
|
||||
if(newDepth >= 200) // first, if the turf is completely drilled then don't bother checking for finds and just drill it
|
||||
@@ -548,7 +548,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
return attack_hand(user)
|
||||
|
||||
//THIS IS THE 'YOU HIT AN ARTIFACT AND ARE GOING TOO DEEP' PROC. This is NOT the 'you destroyed the turf' proc. For that, look at 'GetDrilled'
|
||||
/turf/simulated/mineral/proc/wreckfinds(var/destroy = FALSE)
|
||||
/turf/simulated/mineral/proc/wreckfinds(destroy = FALSE)
|
||||
if(!destroy) //nondestructive methods have a chance of letting you step away to not trash things
|
||||
if(prob(10)) //This is to keep you from just running into an artifact turf over and over and over and over while also keeping a small % chance to cause a small rock to drop if you truly accidentally went too deep.
|
||||
//Technically you CAN KEEP RUNNING INTO THE TILE but like, you're wasting so much time at that point. Just buy a pick set from the mining vendor.
|
||||
@@ -557,7 +557,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
finds.Remove(finds[1])
|
||||
artifact_debris()
|
||||
|
||||
/turf/simulated/mineral/proc/update_archeo_overlays(var/excavation_amount = 0)
|
||||
/turf/simulated/mineral/proc/update_archeo_overlays(excavation_amount = 0)
|
||||
var/updateIcon = 0
|
||||
|
||||
//archaeo overlays
|
||||
@@ -625,7 +625,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
GetDrilled(1)
|
||||
return
|
||||
|
||||
/turf/simulated/mineral/proc/GetDrilled(var/artifact_fail = 0)
|
||||
/turf/simulated/mineral/proc/GetDrilled(artifact_fail = 0)
|
||||
|
||||
if(!density)
|
||||
if(!sand_dug)
|
||||
@@ -669,7 +669,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
make_floor()
|
||||
update_icon(1)
|
||||
|
||||
/turf/simulated/mineral/proc/excavate_find(var/is_clean = 0, var/datum/find/F)
|
||||
/turf/simulated/mineral/proc/excavate_find(is_clean = 0, datum/find/F)
|
||||
//with skill and luck, players can cleanly extract finds
|
||||
//otherwise, they come out inside a chunk of rock
|
||||
geologic_data = new /datum/geosample(src)
|
||||
@@ -700,7 +700,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
|
||||
finds.Remove(F)
|
||||
|
||||
/turf/simulated/mineral/proc/artifact_debris(var/severity = 0)
|
||||
/turf/simulated/mineral/proc/artifact_debris(severity = 0)
|
||||
//cael's patented random limited drop componentized loot system!
|
||||
//sky's patented non-mischievious overhaul!
|
||||
|
||||
@@ -724,7 +724,7 @@ GLOBAL_LIST_EMPTY(mining_overlay_cache)
|
||||
if(7)
|
||||
new /obj/item/stack/material/uranium(src, rand(5,25))
|
||||
|
||||
/turf/simulated/mineral/proc/make_ore(var/rare_ore)
|
||||
/turf/simulated/mineral/proc/make_ore(rare_ore)
|
||||
if(mineral || ignore_mapgen || ignore_oregen)
|
||||
return
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
..()
|
||||
|
||||
/obj/item/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||
/obj/item/ore/attack_generic(mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||
if(user.handle_eat_minerals(src))
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
..()
|
||||
|
||||
@@ -388,7 +388,7 @@
|
||||
new_card.mine_points = 1000
|
||||
qdel(voucher)
|
||||
|
||||
/obj/machinery/mineral/equipment_vendor/proc/new_prize(var/name, var/path, var/cost) // Generic proc for adding new entries. Good for abusing for FUN and PROFIT.
|
||||
/obj/machinery/mineral/equipment_vendor/proc/new_prize(name, path, cost) // Generic proc for adding new entries. Good for abusing for FUN and PROFIT.
|
||||
if(!cost)
|
||||
cost = 100
|
||||
if(!path)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
icon_state = "resonator_u"
|
||||
fieldlimit = 5
|
||||
|
||||
/obj/item/resonator/proc/CreateResonance(var/target, var/creator)
|
||||
/obj/item/resonator/proc/CreateResonance(target, creator)
|
||||
var/turf/T = get_turf(target)
|
||||
if(locate(/obj/effect/resonance) in T)
|
||||
return
|
||||
@@ -114,7 +114,7 @@
|
||||
mouse_opacity = 0
|
||||
var/resonance_damage = 20
|
||||
|
||||
/obj/effect/resonance/Initialize(mapload, var/creator = null, var/timetoburst)
|
||||
/obj/effect/resonance/Initialize(mapload, creator = null, timetoburst)
|
||||
. = ..()
|
||||
// Start small and grow to big size as we are about to burst
|
||||
transform = matrix()*0.75
|
||||
@@ -122,7 +122,7 @@
|
||||
// Queue the actual bursting
|
||||
addtimer(CALLBACK(src, PROC_REF(burst), creator), timetoburst)
|
||||
|
||||
/obj/effect/resonance/proc/burst(var/creator = null)
|
||||
/obj/effect/resonance/proc/burst(creator = null)
|
||||
var/turf/T = get_turf(src)
|
||||
if(!T)
|
||||
return
|
||||
|
||||
@@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
return ret
|
||||
|
||||
/// Creates and shows to the user a preview of the pod's shape, like the admin load template verb does. However, this one shows valid deploy turfs in blue, and invalid turfs in red.
|
||||
/obj/item/survivalcapsule/proc/preview_template(var/mob/user, var/turf/deploy_turf, var/show_doors = FALSE)
|
||||
/obj/item/survivalcapsule/proc/preview_template(mob/user, turf/deploy_turf, show_doors = FALSE)
|
||||
if(!deploy_turf)
|
||||
return
|
||||
var/preview_render = list()
|
||||
@@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
user.client.images += preview_render
|
||||
return preview_render
|
||||
|
||||
/obj/item/survivalcapsule/proc/remove_preview(var/mob/user, var/list/preview_render, var/fade_time = 1 SECOND)
|
||||
/obj/item/survivalcapsule/proc/remove_preview(mob/user, list/preview_render, fade_time = 1 SECOND)
|
||||
if(fade_time > 0)
|
||||
for(var/image/I in preview_render)
|
||||
animate(I, alpha = 0, fade_time)
|
||||
@@ -105,10 +105,10 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
else
|
||||
delete_preview_render(user, preview_render)
|
||||
|
||||
/obj/item/survivalcapsule/proc/delete_preview_render(var/mob/user, var/list/preview_render)
|
||||
/obj/item/survivalcapsule/proc/delete_preview_render(mob/user, list/preview_render)
|
||||
user.client.images -= preview_render
|
||||
|
||||
/obj/item/survivalcapsule/proc/can_deploy(var/turf/deploy_location, var/turf/above_location)
|
||||
/obj/item/survivalcapsule/proc/can_deploy(turf/deploy_location, turf/above_location)
|
||||
var/status = template.check_deploy(deploy_location, is_ship)
|
||||
switch(status)
|
||||
//Not allowed due to /area technical reasons
|
||||
@@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
return TRUE
|
||||
|
||||
// First step: Warn and cancel deployment if necessary conditions aren't met. Otherwise generate smoke and wait a moment.
|
||||
/obj/item/survivalcapsule/proc/deploy_step_one(var/mob/user)
|
||||
/obj/item/survivalcapsule/proc/deploy_step_one(mob/user)
|
||||
var/turf/deploy_location = get_turf(src)
|
||||
// We might have moved since the last check, so we check again!
|
||||
if(!can_deploy(deploy_location, GetAbove(deploy_location)))
|
||||
@@ -145,7 +145,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
addtimer(CALLBACK(src, PROC_REF(deploy_step_two), user), 4 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
// Second step: Load shelter template at location
|
||||
/obj/item/survivalcapsule/proc/deploy_step_two(var/mob/user)
|
||||
/obj/item/survivalcapsule/proc/deploy_step_two(mob/user)
|
||||
var/turf/deploy_location = get_turf(src)
|
||||
var/turf/above_location = GetAbove(deploy_location)
|
||||
// We might have moved since the last check, so we check again!
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
banned_objects = list()
|
||||
|
||||
/// Checks all turfs within the area of the given deploy location to see if it is a valid shelter area.
|
||||
/datum/map_template/shelter/proc/check_deploy(turf/deploy_location, var/is_ship)
|
||||
/datum/map_template/shelter/proc/check_deploy(turf/deploy_location, is_ship)
|
||||
var/affected = get_affected_turfs(deploy_location, centered=TRUE)
|
||||
for(var/turf/T in affected)
|
||||
var/shelter_status = get_turf_deployability(T, is_ship)
|
||||
@@ -22,7 +22,7 @@
|
||||
return SHELTER_DEPLOY_ALLOWED
|
||||
|
||||
/// Checks a single given turf to see if it is a valid turf to deploy a shelter onto.
|
||||
/datum/map_template/shelter/proc/get_turf_deployability(var/turf/T, var/is_ship)
|
||||
/datum/map_template/shelter/proc/get_turf_deployability(turf/T, is_ship)
|
||||
var/area/A = get_area(T)
|
||||
if(is_type_in_typecache(A, banned_areas) || (A.flags & AREA_BLOCK_INSTANT_BUILDING))
|
||||
return SHELTER_DEPLOY_BAD_AREA
|
||||
|
||||
Reference in New Issue
Block a user