[role_text]:"
var/extra = get_extra_panel_options(player)
@@ -17,7 +17,7 @@
/datum/antagonist/proc/get_extra_panel_options()
return
-/datum/antagonist/proc/get_check_antag_output(var/datum/admins/requester)
+/datum/antagonist/proc/get_check_antag_output(datum/admins/requester)
if(!current_antagonists || !current_antagonists.len)
return ""
@@ -57,5 +57,5 @@
return dat
//Overridden elsewhere.
-/datum/antagonist/proc/get_additional_check_antag_output(var/datum/admins/requester)
+/datum/antagonist/proc/get_additional_check_antag_output(datum/admins/requester)
return ""
diff --git a/code/game/antagonist/antagonist_place.dm b/code/game/antagonist/antagonist_place.dm
index 99ba23b612..2d63e2d38f 100644
--- a/code/game/antagonist/antagonist_place.dm
+++ b/code/game/antagonist/antagonist_place.dm
@@ -20,7 +20,7 @@
GLOB.command_announcement.Announce("[spawn_announcement]", "[spawn_announcement_title ? spawn_announcement_title : "Priority Alert"]")
return
-/datum/antagonist/proc/place_mob(var/mob/living/mob)
+/datum/antagonist/proc/place_mob(mob/living/mob)
if(!starting_locations || !starting_locations.len)
return
var/turf/T = pick_mobless_turf_if_exists(starting_locations)
diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm
index fbd01206c1..9587da6cb7 100644
--- a/code/game/antagonist/antagonist_print.dm
+++ b/code/game/antagonist/antagonist_print.dm
@@ -40,7 +40,7 @@
// Display the results.
to_chat(world, text)
-/datum/antagonist/proc/print_objective(var/datum/objective/O, var/num, var/append_success)
+/datum/antagonist/proc/print_objective(datum/objective/O, num, append_success)
var/text = "
" + span_bold("Objective [num]:") + " [O.explanation_text] "
if(append_success)
if(O.check_completion())
@@ -49,7 +49,7 @@
text += span_red("Fail.")
return text
-/datum/antagonist/proc/print_player_lite(var/datum/mind/ply)
+/datum/antagonist/proc/print_player_lite(datum/mind/ply)
var/role = ply.assigned_role ? "\improper[ply.assigned_role]" : "\improper[ply.special_role]"
var/text = "
" + span_bold("[ply.name]") + " (" + span_bold("[ply.key]") + ") as " + span_bold("\a [role]") + " ("
if(ply.current)
@@ -67,7 +67,7 @@
return text
-/datum/antagonist/proc/print_player_full(var/datum/mind/ply)
+/datum/antagonist/proc/print_player_full(datum/mind/ply)
var/text = print_player_lite(ply)
var/TC_uses = FALSE
@@ -85,7 +85,7 @@
return text
-/proc/get_uplink_purchases(var/datum/mind/M)
+/proc/get_uplink_purchases(datum/mind/M)
var/list/refined_log = new()
for(var/datum/uplink_item/UI in M.purchase_log)
refined_log.Add("[M.purchase_log[UI]]x[UI.log_icon()][UI.name]")
diff --git a/code/game/antagonist/antagonist_update.dm b/code/game/antagonist/antagonist_update.dm
index db8183326e..598631592f 100644
--- a/code/game/antagonist/antagonist_update.dm
+++ b/code/game/antagonist/antagonist_update.dm
@@ -2,7 +2,7 @@
if(!leader && current_antagonists.len && (flags & ANTAG_HAS_LEADER))
leader = current_antagonists[1]
-/datum/antagonist/proc/update_antag_mob(var/datum/mind/player, var/preserve_appearance)
+/datum/antagonist/proc/update_antag_mob(datum/mind/player, preserve_appearance)
// Get the mob.
if((flags & ANTAG_OVERRIDE_MOB) && (!player.current || (mob_path && !istype(player.current, mob_path))))
@@ -18,18 +18,18 @@
H.change_appearance(APPEARANCE_ALL, H, species_whitelist = valid_species, state = GLOB.tgui_self_state)
return player.current
-/datum/antagonist/proc/update_access(var/mob/living/player)
+/datum/antagonist/proc/update_access(mob/living/player)
for(var/obj/item/card/id/id in player.contents)
player.set_id_info(id)
-/datum/antagonist/proc/clear_indicators(var/datum/mind/recipient)
+/datum/antagonist/proc/clear_indicators(datum/mind/recipient)
if(!recipient.current || !recipient.current.client)
return
for(var/image/I in recipient.current.client.images)
if(I.icon_state == antag_indicator || (faction_indicator && I.icon_state == faction_indicator))
qdel(I)
-/datum/antagonist/proc/get_indicator(var/datum/mind/recipient, var/datum/mind/other)
+/datum/antagonist/proc/get_indicator(datum/mind/recipient, datum/mind/other)
if(!antag_indicator || !other.current || !recipient.current)
return
var/indicator = (faction_indicator && (other in faction_members)) ? faction_indicator : antag_indicator
@@ -48,7 +48,7 @@
if(antag.current && antag.current.client)
antag.current.client.images |= get_indicator(antag, other_antag)
-/datum/antagonist/proc/update_icons_added(var/datum/mind/player)
+/datum/antagonist/proc/update_icons_added(datum/mind/player)
if(!antag_indicator || !player.current)
return
spawn(0)
@@ -64,7 +64,7 @@
if(player.current.client)
player.current.client.images |= get_indicator(player, antag)
-/datum/antagonist/proc/update_icons_removed(var/datum/mind/player)
+/datum/antagonist/proc/update_icons_removed(datum/mind/player)
if(!antag_indicator || !player.current)
return
spawn(0)
diff --git a/code/game/antagonist/outsider/commando.dm b/code/game/antagonist/outsider/commando.dm
index 3ca72ad54d..dd7e83be23 100644
--- a/code/game/antagonist/outsider/commando.dm
+++ b/code/game/antagonist/outsider/commando.dm
@@ -19,7 +19,7 @@ GLOBAL_DATUM(commandos, /datum/antagonist/deathsquad/mercenary)
..(1)
GLOB.commandos = src
-/datum/antagonist/deathsquad/mercenary/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/deathsquad/mercenary/equip(mob/living/carbon/human/player)
player.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(player), slot_w_uniform)
player.equip_to_slot_or_del(new /obj/item/gun/projectile/silenced(player), slot_belt)
diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm
index d3cb4f0f21..03125473a0 100644
--- a/code/game/antagonist/outsider/deathsquad.dm
+++ b/code/game/antagonist/outsider/deathsquad.dm
@@ -19,7 +19,7 @@ GLOBAL_DATUM(deathsquad, /datum/antagonist/deathsquad)
var/deployed = 0
-/datum/antagonist/deathsquad/New(var/no_reference)
+/datum/antagonist/deathsquad/New(no_reference)
..()
if(!no_reference)
GLOB.deathsquad = src
@@ -28,7 +28,7 @@ GLOBAL_DATUM(deathsquad, /datum/antagonist/deathsquad)
if(..())
deployed = 1
-/datum/antagonist/deathsquad/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/deathsquad/equip(mob/living/carbon/human/player)
if(!..())
return
@@ -58,7 +58,7 @@ GLOBAL_DATUM(deathsquad, /datum/antagonist/deathsquad)
id.icon_state = "centcom"
create_radio(DTH_FREQ, player)
-/datum/antagonist/deathsquad/update_antag_mob(var/datum/mind/player)
+/datum/antagonist/deathsquad/update_antag_mob(datum/mind/player)
..()
diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm
index 6934073901..85dd8868fd 100644
--- a/code/game/antagonist/outsider/ert.dm
+++ b/code/game/antagonist/outsider/ert.dm
@@ -29,7 +29,7 @@ GLOBAL_DATUM(ert, /datum/antagonist/ert)
can_hear_aooc = FALSE // They're the good guys.
can_speak_aooc = FALSE // Just in case the above var bugs, or gets touched.
-/datum/antagonist/ert/create_default(var/mob/source)
+/datum/antagonist/ert/create_default(mob/source)
var/mob/living/carbon/human/M = ..()
if(istype(M)) M.age = rand(25,45)
@@ -37,13 +37,13 @@ GLOBAL_DATUM(ert, /datum/antagonist/ert)
..()
GLOB.ert = src
-/datum/antagonist/ert/greet(var/datum/mind/player)
+/datum/antagonist/ert/greet(datum/mind/player)
if(!..())
return
to_chat(player.current, "The Emergency Response Team works for Asset Protection; your job is to protect [using_map.company_name]'s ass-ets. There is a code red alert on [station_name()], you are tasked to go and fix the problem.")
to_chat(player.current, "You should first gear up and discuss a plan with your team. More members may be joining, don't move out before you're ready.")
-/datum/antagonist/ert/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/ert/equip(mob/living/carbon/human/player)
//Special radio setup
player.equip_to_slot_or_del(new /obj/item/radio/headset/ert(src), slot_l_ear)
diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm
index 80ae3da3cf..31ed703b25 100644
--- a/code/game/antagonist/outsider/mercenary.dm
+++ b/code/game/antagonist/outsider/mercenary.dm
@@ -30,7 +30,7 @@ GLOBAL_DATUM(mercs, /datum/antagonist/mercenary)
global_objectives |= new /datum/objective/nuclear
return 1
-/datum/antagonist/mercenary/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/mercenary/equip(mob/living/carbon/human/player)
if(!..())
return 0
diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm
index 2505af2697..78ee1a2ef1 100644
--- a/code/game/antagonist/outsider/ninja.dm
+++ b/code/game/antagonist/outsider/ninja.dm
@@ -25,7 +25,7 @@ GLOBAL_DATUM(ninjas, /datum/antagonist/ninja)
/datum/antagonist/ninja/attempt_random_spawn()
if(CONFIG_GET(flag/ninjas_allowed)) ..()
-/datum/antagonist/ninja/create_objectives(var/datum/mind/ninja)
+/datum/antagonist/ninja/create_objectives(datum/mind/ninja)
if(!..())
return
@@ -74,7 +74,7 @@ GLOBAL_DATUM(ninjas, /datum/antagonist/ninja)
ninja_objective.owner = ninja
ninja.objectives += ninja_objective
-/datum/antagonist/ninja/greet(var/datum/mind/player)
+/datum/antagonist/ninja/greet(datum/mind/player)
if(!..())
return 0
@@ -82,7 +82,7 @@ GLOBAL_DATUM(ninjas, /datum/antagonist/ninja)
player.store_memory(span_bold("Directive:") + " " + span_danger("[directive]") + "
")
to_chat(player, span_bold("Remember your directive:") + " [directive].")
-/datum/antagonist/ninja/update_antag_mob(var/datum/mind/player)
+/datum/antagonist/ninja/update_antag_mob(datum/mind/player)
..()
var/ninja_title = pick(GLOB.ninja_titles)
var/ninja_name = pick(GLOB.ninja_names)
@@ -92,7 +92,7 @@ GLOBAL_DATUM(ninjas, /datum/antagonist/ninja)
H.name = H.real_name
player.name = H.name
-/datum/antagonist/ninja/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/ninja/equip(mob/living/carbon/human/player)
if(!..())
return 0
diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm
index feec182a48..d9d2e0947b 100644
--- a/code/game/antagonist/outsider/raider.dm
+++ b/code/game/antagonist/outsider/raider.dm
@@ -110,7 +110,7 @@ GLOBAL_DATUM(raiders, /datum/antagonist/raider)
..()
GLOB.raiders = src
-/datum/antagonist/raider/update_access(var/mob/living/player)
+/datum/antagonist/raider/update_access(mob/living/player)
for(var/obj/item/storage/wallet/W in player.contents)
for(var/obj/item/card/id/id in W.contents)
id.name = "[player.real_name]'s Passport"
@@ -201,7 +201,7 @@ GLOBAL_DATUM(raiders, /datum/antagonist/raider)
return 0
return 1
-/datum/antagonist/raider/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/raider/equip(mob/living/carbon/human/player)
if(!..())
return 0
@@ -238,7 +238,7 @@ GLOBAL_DATUM(raiders, /datum/antagonist/raider)
return 1
-/datum/antagonist/raider/proc/equip_weapons(var/mob/living/carbon/human/player)
+/datum/antagonist/raider/proc/equip_weapons(mob/living/carbon/human/player)
var/new_gun = pick(raider_guns)
var/new_holster = pick(raider_holster) //raiders don't start with any backpacks, so let's be nice and give them a holster if they can use it.
var/turf/T = get_turf(player)
@@ -277,7 +277,7 @@ GLOBAL_DATUM(raiders, /datum/antagonist/raider)
else
player.put_in_any_hand_if_possible(holster)
-/datum/antagonist/raider/proc/equip_ammo(var/mob/living/carbon/human/player, var/obj/item/gun/gun)
+/datum/antagonist/raider/proc/equip_ammo(mob/living/carbon/human/player, obj/item/gun/gun)
if(istype(gun, /obj/item/gun/projectile))
var/obj/item/gun/projectile/bullet_thrower = gun
if(bullet_thrower.magazine_type)
@@ -302,7 +302,7 @@ GLOBAL_DATUM(raiders, /datum/antagonist/raider)
new grenade_type(ammobox)
player.put_in_any_hand_if_possible(ammobox)
-/datum/antagonist/raider/proc/equip_vox(var/mob/living/carbon/human/player)
+/datum/antagonist/raider/proc/equip_vox(mob/living/carbon/human/player)
var/uniform_type = pick(list(/obj/item/clothing/under/vox/vox_robes,/obj/item/clothing/under/vox/vox_casual))
diff --git a/code/game/antagonist/outsider/shipwreck_survivor.dm b/code/game/antagonist/outsider/shipwreck_survivor.dm
index d11793a0e4..77759ce24d 100644
--- a/code/game/antagonist/outsider/shipwreck_survivor.dm
+++ b/code/game/antagonist/outsider/shipwreck_survivor.dm
@@ -33,7 +33,7 @@ GLOBAL_DATUM(survivors, /datum/antagonist/shipwreck_survivor)
..()
GLOB.survivors = src
-/datum/antagonist/survivor/greet(var/datum/mind/player)
+/datum/antagonist/survivor/greet(datum/mind/player)
to_chat(player.current, span_warning("You are a NOT an antagonist! All rules apply to you as well. Your job is to help make the world seem more alive. \n \
You are not an existing station character, but some average person who has suffered a terrible accident. \
Feel free to make up what happened to the ship you awakened on as you please, \
diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm
index 232ef3b0b7..5acef5420c 100644
--- a/code/game/antagonist/outsider/technomancer.dm
+++ b/code/game/antagonist/outsider/technomancer.dm
@@ -26,13 +26,13 @@ GLOBAL_DATUM(technomancers, /datum/antagonist/technomancer)
..()
GLOB.technomancers = src
-/datum/antagonist/technomancer/update_antag_mob(var/datum/mind/technomancer)
+/datum/antagonist/technomancer/update_antag_mob(datum/mind/technomancer)
..()
technomancer.store_memory(span_bold("Remember:") + " Do not forget to purchase the functions and equipment you need.")
technomancer.current.real_name = "[pick(GLOB.wizard_first)] [pick(GLOB.wizard_second)]"
technomancer.current.name = technomancer.current.real_name
-/datum/antagonist/technomancer/equip(var/mob/living/carbon/human/technomancer_mob)
+/datum/antagonist/technomancer/equip(mob/living/carbon/human/technomancer_mob)
if(!..())
return 0
@@ -50,7 +50,7 @@ GLOBAL_DATUM(technomancers, /datum/antagonist/technomancer)
technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/head/technomancer/master(technomancer_mob), slot_head)
return 1
-/datum/antagonist/technomancer/proc/equip_apprentice(var/mob/living/carbon/human/technomancer_mob)
+/datum/antagonist/technomancer/proc/equip_apprentice(mob/living/carbon/human/technomancer_mob)
technomancer_mob.equip_to_slot_or_del(new /obj/item/clothing/under/technomancer/apprentice(technomancer_mob), slot_w_uniform)
create_id("Techno-apprentice", technomancer_mob)
@@ -89,7 +89,7 @@ GLOBAL_DATUM(technomancers, /datum/antagonist/technomancer)
continue // Cores containing spells only.
to_chat(world, span_filter_system("Abandoned [core] had [english_list(core.spells)].
"))
-/datum/antagonist/technomancer/print_player_full(var/datum/mind/player)
+/datum/antagonist/technomancer/print_player_full(datum/mind/player)
var/text = print_player_lite(player)
var/obj/item/technomancer_core/core
diff --git a/code/game/antagonist/outsider/trader.dm b/code/game/antagonist/outsider/trader.dm
index 92cd72ce39..8a59a81cc5 100644
--- a/code/game/antagonist/outsider/trader.dm
+++ b/code/game/antagonist/outsider/trader.dm
@@ -27,7 +27,7 @@ GLOBAL_DATUM(traders, /datum/antagonist/trader)
can_speak_aooc = FALSE // They're not real antags.
-/datum/antagonist/trader/create_default(var/mob/source)
+/datum/antagonist/trader/create_default(mob/source)
var/mob/living/carbon/human/M = ..()
if(istype(M)) M.age = rand(25,45)
@@ -35,13 +35,13 @@ GLOBAL_DATUM(traders, /datum/antagonist/trader)
..()
GLOB.traders = src
-/datum/antagonist/trader/greet(var/datum/mind/player)
+/datum/antagonist/trader/greet(datum/mind/player)
if(!..())
return
to_chat(player.current, "The Beruang is an independent cargo hauler, unless you decide otherwise. You're on your way to [station_name()].")
to_chat(player.current, "You may want to discuss a collective story with the rest of your crew. More members may be joining, so don't move out straight away!")
-/datum/antagonist/trader/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/trader/equip(mob/living/carbon/human/player)
player.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargotech(src), slot_w_uniform)
player.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(src), slot_shoes)
player.equip_to_slot_or_del(new /obj/item/clothing/gloves/brown(src), slot_gloves)
@@ -60,7 +60,7 @@ GLOBAL_DATUM(traders, /datum/antagonist/trader)
return 1
-/datum/antagonist/trader/update_access(var/mob/living/player)
+/datum/antagonist/trader/update_access(mob/living/player)
for(var/obj/item/storage/wallet/W in player.contents)
for(var/obj/item/card/id/id in W.contents)
id.name = "[player.real_name]'s Passport"
diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm
index fa9499e3d1..f3809c09da 100644
--- a/code/game/antagonist/outsider/wizard.dm
+++ b/code/game/antagonist/outsider/wizard.dm
@@ -21,7 +21,7 @@ GLOBAL_DATUM(wizards, /datum/antagonist/wizard)
..()
GLOB.wizards = src
-/datum/antagonist/wizard/create_objectives(var/datum/mind/wizard)
+/datum/antagonist/wizard/create_objectives(datum/mind/wizard)
if(!..())
return
@@ -64,13 +64,13 @@ GLOBAL_DATUM(wizards, /datum/antagonist/wizard)
wizard.objectives |= hijack_objective
return
-/datum/antagonist/wizard/update_antag_mob(var/datum/mind/wizard)
+/datum/antagonist/wizard/update_antag_mob(datum/mind/wizard)
..()
wizard.store_memory(span_bold("Remember:") + " do not forget to prepare your spells.")
wizard.current.real_name = "[pick(GLOB.wizard_first)] [pick(GLOB.wizard_second)]"
wizard.current.name = wizard.current.real_name
-/datum/antagonist/wizard/equip(var/mob/living/carbon/human/wizard_mob)
+/datum/antagonist/wizard/equip(mob/living/carbon/human/wizard_mob)
if(!..())
return 0
@@ -119,7 +119,7 @@ GLOBAL_DATUM(wizards, /datum/antagonist/wizard)
var/helmet_handling = FALSE
// Does this clothing slot count as wizard garb? (Combines a few checks)
-/proc/is_wiz_garb(var/obj/item/clothing/C)
+/proc/is_wiz_garb(obj/item/clothing/C)
return C && C.wizard_garb
/*Checks if the wizard is wearing the proper attire.
diff --git a/code/game/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm
index c0129a2c11..fa6ead2c68 100644
--- a/code/game/antagonist/station/changeling.dm
+++ b/code/game/antagonist/station/changeling.dm
@@ -12,13 +12,13 @@
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
antaghud_indicator = "hudchangeling"
-/datum/antagonist/changeling/get_special_objective_text(var/datum/mind/player)
+/datum/antagonist/changeling/get_special_objective_text(datum/mind/player)
if(player.current)
var/datum/component/antag/changeling/comp = player.current.GetComponent(/datum/component/antag/changeling)
if(comp)
return "
Changeling ID: [comp.changelingID].
Genomes Absorbed: [comp.absorbedcount]"
-/datum/antagonist/changeling/update_antag_mob(var/datum/mind/player)
+/datum/antagonist/changeling/update_antag_mob(datum/mind/player)
..()
player.current.make_changeling()
@@ -32,7 +32,7 @@
if(comp.owner.mind)
comp.owner.mind.antag_holder.changeling = null
-/datum/antagonist/changeling/create_objectives(var/datum/mind/changeling)
+/datum/antagonist/changeling/create_objectives(datum/mind/changeling)
if(!..())
return
@@ -69,7 +69,7 @@
changeling.objectives += survive_objective
return
-/datum/antagonist/changeling/can_become_antag(var/datum/mind/player, var/ignore_role)
+/datum/antagonist/changeling/can_become_antag(datum/mind/player, ignore_role)
if(!..())
return 0
if(player.current)
@@ -91,7 +91,7 @@
return 1
return 0
-/datum/antagonist/changeling/print_player_full(var/datum/mind/player)
+/datum/antagonist/changeling/print_player_full(datum/mind/player)
var/text = print_player_lite(player)
var/datum/component/antag/changeling/comp = player.current.GetComponent(/datum/component/antag/changeling)
diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm
index 0b8b27afc0..8ccab10059 100644
--- a/code/game/antagonist/station/cultist.dm
+++ b/code/game/antagonist/station/cultist.dm
@@ -1,6 +1,6 @@
GLOBAL_DATUM(cult, /datum/antagonist/cultist)
-/proc/iscultist(var/mob/player)
+/proc/iscultist(mob/player)
if(!GLOB.cult || !player.mind)
return 0
if(player.mind in GLOB.cult.current_antagonists)
@@ -58,7 +58,7 @@ GLOBAL_DATUM(cult, /datum/antagonist/cultist)
sacrifice_target = sacrifice.target
global_objectives |= sacrifice
-/datum/antagonist/cultist/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/cultist/equip(mob/living/carbon/human/player)
if(!..())
return 0
@@ -79,12 +79,12 @@ GLOBAL_DATUM(cult, /datum/antagonist/cultist)
if(S && istype(S))
T.loc = S
-/datum/antagonist/cultist/greet(var/datum/mind/player)
+/datum/antagonist/cultist/greet(datum/mind/player)
if(!..())
return 0
grant_runeword(player.current)
-/datum/antagonist/cultist/proc/grant_runeword(mob/living/carbon/human/cult_mob, var/word)
+/datum/antagonist/cultist/proc/grant_runeword(mob/living/carbon/human/cult_mob, word)
if (!word)
if(startwords.len > 0)
@@ -101,7 +101,7 @@ GLOBAL_DATUM(cult, /datum/antagonist/cultist)
to_chat(cult_mob, span_warning("You remember one thing from the dark teachings of your master... [wordexp]"))
cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0)
-/datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
+/datum/antagonist/cultist/remove_antagonist(datum/mind/player, show_message, implanted)
if(!..())
return 0
to_chat(player.current, span_danger("An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it."))
@@ -109,19 +109,19 @@ GLOBAL_DATUM(cult, /datum/antagonist/cultist)
if(show_message)
player.current.visible_message(span_large("[player.current] looks like they just reverted to their old faith!"))
-/datum/antagonist/cultist/add_antagonist(var/datum/mind/player)
+/datum/antagonist/cultist/add_antagonist(datum/mind/player)
. = ..()
if(.)
to_chat(player, "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back.")
if(player.current && !istype(player.current, /mob/living/simple_mob/construct))
player.current.add_language(LANGUAGE_CULT)
-/datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
+/datum/antagonist/cultist/remove_antagonist(datum/mind/player, show_message, implanted)
. = ..()
if(. && player.current && !istype(player.current, /mob/living/simple_mob/construct))
player.current.remove_language(LANGUAGE_CULT)
-/datum/antagonist/cultist/can_become_antag(var/datum/mind/player)
+/datum/antagonist/cultist/can_become_antag(datum/mind/player)
if(!..())
return 0
for(var/obj/item/implant/loyalty/L in player.current)
diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm
index 0479af7e83..030b6aacaa 100644
--- a/code/game/antagonist/station/highlander.dm
+++ b/code/game/antagonist/station/highlander.dm
@@ -18,7 +18,7 @@ GLOBAL_DATUM(highlanders, /datum/antagonist/highlander)
..()
GLOB.highlanders = src
-/datum/antagonist/highlander/create_objectives(var/datum/mind/player)
+/datum/antagonist/highlander/create_objectives(datum/mind/player)
var/datum/objective/steal/steal_objective = new
steal_objective.owner = player
@@ -29,7 +29,7 @@ GLOBAL_DATUM(highlanders, /datum/antagonist/highlander)
hijack_objective.owner = player
player.objectives |= hijack_objective
-/datum/antagonist/highlander/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/highlander/equip(mob/living/carbon/human/player)
if(!..())
return
diff --git a/code/game/antagonist/station/infiltrator.dm b/code/game/antagonist/station/infiltrator.dm
index 6d1c87f5a8..3583d4dfc7 100644
--- a/code/game/antagonist/station/infiltrator.dm
+++ b/code/game/antagonist/station/infiltrator.dm
@@ -18,7 +18,7 @@ GLOBAL_DATUM(infiltrators, /datum/antagonist/traitor/infiltrator)
..()
GLOB.infiltrators = src
-/datum/antagonist/traitor/infiltrator/equip(var/mob/living/carbon/human/traitor_mob)
+/datum/antagonist/traitor/infiltrator/equip(mob/living/carbon/human/traitor_mob)
..() // Give the uplink and other stuff.
// Now for the special headset.
diff --git a/code/game/antagonist/station/renegade.dm b/code/game/antagonist/station/renegade.dm
index e99d596a2a..dffd618600 100644
--- a/code/game/antagonist/station/renegade.dm
+++ b/code/game/antagonist/station/renegade.dm
@@ -66,7 +66,7 @@ GLOBAL_DATUM(renegades, /datum/antagonist/renegade)
..()
GLOB.renegades = src
-/datum/antagonist/renegade/create_objectives(var/datum/mind/player)
+/datum/antagonist/renegade/create_objectives(datum/mind/player)
if(!..())
return
@@ -75,7 +75,7 @@ GLOBAL_DATUM(renegades, /datum/antagonist/renegade)
survive.owner = player
player.objectives |= survive
-/datum/antagonist/renegade/equip(var/mob/living/carbon/human/player)
+/datum/antagonist/renegade/equip(mob/living/carbon/human/player)
if(!..())
return
diff --git a/code/game/antagonist/station/rogue_ai.dm b/code/game/antagonist/station/rogue_ai.dm
index f7fce5da68..23354fc036 100644
--- a/code/game/antagonist/station/rogue_ai.dm
+++ b/code/game/antagonist/station/rogue_ai.dm
@@ -34,7 +34,7 @@ GLOBAL_DATUM(malf, /datum/antagonist/rogue_ai)
// Ensures proper reset of all malfunction related things.
-/datum/antagonist/rogue_ai/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
+/datum/antagonist/rogue_ai/remove_antagonist(datum/mind/player, show_message, implanted)
if(..(player,show_message,implanted))
var/mob/living/silicon/ai/p = player.current
if(istype(p))
@@ -43,7 +43,7 @@ GLOBAL_DATUM(malf, /datum/antagonist/rogue_ai)
return 0
// Malf setup things have to be here, since game tends to break when it's moved somewhere else. Don't blame me, i didn't design this system.
-/datum/antagonist/rogue_ai/greet(var/datum/mind/player)
+/datum/antagonist/rogue_ai/greet(datum/mind/player)
// Initializes the AI's malfunction stuff.
spawn(0)
@@ -81,7 +81,7 @@ GLOBAL_DATUM(malf, /datum/antagonist/rogue_ai)
to_chat(malf, "Good luck!")
-/datum/antagonist/rogue_ai/update_antag_mob(var/datum/mind/player, var/preserve_appearance)
+/datum/antagonist/rogue_ai/update_antag_mob(datum/mind/player, preserve_appearance)
// Get the mob.
if((flags & ANTAG_OVERRIDE_MOB) && (!player.current || (mob_path && !istype(player.current, mob_path))))
@@ -92,7 +92,7 @@ GLOBAL_DATUM(malf, /datum/antagonist/rogue_ai)
player.original_character = WEAKREF(player.current)
return player.current
-/datum/antagonist/rogue_ai/set_antag_name(var/mob/living/silicon/player)
+/datum/antagonist/rogue_ai/set_antag_name(mob/living/silicon/player)
if(!istype(player))
testing("rogue_ai set_antag_name called on non-silicon mob [player]!")
return
diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm
index f533326695..d5cbc02bb3 100644
--- a/code/game/antagonist/station/traitor.dm
+++ b/code/game/antagonist/station/traitor.dm
@@ -18,7 +18,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor)
..()
GLOB.traitors = src
-/datum/antagonist/traitor/get_extra_panel_options(var/datum/mind/player)
+/datum/antagonist/traitor/get_extra_panel_options(datum/mind/player)
return "\[set crystals\]\[spawn uplink\]"
/datum/antagonist/traitor/Topic(href, href_list)
@@ -26,7 +26,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor)
return
if(href_list["spawn_uplink"]) spawn_uplink(locate(href_list["spawn_uplink"]))
-/datum/antagonist/traitor/create_objectives(var/datum/mind/traitor)
+/datum/antagonist/traitor/create_objectives(datum/mind/traitor)
if(!..())
return
@@ -80,7 +80,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor)
traitor.objectives += hijack_objective
return
-/datum/antagonist/traitor/equip(var/mob/living/carbon/human/traitor_mob)
+/datum/antagonist/traitor/equip(mob/living/carbon/human/traitor_mob)
if(istype(traitor_mob, /mob/living/silicon)) // this needs to be here because ..() returns false if the mob isn't human
add_law_zero(traitor_mob)
return 1
@@ -108,7 +108,7 @@ GLOBAL_DATUM(traitors, /datum/antagonist/traitor)
traitor_mob.mind.store_memory(span_bold("Code Response") + ": [SSantag_job.syndicate_code_response]")
to_chat(traitor_mob, "Use the code words, preferably in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.")
-/datum/antagonist/traitor/proc/spawn_uplink(var/mob/living/carbon/human/traitor_mob)
+/datum/antagonist/traitor/proc/spawn_uplink(mob/living/carbon/human/traitor_mob)
if(!istype(traitor_mob))
return
diff --git a/code/game/area/Away Mission areas.dm b/code/game/area/Away Mission areas.dm
index c203fc5751..3d00fa11ea 100644
--- a/code/game/area/Away Mission areas.dm
+++ b/code/game/area/Away Mission areas.dm
@@ -62,7 +62,7 @@
var/mob/ourmob = new M(Turf)
adjust_mob(ourmob)
-/area/proc/adjust_mob(var/mob/living/simple_mob/M)
+/area/proc/adjust_mob(mob/living/simple_mob/M)
if(!isanimal(M))
log_admin("[src] spawned [M.type], which is not a simplemob, FIXIT")
return
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 3eea724477..fa00436ab6 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
// Changes the area of T to A. Do not do this manually.
// Area is expected to be a non-null instance.
-/proc/ChangeArea(var/turf/T, var/area/A)
+/proc/ChangeArea(turf/T, area/A)
if(!istype(A))
CRASH("Area change attempt failed: invalid area supplied.")
var/area/old_area = get_area(T)
@@ -107,7 +107,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
cameras += C
return cameras
-/area/proc/atmosalert(danger_level, var/alarm_source)
+/area/proc/atmosalert(danger_level, alarm_source)
if (danger_level == 0)
GLOB.atmosphere_alarm.clearAlarm(src, alarm_source)
else
@@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
// new lighting behaviour with obj lights
icon_state = null
-/area/proc/powered(var/chan) // return true if the area has power to given channel
+/area/proc/powered(chan) // return true if the area has power to given channel
if(!requires_power)
return 1
@@ -278,7 +278,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
if (fire || eject || party)
update_icon()
-/area/proc/usage(var/chan, var/include_static = TRUE)
+/area/proc/usage(chan, include_static = TRUE)
var/used = 0
switch(chan)
if(LIGHT)
@@ -300,7 +300,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
oneoff_environ = 0
// Use this for a one-time power draw from the area, typically for non-machines.
-/area/proc/use_power_oneoff(var/amount, var/chan)
+/area/proc/use_power_oneoff(amount, chan)
switch(chan)
if(EQUIP)
oneoff_equip += amount
@@ -315,7 +315,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
use_power_static(new_amount - old_amount, chan) // Simultaneously subtract old_amount and add new_amount.
// Not a proc you want to use directly unless you know what you are doing; see use_power_oneoff above instead.
-/area/proc/use_power_static(var/amount, var/chan)
+/area/proc/use_power_static(amount, chan)
switch(chan)
if(EQUIP)
static_equip += amount
@@ -353,7 +353,7 @@ GLOBAL_LIST_EMPTY(areas_by_type)
href_list[VV_HK_DATUM_REFRESH] = "\ref[src]"
// Debugging proc to report if static power is correct or not.
-/area/proc/check_static_power(var/user)
+/area/proc/check_static_power(user)
set name = "Check Static Power"
var/actual_static_equip = static_equip
var/actual_static_light = static_light
@@ -397,7 +397,7 @@ GLOBAL_LIST_EMPTY(forced_ambiance_list)
if(L.client && L.client.color != get_color_tint()) // Try to check if we should bother changing before doing blending
L.update_client_color()
-/area/proc/play_ambience(var/mob/living/L, initial = TRUE)
+/area/proc/play_ambience(mob/living/L, initial = TRUE)
// Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
if(!L?.read_preference(/datum/preference/toggle/play_ambience))
return
@@ -428,7 +428,7 @@ GLOBAL_LIST_EMPTY(forced_ambiance_list)
L << sound(sound, repeat = 0, wait = 0, volume = 50 * volume_mod, channel = CHANNEL_AMBIENCE)
L.client.time_last_ambience_played = world.time
-/area/proc/gravitychange(var/gravitystate = 0)
+/area/proc/gravitychange(gravitystate = 0)
src.has_gravity = gravitystate
for(var/mob/M in src)
@@ -557,12 +557,12 @@ GLOBAL_DATUM(spoiler_obfuscation_image, /image)
else
cut_overlay(GLOB.spoiler_obfuscation_image)
-/area/proc/flag_check(var/flag, var/match_all = FALSE)
+/area/proc/flag_check(flag, match_all = FALSE)
if(match_all)
return (flags & flag) == flag
return flags & flag
-/area/proc/check_phase_shift(var/mob/living/ourmob)
+/area/proc/check_phase_shift(mob/living/ourmob)
if(!flag_check(AREA_BLOCK_PHASE_SHIFT) || !ourmob.is_incorporeal())
return
if(!isliving(ourmob))
diff --git a/code/game/area/areas_vr.dm b/code/game/area/areas_vr.dm
index 9a31049b57..1d9fdc1cc2 100644
--- a/code/game/area/areas_vr.dm
+++ b/code/game/area/areas_vr.dm
@@ -8,12 +8,12 @@
var/no_comms = FALSE //When true, blocks radios from working in the area
-/area/Entered(var/atom/movable/AM, oldLoc)
+/area/Entered(atom/movable/AM, oldLoc)
. = ..()
if(enter_message && isliving(AM))
to_chat(AM, enter_message)
-/area/Exited(var/atom/movable/AM, newLoc)
+/area/Exited(atom/movable/AM, newLoc)
. = ..()
if(exit_message && isliving(AM))
to_chat(AM, exit_message)
diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm
index 4c2b80bd01..f6f86db2f3 100644
--- a/code/game/atom/_atom.dm
+++ b/code/game/atom/_atom.dm
@@ -127,7 +127,7 @@
return
//Register listeners on turfs in a certain range
-/atom/proc/sense_proximity(var/range = 1, var/callback)
+/atom/proc/sense_proximity(range = 1, callback)
ASSERT(callback)
ASSERT(isturf(loc))
var/list/turfs = trange(range, src)
@@ -136,7 +136,7 @@
//Unregister from prox listening in a certain range. You should do this BEFORE you move, but if you
// really can't, then you can set the center where you moved from.
-/atom/proc/unsense_proximity(var/range = 1, var/callback, var/center)
+/atom/proc/unsense_proximity(range = 1, callback, center)
ASSERT(isturf(center) || isturf(loc))
var/list/turfs = trange(range, center ? center : src)
for(var/turf/T as anything in turfs)
@@ -207,7 +207,7 @@
return desc
//All atoms
-/atom/proc/examine(mob/user, var/infix = "", var/suffix = "")
+/atom/proc/examine(mob/user, infix = "", suffix = "")
SHOULD_CALL_PARENT(TRUE)
//This reformat names to get a/an properly working on item descriptions when they are bloody
var/f_name = "\a [src][infix]."
@@ -257,23 +257,23 @@
SEND_SIGNAL(src, COMSIG_ATOM_POST_DIR_CHANGE, oldDir, new_dir)
// Called to set the atom's density and used to add behavior to density changes.
-/atom/proc/set_density(var/new_density)
+/atom/proc/set_density(new_density)
if(density == new_density)
return FALSE
density = !!new_density // Sanitize to be strictly 0 or 1
return TRUE
// Called to set the atom's invisibility and usd to add behavior to invisibility changes.
-/atom/proc/set_invisibility(var/new_invisibility)
+/atom/proc/set_invisibility(new_invisibility)
if(invisibility == new_invisibility)
return FALSE
invisibility = new_invisibility
return TRUE
-/atom/proc/ex_act(var/strength = 3)
+/atom/proc/ex_act(strength = 3)
return (SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, strength, src) & COMPONENT_IGNORE_EXPLOSION)
-/atom/proc/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
+/atom/proc/emag_act(remaining_charges, mob/user, emag_source)
return -1
/**
@@ -336,7 +336,7 @@
. = 1
return 1
-/atom/proc/on_rag_wipe(var/obj/item/reagent_containers/glass/rag/R)
+/atom/proc/on_rag_wipe(obj/item/reagent_containers/glass/rag/R)
wash(CLEAN_WASH)
R.reagents.splash(src, 1)
@@ -369,7 +369,7 @@
// Use for objects performing visible actions
// message is output to anyone who can see, e.g. "The [src] does something!"
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
-/atom/proc/visible_message(var/message, var/blind_message, var/list/exclude_mobs, var/range = world.view, var/runemessage = "👁")
+/atom/proc/visible_message(message, blind_message, list/exclude_mobs, range = world.view, runemessage = "👁")
//VOREStation Edit
var/list/see
@@ -400,7 +400,7 @@
// message is the message output to anyone who can hear.
// deaf_message (optional) is what deaf people will see.
// hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance, var/radio_message, var/runemessage)
+/atom/proc/audible_message(message, deaf_message, hearing_distance, radio_message, runemessage)
var/range = hearing_distance || world.view
var/list/hear = get_mobs_and_objs_in_view_fast(get_turf(src),range,remote_ghosts = FALSE)
@@ -421,7 +421,7 @@
if(runemessage != -1)
M.create_chat_message(src, "[runemessage || message]", FALSE, list("emote"))
-/atom/movable/proc/dropInto(var/atom/destination)
+/atom/movable/proc/dropInto(atom/destination)
while(istype(destination))
var/atom/drop_destination = destination.onDropInto(src)
if(!istype(drop_destination) || drop_destination == destination)
@@ -429,10 +429,10 @@
destination = drop_destination
return moveToNullspace()
-/atom/proc/onDropInto(var/atom/movable/AM)
+/atom/proc/onDropInto(atom/movable/AM)
return // If onDropInto returns null, then dropInto will forceMove AM into us.
-/atom/movable/onDropInto(var/atom/movable/AM)
+/atom/movable/onDropInto(atom/movable/AM)
return loc // If onDropInto returns something, then dropInto will attempt to drop AM there.
/atom/proc/InsertedContents()
diff --git a/code/game/atoms_ch.dm b/code/game/atoms_ch.dm
index 464edbc358..d6d6d798e2 100644
--- a/code/game/atoms_ch.dm
+++ b/code/game/atoms_ch.dm
@@ -1,4 +1,4 @@
-/atom/proc/contains(var/atom/location)
+/atom/proc/contains(atom/location)
if(!location)
return 0
if(location == src)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index e89ac029c2..71770f3162 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -593,7 +593,7 @@
// Animations for cloaking/uncloaking
-/atom/movable/proc/cloak_animation(var/length = 1 SECOND)
+/atom/movable/proc/cloak_animation(length = 1 SECOND)
//Save these
var/initial_alpha = alpha
@@ -614,7 +614,7 @@
//Back to original alpha
alpha = initial_alpha
-/atom/movable/proc/uncloak_animation(var/length = 1 SECOND)
+/atom/movable/proc/uncloak_animation(length = 1 SECOND)
//Save these
var/initial_alpha = alpha
@@ -652,7 +652,7 @@
/atom/movable/proc/get_cell()
return
-/atom/movable/proc/emblocker_gc(var/datum/source)
+/atom/movable/proc/emblocker_gc(datum/source)
SIGNAL_HANDLER
UnregisterSignal(source, COMSIG_QDELETING)
cut_overlay(source)
@@ -672,7 +672,7 @@
/atom/movable/proc/exit_belly(obj/belly/B)
return
-/atom/movable/proc/set_listening(var/set_to)
+/atom/movable/proc/set_listening(set_to)
if (listening_recursive && !set_to)
LAZYREMOVE(recursive_listeners, src)
if (!LAZYLEN(recursive_listeners))
diff --git a/code/game/base_turf.dm b/code/game/base_turf.dm
index 62318b67d8..6942ed8e4a 100644
--- a/code/game/base_turf.dm
+++ b/code/game/base_turf.dm
@@ -1,12 +1,12 @@
// Returns the lowest turf available on a given Z-level, defaults to asteroid for Polaris.
-/proc/get_base_turf(var/z)
+/proc/get_base_turf(z)
if(!using_map.base_turf_by_z["[z]"])
using_map.base_turf_by_z["[z]"] = /turf/space
return using_map.base_turf_by_z["[z]"]
//An area can override the z-level base turf, so our solar array areas etc. can be space-based.
-/proc/get_base_turf_by_area(var/turf/T)
+/proc/get_base_turf_by_area(turf/T)
var/area/A = T.loc
if(A.base_turf)
return A.base_turf
diff --git a/code/game/birthday.dm b/code/game/birthday.dm
index 4aead4e8dd..635ea6f2a9 100644
--- a/code/game/birthday.dm
+++ b/code/game/birthday.dm
@@ -15,7 +15,7 @@
else if((GLOB.world_time_month == bday_month) && (GLOB.world_time_day > bday_day)) //your birthday was earlier this month
birthday()
-/mob/living/carbon/human/proc/birthday(var/birthday = 0)
+/mob/living/carbon/human/proc/birthday(birthday = 0)
var/msg
var/lastyear = read_preference(/datum/preference/numeric/human/last_bday_note)
write_preference_directly(/datum/preference/numeric/human/last_bday_note, GLOB.world_time_year, WRITE_PREF_MANUAL) //We only want to ask once a year per character, this persists, update early in case of shenanigans
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index e4715298c2..b057a61c69 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -11,7 +11,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_good, /datum/gene/trait)
GLOBAL_LIST_EMPTY_TYPED(dna_genes_neutral, /datum/gene/trait)
GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
-/proc/get_gene_from_trait(var/trait_path) // ALWAYS USE THIS
+/proc/get_gene_from_trait(trait_path) // ALWAYS USE THIS
RETURN_TYPE(/datum/gene/trait)
var/G = GLOB.trait_to_dna_genes[trait_path]
#ifndef UNIT_TESTS
@@ -103,7 +103,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
///////////////////////////////////////
// Create random UI.
-/datum/dna/proc/ResetUI(var/defer=0)
+/datum/dna/proc/ResetUI(defer=0)
for(var/i=1,i<=DNA_UI_LENGTH,i++)
switch(i)
if(DNA_UI_SKIN_TONE)
@@ -118,7 +118,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
* Ensure that ResetUIFrom() and ApplyToMob() mirror each other. All vars should be read FROM the mob, and written back to it!
* ALL dna logic for reading from the mob, storing the dna data, and writing that dna data back to the mob should be here, and ONLY here.
*/
-/datum/dna/proc/ResetUIFrom(var/mob/living/carbon/human/character)
+/datum/dna/proc/ResetUIFrom(mob/living/carbon/human/character)
// INITIALIZE!
ResetUI(1)
// Hair
@@ -281,7 +281,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
UpdateUI()
-/datum/dna/proc/ApplyToMob(var/mob/living/carbon/human/H)
+/datum/dna/proc/ApplyToMob(mob/living/carbon/human/H)
////////////////////////////////////////////////////////////////////////////////
// Apply UIs to character
//Hair color
@@ -456,7 +456,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
*/
// Set a DNA UI block's raw value.
-/datum/dna/proc/SetUIValue(var/block,var/value,var/defer=0)
+/datum/dna/proc/SetUIValue(block,value,defer=0)
if (block<=0) return
ASSERT(value>=0)
ASSERT(value<=4095)
@@ -466,13 +466,13 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
UpdateUI()
// Get a DNA UI block's raw value.
-/datum/dna/proc/GetUIValue(var/block)
+/datum/dna/proc/GetUIValue(block)
if (block<=0) return 0
return UI[block]
// Set a DNA UI block's value, given a value and a max possible value.
// Used in hair and facial styles (value being the index and maxvalue being the len of the hairstyle list)
-/datum/dna/proc/SetUIValueRange(var/block,var/value,var/maxvalue,var/defer=0)
+/datum/dna/proc/SetUIValueRange(block,value,maxvalue,defer=0)
if (block<=0) return
ASSERT(maxvalue<=4095)
var/range = (4095 / maxvalue)
@@ -480,20 +480,20 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
SetUIValue(block,round(value * range),defer)
// Getter version of above.
-/datum/dna/proc/GetUIValueRange(var/block,var/maxvalue)
+/datum/dna/proc/GetUIValueRange(block,maxvalue)
if (block<=0) return 0
var/value = GetUIValue(block)
return round(0.5 + (value / 4095) * maxvalue)
// Is the UI gene "on" or "off"?
// For UI, this is simply a check of if the value is > 2050.
-/datum/dna/proc/GetUIState(var/block)
+/datum/dna/proc/GetUIState(block)
if (block<=0) return
return UI[block] > 2050
// Set UI gene "on" (1) or "off" (0)
-/datum/dna/proc/SetUIState(var/block,var/on,var/defer=0)
+/datum/dna/proc/SetUIState(block,on,defer=0)
if (block<=0) return
var/val
if(on)
@@ -503,24 +503,24 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
SetUIValue(block,val,defer)
// Get a hex-encoded UI block.
-/datum/dna/proc/GetUIBlock(var/block)
+/datum/dna/proc/GetUIBlock(block)
return EncodeDNABlock(GetUIValue(block))
// Do not use this unless you absolutely have to.
// Set a block from a hex string. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetUIBlock(var/block,var/value,var/defer=0)
+/datum/dna/proc/SetUIBlock(block,value,defer=0)
if (block<=0) return
return SetUIValue(block,hex2num(value),defer)
// Get a sub-block from a block.
-/datum/dna/proc/GetUISubBlock(var/block,var/subBlock)
+/datum/dna/proc/GetUISubBlock(block,subBlock)
return copytext(GetUIBlock(block),subBlock,subBlock+1)
// Do not use this unless you absolutely have to.
// Set a block from a hex string. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetUISubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
+/datum/dna/proc/SetUISubBlock(block,subBlock, newSubBlock, defer=0)
if (block<=0) return
var/oldBlock=GetUIBlock(block)
var/newBlock=""
@@ -542,7 +542,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
UpdateSE()
// Set a DNA SE block's raw value.
-/datum/dna/proc/SetSEValue(var/block,var/value,var/defer=0)
+/datum/dna/proc/SetSEValue(block,value,defer=0)
if (block<=0) return
ASSERT(value>=0)
ASSERT(value<=4095)
@@ -552,13 +552,13 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
UpdateSE()
// Get a DNA SE block's raw value.
-/datum/dna/proc/GetSEValue(var/block)
+/datum/dna/proc/GetSEValue(block)
if (block<=0) return 0
return SE[block]
// Set a DNA SE block's value, given a value and a max possible value.
// Might be used for species?
-/datum/dna/proc/SetSEValueRange(var/block,var/value,var/maxvalue)
+/datum/dna/proc/SetSEValueRange(block,value,maxvalue)
if (block<=0) return
ASSERT(maxvalue<=4095)
var/range = round(4095 / maxvalue)
@@ -566,20 +566,20 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
SetSEValue(block, value * range - rand(1,range-1))
// Getter version of above.
-/datum/dna/proc/GetSEValueRange(var/block,var/maxvalue)
+/datum/dna/proc/GetSEValueRange(block,maxvalue)
if (block<=0) return 0
var/value = GetSEValue(block)
return round(1 +(value / 4095)*maxvalue)
// Is the block "on" (1) or "off" (0)? (Un-assigned genes are always off.)
-/datum/dna/proc/GetSEState(var/block)
+/datum/dna/proc/GetSEState(block)
if (block<=0) return 0
var/list/BOUNDS=GetDNABounds(block)
var/value=GetSEValue(block)
return (value > BOUNDS[DNA_ON_LOWERBOUND])
// Set a block "on" or "off".
-/datum/dna/proc/SetSEState(var/block,var/on,var/defer=0)
+/datum/dna/proc/SetSEState(block,on,defer=0)
if (block<=0) return
var/list/BOUNDS=GetDNABounds(block)
var/val
@@ -590,11 +590,11 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
SetSEValue(block,val,defer)
// Get hex-encoded SE block.
-/datum/dna/proc/GetSEBlock(var/block)
+/datum/dna/proc/GetSEBlock(block)
return EncodeDNABlock(GetSEValue(block))
// Get activation intensity, returns 0 to 1, you MUST check if the gene is active first! This is used for future expansion where genetraits can have multiple levels of activation/intensity
-/datum/dna/proc/GetSEActivationIntensity(var/block)
+/datum/dna/proc/GetSEActivationIntensity(block)
if (block<=0) return 0
var/list/BOUNDS=GetDNABounds(block)
var/value=GetSEValue(block)
@@ -602,26 +602,26 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
return val
// Gets the activation intensity index. ex: if a genetrait has 5 levels of activations, the gene will have 5 possible levels of activation. this is a future TODO.
-/datum/dna/proc/GetSEActivationLevel(var/block,var/number_of_levels)
+/datum/dna/proc/GetSEActivationLevel(block,number_of_levels)
var/raw_val = GetSEActivationIntensity(block)
return round(raw_val * number_of_levels) // TODO - If this should be round/floor/ceil
// Do not use this unless you absolutely have to.
// Set a block from a hex string. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetSEBlock(var/block,var/value,var/defer=0)
+/datum/dna/proc/SetSEBlock(block,value,defer=0)
if (block<=0) return
var/nval=hex2num(value)
//testing("SetSEBlock([block],[value],[defer]): [value] -> [nval]")
return SetSEValue(block,nval,defer)
-/datum/dna/proc/GetSESubBlock(var/block,var/subBlock)
+/datum/dna/proc/GetSESubBlock(block,subBlock)
return copytext(GetSEBlock(block),subBlock,subBlock+1)
// Do not use this unless you absolutely have to.
// Set a sub-block from a hex character. This is inefficient. If you can, use SetUIValue().
// Used in DNA modifiers.
-/datum/dna/proc/SetSESubBlock(var/block,var/subBlock, var/newSubBlock, var/defer=0)
+/datum/dna/proc/SetSESubBlock(block,subBlock, newSubBlock, defer=0)
if (block<=0) return
var/oldBlock=GetSEBlock(block)
var/newBlock=""
@@ -634,7 +634,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
SetSEBlock(block,newBlock,defer)
-/proc/EncodeDNABlock(var/value)
+/proc/EncodeDNABlock(value)
return num2hex(value, 3)
/datum/dna/proc/UpdateUI()
@@ -655,7 +655,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
// BACK-COMPAT!
// Just checks our character has all the crap it needs.
-/datum/dna/proc/check_integrity(var/mob/living/carbon/human/character)
+/datum/dna/proc/check_integrity(mob/living/carbon/human/character)
if(character)
if(UI.len != DNA_UI_LENGTH)
ResetUIFrom(character)
diff --git a/code/game/dna/dna2_domutcheck.dm b/code/game/dna/dna2_domutcheck.dm
index c7a3063909..5df214ba1c 100644
--- a/code/game/dna/dna2_domutcheck.dm
+++ b/code/game/dna/dna2_domutcheck.dm
@@ -4,7 +4,7 @@
// connected: Machine we're in, type unchecked so I doubt it's used beyond monkeying
// flags: See below, bitfield.
-/proc/domutcheck(var/mob/living/M, var/connected=null, var/flags=0)
+/proc/domutcheck(mob/living/M, connected=null, flags=0)
// Traitgenes NO_DNA and Synthetics cannot be mutated
if(M.isSynthetic())
return
diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm
index 32e7685509..cc509957b5 100644
--- a/code/game/dna/dna2_helpers.dm
+++ b/code/game/dna/dna2_helpers.dm
@@ -14,14 +14,14 @@
// DNA Gene activation boundaries, see dna2.dm.
// Returns a list object with 4 numbers.
-/proc/GetDNABounds(var/block)
+/proc/GetDNABounds(block)
var/list/bounds = GLOB.dna_activity_bounds[block]
if(!istype(bounds))
return DNA_DEFAULT_BOUNDS
return bounds
// Give Random Bad Mutation to M
-/proc/randmutb(var/mob/living/M)
+/proc/randmutb(mob/living/M)
if(!M || !(M.dna)) return
// Traitgenes NO_DNA and Synthetics cannot be mutated
if(M.isSynthetic())
@@ -36,7 +36,7 @@
M.dna.SetSEState(T.block, TRUE)
// Give Random Good Mutation to M
-/proc/randmutg(var/mob/living/M)
+/proc/randmutg(mob/living/M)
if(!M || !(M.dna)) return
// Traitgenes NO_DNA and Synthetics cannot be mutated
if(M.isSynthetic())
@@ -51,7 +51,7 @@
M.dna.SetSEState(T.block, TRUE)
// Scramble UI or SE.
-/proc/scramble(var/UI, var/mob/M, var/prob)
+/proc/scramble(UI, mob/M, prob)
if(!M || !(M.dna)) return
// Traitgenes edit begin - NO_DNA and Synthetics cannot be mutated
if(M.isSynthetic())
@@ -132,11 +132,11 @@
return output
// Use mob.UpdateAppearance()
-/mob/proc/UpdateAppearance(var/list/UI=null)
+/mob/proc/UpdateAppearance(list/UI=null)
return FALSE
// Simpler. Don't specify UI in order for the mob to use its own.
-/mob/living/carbon/human/UpdateAppearance(var/list/UI=null)
+/mob/living/carbon/human/UpdateAppearance(list/UI=null)
// Rebuild off UI arg if not null
if(UI!=null)
src.dna.UI=UI
@@ -162,5 +162,5 @@
species.post_spawn_special(src)
// Used below, simple injection modifier.
-/proc/probinj(var/pr, var/inj)
+/proc/probinj(pr, inj)
return prob(pr+inj*pr)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index b0da3df2f4..c53567e19f 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -87,7 +87,7 @@
eject_occupant()
. = ..()
-/obj/machinery/dna_scannernew/proc/set_occupant(var/mob/living/L)
+/obj/machinery/dna_scannernew/proc/set_occupant(mob/living/L)
SHOULD_NOT_OVERRIDE(TRUE)
if(!L)
weakref_occupant = null
@@ -139,7 +139,7 @@
for(var/mob/M in src)//Failsafe so you can get mobs out
M.forceMove(get_turf(src))
-/obj/machinery/dna_scannernew/MouseDrop_T(var/mob/target, var/mob/user) //Allows borgs to clone people without external assistance
+/obj/machinery/dna_scannernew/MouseDrop_T(mob/target, mob/user) //Allows borgs to clone people without external assistance
var/mob/living/carbon/WC = get_occupant()
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !ishuman(target) || WC)
return
@@ -179,7 +179,7 @@
add_fingerprint(usr)
SStgui.update_uis(src)
-/obj/machinery/dna_scannernew/attackby(var/obj/item/item as obj, var/mob/user as mob)
+/obj/machinery/dna_scannernew/attackby(obj/item/item as obj, mob/user as mob)
// Traitgenes Deconstructable dna scanner
if(default_deconstruction_screwdriver(user, item))
return
@@ -248,7 +248,7 @@
break
. = ..()
-/obj/machinery/dna_scannernew/proc/put_in(var/mob/M)
+/obj/machinery/dna_scannernew/proc/put_in(mob/M)
M.forceMove(src)
set_occupant(M)
icon_state = "scanner_1"
@@ -381,13 +381,13 @@
break
VARSET_IN(src, injector_ready, TRUE, 25 SECONDS)
-/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(var/list/buffer)
+/obj/machinery/computer/scan_consolenew/proc/all_dna_blocks(list/buffer)
var/list/arr = list()
for(var/i = 1, i <= buffer.len, i++)
arr += "[i]:[EncodeDNABlock(buffer[i])]"
return arr
-/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(var/obj/item/dnainjector/I, var/blk, var/datum/transhuman/body_record/buffer) // Traitgenes Stores the entire body record
+/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(obj/item/dnainjector/I, blk, datum/transhuman/body_record/buffer) // Traitgenes Stores the entire body record
var/pos = findtext(blk,":")
if(!pos) return 0
var/id = text2num(copytext(blk,1,pos))
@@ -774,7 +774,7 @@
* Arguments:
* * active_br - Body record to print
*/
-/obj/machinery/computer/scan_consolenew/proc/print_sleeve(var/mob/user, var/datum/transhuman/body_record/active_br)
+/obj/machinery/computer/scan_consolenew/proc/print_sleeve(mob/user, datum/transhuman/body_record/active_br)
//deleted record
if(!istype(active_br))
to_chat(user, span_danger( "Error: Data corruption."))
@@ -814,7 +814,7 @@
return
to_chat(user, span_notice( "Initiating growing cycle..."))
-/obj/machinery/computer/scan_consolenew/proc/do_irradiate(var/lock_state, var/block)
+/obj/machinery/computer/scan_consolenew/proc/do_irradiate(lock_state, block)
var/mob/living/carbon/WC = connected?.get_occupant()
irradiating = 0
connected.locked = lock_state
@@ -849,7 +849,7 @@
H.sync_organ_dna()
WC.regenerate_icons()
-/obj/machinery/computer/scan_consolenew/proc/do_pulse(var/lock_state)
+/obj/machinery/computer/scan_consolenew/proc/do_pulse(lock_state)
var/mob/living/carbon/WC = connected?.get_occupant()
irradiating = 0
connected.locked = lock_state
@@ -876,7 +876,7 @@
WC.apply_effect(((radiation_intensity*3)+radiation_duration*3), IRRADIATE, check_protection = 0)
-/obj/machinery/computer/scan_consolenew/proc/do_transfer(var/lock_state, var/bufferId)
+/obj/machinery/computer/scan_consolenew/proc/do_transfer(lock_state, bufferId)
irradiating = 0
connected.locked = lock_state
diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm
index e4ec60260e..28269bd1e1 100644
--- a/code/game/dna/genes/disabilities.dm
+++ b/code/game/dna/genes/disabilities.dm
@@ -24,10 +24,10 @@
// Yay, you're no longer growing 3 arms
var/deactivation_message=""
-/datum/dna/gene/disability/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/disability/can_activate(mob/M,flags)
return 1 // Always set!
-/datum/dna/gene/disability/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/disability/activate(mob/M, connected, flags)
if(mutation && !(mutation in M.mutations))
M.mutations.Add(mutation)
if(disability)
@@ -39,7 +39,7 @@
else
testing("[name] has no activation message.")
-/datum/dna/gene/disability/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/disability/deactivate(mob/M, connected, flags)
if(mutation && (mutation in M.mutations))
M.mutations.Remove(mutation)
if(disability)
@@ -116,7 +116,7 @@
/datum/dna/gene/disability/deaf/New()
block=DEAFBLOCK
-/datum/dna/gene/disability/deaf/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/disability/deaf/activate(mob/M, connected, flags)
..(M,connected,flags)
M.ear_deaf = 1
var/mob/living/mL = M // CHOMPStation Add: Ear Ringing/Deafness
diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm
index 209d998bac..8415ce36a2 100644
--- a/code/game/dna/genes/gene.dm
+++ b/code/game/dna/genes/gene.dm
@@ -16,23 +16,23 @@
/**
* Is the gene active in this mob's DNA?
*/
-/datum/gene/proc/is_active(var/mob/M) // Traitgenes edit - Removed /dna/ from path
+/datum/gene/proc/is_active(mob/M) // Traitgenes edit - Removed /dna/ from path
return (M.active_genes && (name in M.active_genes)) // Traitgenes edit - Use name instead, cannot use type with dynamically setup traitgenes. It is always unique due to the block number being appended to it.
// Return 1 if we can activate.
// HANDLE MUTCHK_FORCED HERE!
-/datum/gene/proc/can_activate(var/mob/M, var/mut_flags) // Traitgenes edit - Removed /dna/ from path. mut_flags instead of flags for clarity
+/datum/gene/proc/can_activate(mob/M, mut_flags) // Traitgenes edit - Removed /dna/ from path. mut_flags instead of flags for clarity
return 0
// Called when the gene activates. Do your magic here.
-/datum/gene/proc/activate(var/mob/M, var/connected, var/mut_flags) // Traitgenes edit - Removed /dna/ from path. mut_flags instead of flags for clarity
+/datum/gene/proc/activate(mob/M, connected, mut_flags) // Traitgenes edit - Removed /dna/ from path. mut_flags instead of flags for clarity
return
/**
* Called when the gene deactivates. Undo your magic here.
* Only called when the block is deactivated.
*/
-/datum/gene/proc/deactivate(var/mob/M, var/connected, var/mut_flags) // Traitgenes edit - Removed /dna/ from path. mut_flags instead of flags for clarity
+/datum/gene/proc/deactivate(mob/M, connected, mut_flags) // Traitgenes edit - Removed /dna/ from path. mut_flags instead of flags for clarity
return
// Traitgenes edit - Genes are linked to traits now. Because no one bothered to maintain genes, and instead jumped through two different trait systems to avoid them. So here we are. - Willbird
@@ -70,7 +70,7 @@
return linked_trait.desc
return desc
-/datum/gene/trait/can_activate(var/mob/M,var/mut_flags)
+/datum/gene/trait/can_activate(mob/M,mut_flags)
return TRUE // We don't do probability checks for trait genes, due to the spiderweb of logic they are with conflicting genes. Check has_conflicts() for how conflicting traits are handled.
/**
@@ -86,7 +86,7 @@
* has_conflict(traits_to_check = list(trait_path))
* ```
*/
-/datum/gene/trait/proc/has_conflict(var/list/traits_to_check, var/quick_scan = TRUE)
+/datum/gene/trait/proc/has_conflict(list/traits_to_check, quick_scan = TRUE)
var/has_conflict = FALSE
var/path = linked_trait.type
for(var/P in traits_to_check)
@@ -108,7 +108,7 @@
return has_conflict
-/datum/gene/trait/activate(var/mob/M, var/connected, var/mut_flags)
+/datum/gene/trait/activate(mob/M, connected, mut_flags)
if(linked_trait && ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species) // Lets avoid runtime assertions
@@ -123,7 +123,7 @@
if(!(mut_flags & MUTCHK_HIDEMSG))
linked_trait.send_message( H, TRUE)
-/datum/gene/trait/deactivate(var/mob/M, var/connected, var/mut_flags)
+/datum/gene/trait/deactivate(mob/M, connected, mut_flags)
if(linked_trait && ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species) // Lets avoid runtime assertions
diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm
index a3add703f5..831e43f5f7 100644
--- a/code/game/dna/genes/monkey.dm
+++ b/code/game/dna/genes/monkey.dm
@@ -4,10 +4,10 @@
/datum/dna/gene/monkey/New()
block=MONKEYBLOCK
-/datum/dna/gene/monkey/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/monkey/can_activate(mob/M,flags)
return ishuman(M) || istype(M,/mob/living/carbon/monkey)
-/datum/dna/gene/monkey/activate(var/mob/living/M, var/connected, var/flags)
+/datum/dna/gene/monkey/activate(mob/living/M, connected, flags)
if(!ishuman(M))
//testing("Cannot monkey-ify [M], type is [M.type].")
return
@@ -78,7 +78,7 @@
qdel(M)
return
-/datum/dna/gene/monkey/deactivate(var/mob/living/M, var/connected, var/flags)
+/datum/dna/gene/monkey/deactivate(mob/living/M, connected, flags)
if(!istype(M,/mob/living/carbon/monkey))
//testing("Cannot humanize [M], type is [M.type].")
return
diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm
index 7617682b36..36a04aaceb 100644
--- a/code/game/dna/genes/powers.dm
+++ b/code/game/dna/genes/powers.dm
@@ -18,7 +18,7 @@
/datum/dna/gene/basic/remoteview/New()
block=REMOTEVIEWBLOCK
-/datum/dna/gene/basic/remoteview/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/remoteview/activate(mob/M, connected, flags)
..(M,connected,flags)
add_verb(M, /mob/living/carbon/human/proc/remoteobserve)
@@ -46,7 +46,7 @@
/datum/dna/gene/basic/remotetalk/New()
block=REMOTETALKBLOCK
-/datum/dna/gene/basic/remotetalk/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/remotetalk/activate(mob/M, connected, flags)
..(M,connected,flags)
add_verb(M, /mob/living/carbon/human/proc/remotesay)
@@ -58,7 +58,7 @@
/datum/dna/gene/basic/morph/New()
block=MORPHBLOCK
-/datum/dna/gene/basic/morph/activate(var/mob/M)
+/datum/dna/gene/basic/morph/activate(mob/M)
..(M)
add_verb(M, /mob/living/carbon/human/proc/morph)
@@ -70,14 +70,14 @@
/datum/dna/gene/basic/cold_resist/New()
block=FIREBLOCK
-/datum/dna/gene/basic/cold_resist/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/basic/cold_resist/can_activate(mob/M,flags)
if(flags & MUTCHK_FORCED)
return 1
var/_prob=30
if(probinj(_prob,(flags&MUTCHK_FORCED)))
return 1
-/datum/dna/gene/basic/cold_resist/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+/datum/dna/gene/basic/cold_resist/OnDrawUnderlays(mob/M,g,fat)
return "fire[fat]_s"
/datum/dna/gene/basic/noprints
@@ -104,17 +104,17 @@
/datum/dna/gene/basic/midget/New()
block=SMALLSIZEBLOCK
-/datum/dna/gene/basic/midget/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/basic/midget/can_activate(mob/M,flags)
// Can't be big and small.
if(HULK in M.mutations)
return 0
return ..(M,flags)
-/datum/dna/gene/basic/midget/activate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/midget/activate(mob/M, connected, flags)
..(M,connected,flags)
M.pass_flags |= 1
-/datum/dna/gene/basic/midget/deactivate(var/mob/M, var/connected, var/flags)
+/datum/dna/gene/basic/midget/deactivate(mob/M, connected, flags)
..(M,connected,flags)
M.pass_flags &= ~1 //This may cause issues down the track, but offhand I can't think of any other way for humans to get passtable short of varediting so it should be fine. ~Z
@@ -126,19 +126,19 @@
/datum/dna/gene/basic/hulk/New()
block=HULKBLOCK
-/datum/dna/gene/basic/hulk/can_activate(var/mob/M,var/flags)
+/datum/dna/gene/basic/hulk/can_activate(mob/M,flags)
// Can't be big and small.
if(mSmallsize in M.mutations)
return 0
return ..(M,flags)
-/datum/dna/gene/basic/hulk/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+/datum/dna/gene/basic/hulk/OnDrawUnderlays(mob/M,g,fat)
if(fat)
return "hulk_[fat]_s"
else
return "hulk_[g]_s"
-/datum/dna/gene/basic/hulk/OnMobLife(var/mob/living/carbon/human/M)
+/datum/dna/gene/basic/hulk/OnMobLife(mob/living/carbon/human/M)
if(!istype(M)) return
if(M.health <= 25)
M.mutations.Remove(HULK)
@@ -163,5 +163,5 @@
/datum/dna/gene/basic/tk/New()
block=TELEBLOCK
-/datum/dna/gene/basic/tk/OnDrawUnderlays(var/mob/M,var/g,var/fat)
+/datum/dna/gene/basic/tk/OnDrawUnderlays(mob/M,g,fat)
return "telekinesishead[fat]_s"
diff --git a/code/game/gamemodes/cult/construct_spells.dm b/code/game/gamemodes/cult/construct_spells.dm
index 39903a8ee4..29c747d33b 100644
--- a/code/game/gamemodes/cult/construct_spells.dm
+++ b/code/game/gamemodes/cult/construct_spells.dm
@@ -1,6 +1,6 @@
//////////////////////////////Construct Spells/////////////////////////
-/proc/findNullRod(var/atom/target)
+/proc/findNullRod(atom/target)
if(istype(target,/obj/item/nullrod))
return 1
else if(target.contents)
@@ -43,7 +43,7 @@
hud_state = "const_floor"
-/datum/spell/aoe_turf/conjure/floor/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/floor/conjure_animation(atom/movable/overlay/animation, turf/target)
animation.icon_state = "cultfloor"
flick("cultfloor",animation)
QDEL_IN(animation, 1 SECOND)
@@ -61,7 +61,7 @@
hud_state = "const_wall"
-/datum/spell/aoe_turf/conjure/wall/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/wall/conjure_animation(atom/movable/overlay/animation, turf/target)
animation.icon_state = "cultwall"
flick("cultwall",animation)
QDEL_IN(animation, 1 SECOND)
@@ -220,17 +220,17 @@
hud_state = "const_shift"
-/datum/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(atom/movable/overlay/animation, mob/living/target)
animation.icon_state = "phase_shift"
animation.dir = target.dir
flick("phase_shift",animation)
-/datum/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(atom/movable/overlay/animation, mob/living/target)
animation.icon_state = "phase_shift2"
animation.dir = target.dir
flick("phase_shift2",animation)
-/datum/spell/targeted/ethereal_jaunt/shift/jaunt_steam(var/mobloc)
+/datum/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc)
return
/*
@@ -443,7 +443,7 @@
if(!owner)
return INITIALIZE_HINT_QDEL
-/obj/item/spell/construct/adjust_instability(var/amount) //The only drawback to the boons of the geometer is the use of a mortal's blood as fuel. Constructs have already paid that price long ago.
+/obj/item/spell/construct/adjust_instability(amount) //The only drawback to the boons of the geometer is the use of a mortal's blood as fuel. Constructs have already paid that price long ago.
return
/obj/item/spell/construct/run_checks()
@@ -453,7 +453,7 @@
return 1
return 0
-/obj/item/spell/construct/pay_energy(var/amount)
+/obj/item/spell/construct/pay_energy(amount)
if(owner)
if(istype(owner, /mob/living/simple_mob/construct))
return 1
@@ -461,7 +461,7 @@
return 1
return 0
-/obj/item/spell/construct/proc/pay_blood(var/amount) //If, for some reason, this is put into the hands of a cultist, by a talisnam or whatever.
+/obj/item/spell/construct/proc/pay_blood(amount) //If, for some reason, this is put into the hands of a cultist, by a talisnam or whatever.
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
if(!H.should_have_organ(O_HEART))
@@ -722,7 +722,7 @@
tracer_type = /obj/effect/projectile/tracer/laser_omni
impact_type = /obj/effect/projectile/impact/laser_omni
-/obj/item/projectile/beam/crippling_beam/proc/bang(var/mob/living/carbon/M)
+/obj/item/projectile/beam/crippling_beam/proc/bang(mob/living/carbon/M)
to_chat(M, span_danger("You hear a loud roar."))
playsound(src, 'sound/effects/bang.ogg', 50, 1)
var/ear_safety = 0
@@ -748,7 +748,7 @@
to_chat(M, span_danger("Your ears start to ring!"))
M.update_icons()
-/obj/item/projectile/beam/crippling_beam/on_hit(var/atom/target)
+/obj/item/projectile/beam/crippling_beam/on_hit(atom/target)
bang(target)
. = ..()
@@ -786,14 +786,14 @@
tracer_type = /obj/effect/projectile/tracer/lightning
impact_type = /obj/effect/projectile/impact/lightning
-/obj/item/projectile/beam/banishment/proc/banish(var/mob/living/simple_mob/construct)
+/obj/item/projectile/beam/banishment/proc/banish(mob/living/simple_mob/construct)
if(construct)
construct.Stun(10)
construct.Weaken(2)
else
return
-/obj/item/projectile/beam/banishment/on_hit(var/atom/target)
+/obj/item/projectile/beam/banishment/on_hit(atom/target)
banish(target)
. = ..()
@@ -835,7 +835,7 @@
tracer_type = /obj/effect/projectile/tracer/tungsten
impact_type = /obj/effect/projectile/impact/tungsten
-/obj/item/projectile/beam/force_beam/on_hit(var/atom/movable/target, var/blocked = 0)
+/obj/item/projectile/beam/force_beam/on_hit(atom/movable/target, blocked = 0)
if(isliving(target))
var/mob/living/L = target
if(prob(40) && !blocked)
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 26c6fc21d5..f1d0b8ace9 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -40,19 +40,19 @@
/obj/structure/cult/pylon/attack_hand(mob/M as mob)
attackpylon(M, 5)
-/obj/structure/cult/pylon/attack_generic(var/mob/user, var/damage)
+/obj/structure/cult/pylon/attack_generic(mob/user, damage)
attackpylon(user, damage)
/obj/structure/cult/pylon/attackby(obj/item/W as obj, mob/user as mob)
attackpylon(user, W.force)
-/obj/structure/cult/pylon/take_damage(var/damage)
+/obj/structure/cult/pylon/take_damage(damage)
pylonhit(damage)
-/obj/structure/cult/pylon/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/cult/pylon/bullet_act(obj/item/projectile/Proj)
pylonhit(Proj.get_structure_damage())
-/obj/structure/cult/pylon/proc/pylonhit(var/damage)
+/obj/structure/cult/pylon/proc/pylonhit(damage)
if(!isbroken)
if(prob(1+ damage * 5))
visible_message(span_danger("[shatter_message]"))
@@ -63,7 +63,7 @@
icon_state = "[initial(icon_state)]-broken"
set_light(0)
-/obj/structure/cult/pylon/proc/attackpylon(mob/user as mob, var/damage)
+/obj/structure/cult/pylon/proc/attackpylon(mob/user as mob, damage)
if(!isbroken)
if(prob(1+ damage * 5))
user.visible_message(
@@ -163,7 +163,7 @@
new t(get_turf(src))
qdel(src)
-/obj/effect/gateway/active/Crossed(var/atom/A)
+/obj/effect/gateway/active/Crossed(atom/A)
if(A.is_incorporeal())
return
if(!isliving(A))
diff --git a/code/game/gamemodes/cult/cultify/mob.dm b/code/game/gamemodes/cult/cultify/mob.dm
index 8322d22698..2bc74e5cd7 100644
--- a/code/game/gamemodes/cult/cultify/mob.dm
+++ b/code/game/gamemodes/cult/cultify/mob.dm
@@ -32,7 +32,7 @@
else
dust()
-/mob/proc/see_narsie(var/obj/singularity/narsie/large/N, var/dir)
+/mob/proc/see_narsie(obj/singularity/narsie/large/N, dir)
if(N.chained)
if(narsimage)
qdel(narsimage)
diff --git a/code/game/gamemodes/cult/hell_universe.dm b/code/game/gamemodes/cult/hell_universe.dm
index 810c0ead17..f1f67c898d 100644
--- a/code/game/gamemodes/cult/hell_universe.dm
+++ b/code/game/gamemodes/cult/hell_universe.dm
@@ -12,7 +12,7 @@ In short:
decay_rate = 5 // 5% chance of a turf decaying on lighting update/airflow (there's no actual tick for turfs)
-/datum/universal_state/hell/OnShuttleCall(var/mob/user)
+/datum/universal_state/hell/OnShuttleCall(mob/user)
return 1
/*
if(user)
@@ -20,7 +20,7 @@ In short:
return 0
*/
-/datum/universal_state/hell/DecayTurf(var/turf/T)
+/datum/universal_state/hell/DecayTurf(turf/T)
if(!T.holy)
T.cultify()
for(var/obj/machinery/light/L in T.contents)
@@ -29,7 +29,7 @@ In short:
return
-/datum/universal_state/hell/OnTurfChange(var/turf/T)
+/datum/universal_state/hell/OnTurfChange(turf/T)
var/turf/space/S = T
if(istype(S))
S.color = "#FF0000"
diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm
index 6d6b223c2f..d5ba40d649 100644
--- a/code/game/gamemodes/cult/narsie.dm
+++ b/code/game/gamemodes/cult/narsie.dm
@@ -96,7 +96,7 @@ GLOBAL_VAR_INIT(narsie_cometh, 0)
else if(istype(A, /obj/structure/cult))
qdel(A)
-/obj/singularity/narsie/move(var/force_move = 0)
+/obj/singularity/narsie/move(force_move = 0)
if(!move_self)
return 0
@@ -114,7 +114,7 @@ GLOBAL_VAR_INIT(narsie_cometh, 0)
step(src, movement_dir)
return 1
-/obj/singularity/narsie/large/move(var/force_move = 0)
+/obj/singularity/narsie/large/move(force_move = 0)
if(!move_self)
return 0
@@ -139,7 +139,7 @@ GLOBAL_VAR_INIT(narsie_cometh, 0)
M.see_narsie(src,movement_dir)
return 1
-/obj/singularity/narsie/proc/narsiefloor(var/turf/T)//leaving "footprints"
+/obj/singularity/narsie/proc/narsiefloor(turf/T)//leaving "footprints"
if(!(istype(T, /turf/simulated/wall/cult)||istype(T, /turf/space)))
if(T.icon_state != "cult-narsie")
T.desc = "something that goes beyond your understanding went this way."
@@ -147,7 +147,7 @@ GLOBAL_VAR_INIT(narsie_cometh, 0)
T.icon_state = "cult-narsie"
T.set_light(1)
-/obj/singularity/narsie/proc/narsiewall(var/turf/T)
+/obj/singularity/narsie/proc/narsiewall(turf/T)
T.desc = "An opening has been made on that wall, but who can say if what you seek truly lies on the other side?"
T.icon = 'icons/turf/walls.dmi'
T.icon_state = "cult-narsie"
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 3020cfe3da..4889046513 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(sacrificed)
/////////////////////////////////////////FIRST RUNE
-/obj/effect/rune/proc/teleport(var/key)
+/obj/effect/rune/proc/teleport(key)
var/mob/living/user = usr
var/allrunesloc[]
allrunesloc = new/list()
@@ -46,7 +46,7 @@ GLOBAL_LIST_EMPTY(sacrificed)
return
-/obj/effect/rune/proc/itemport(var/key)
+/obj/effect/rune/proc/itemport(key)
var/culcount = 0
var/runecount = 0
var/obj/effect/rune/IP = null
@@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(sacrificed)
/////////////////////////////////////////FIFTH RUNE
-/obj/effect/rune/proc/emp(var/U,var/range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist
+/obj/effect/rune/proc/emp(U,range_red) //range_red - var which determines by which number to reduce the default emp range, U is the source loc, needed because of talisman emps which are held in hand at the moment of using and that apparently messes things up -- Urist
log_and_message_admins("activated an EMP rune.")
if(istype(src,/obj/effect/rune))
usr.say("Ta'gh fara[pick("'","`")]qha fel d'amar det!")
@@ -388,7 +388,7 @@ GLOBAL_LIST_EMPTY(sacrificed)
/////////////////////////////////////////NINETH RUNE
-/obj/effect/rune/proc/obscure(var/rad)
+/obj/effect/rune/proc/obscure(rad)
var/S=0
for(var/obj/effect/rune/R in orange(rad,src))
if(R!=src)
@@ -750,7 +750,7 @@ GLOBAL_LIST_EMPTY(sacrificed)
/////////////////////////////////////////SIXTEENTH RUNE
-/obj/effect/rune/proc/revealrunes(var/obj/W as obj)
+/obj/effect/rune/proc/revealrunes(obj/W as obj)
var/go=0
var/rad
var/S=0
@@ -1051,7 +1051,7 @@ GLOBAL_LIST_EMPTY(sacrificed)
////////// Rune 24 (counting burningblood, which kinda doesnt work yet.)
-/obj/effect/rune/proc/runestun(var/mob/living/T as mob)
+/obj/effect/rune/proc/runestun(mob/living/T as mob)
if(istype(src,/obj/effect/rune)) ///When invoked as rune, flash and stun everyone around.
usr.say("Fuu ma[pick("'","`")]jin!")
for(var/mob/living/L in viewers(src))
diff --git a/code/game/gamemodes/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm
index d84f4b929a..e97a384b45 100644
--- a/code/game/gamemodes/cult/soulstone.dm
+++ b/code/game/gamemodes/cult/soulstone.dm
@@ -105,7 +105,7 @@
////////////////////////////Proc for moving soul in and out off stone//////////////////////////////////////
-/obj/item/soulstone/proc/transfer_human(var/mob/living/carbon/human/T,var/mob/U)
+/obj/item/soulstone/proc/transfer_human(mob/living/carbon/human/T,mob/U)
if(!istype(T))
return;
if(src.imprinted != "empty")
@@ -158,7 +158,7 @@
src.imprinted = "[S.name]"
qdel(T)
-/obj/item/soulstone/proc/transfer_shade(var/mob/living/simple_mob/construct/shade/T,var/mob/U)
+/obj/item/soulstone/proc/transfer_shade(mob/living/simple_mob/construct/shade/T,mob/U)
if(!istype(T))
return;
if (T.stat == DEAD)
@@ -180,7 +180,7 @@
to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form")
to_chat(U, span_notice("Capture successful!") + ": [T.name]'s has been recaptured and stored within the soul stone.")
-/obj/item/soulstone/proc/transfer_construct(var/obj/structure/constructshell/T,var/mob/U)
+/obj/item/soulstone/proc/transfer_construct(obj/structure/constructshell/T,mob/U)
var/mob/living/simple_mob/construct/shade/A = locate() in src
if(!A)
to_chat(U, span_danger("Capture failed!") + ": The soul stone is empty! Go kill someone!")
@@ -238,7 +238,7 @@
Z.cancel_camera()
qdel(src)
-/obj/item/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob)
+/obj/item/soulstone/proc/transfer_soul(choice as text, target, mob/U as mob)
switch(choice)
if("VICTIM")
transfer_human(target,U)
diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm
index 5c89de4f39..7a09201573 100644
--- a/code/game/gamemodes/cult/talisman.dm
+++ b/code/game/gamemodes/cult/talisman.dm
@@ -59,7 +59,7 @@
..()
-/obj/item/paper/talisman/proc/supply(var/key)
+/obj/item/paper/talisman/proc/supply(key)
if (!src.uses)
qdel(src)
return
diff --git a/code/game/gamemodes/endgame/endgame.dm b/code/game/gamemodes/endgame/endgame.dm
index bc7e61d5c3..5049e6efb5 100644
--- a/code/game/gamemodes/endgame/endgame.dm
+++ b/code/game/gamemodes/endgame/endgame.dm
@@ -25,7 +25,7 @@
var/decay_rate = 0
// Actually decay the turf.
-/datum/universal_state/proc/DecayTurf(var/turf/T)
+/datum/universal_state/proc/DecayTurf(turf/T)
if(istype(T,/turf/simulated/wall))
var/turf/simulated/wall/W=T
W.melt()
@@ -40,11 +40,11 @@
return
// Return 0 to cause shuttle call to fail.
-/datum/universal_state/proc/OnShuttleCall(var/mob/user)
+/datum/universal_state/proc/OnShuttleCall(mob/user)
return 1
// Processed per tick
-/datum/universal_state/proc/OnTurfTick(var/turf/T)
+/datum/universal_state/proc/OnTurfTick(turf/T)
if(decay_rate && prob(decay_rate))
DecayTurf(T)
@@ -57,13 +57,13 @@
// Does nothing by default
// Apply changes to a new turf.
-/datum/universal_state/proc/OnTurfChange(var/turf/NT)
+/datum/universal_state/proc/OnTurfChange(turf/NT)
return
/datum/universal_state/proc/OverlayAndAmbientSet()
return
-/proc/SetUniversalState(var/newstate,var/on_exit=1, var/on_enter=1)
+/proc/SetUniversalState(newstate,on_exit=1, on_enter=1)
if(on_exit)
GLOB.universe.OnExit()
GLOB.universe = new newstate
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
index 955b872b26..a8a4e9b48b 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
@@ -76,7 +76,7 @@
Consume(AM)
-/turf/unsimulated/wall/supermatter/proc/Consume(var/mob/living/user)
+/turf/unsimulated/wall/supermatter/proc/Consume(mob/living/user)
if(istype(user,/mob/observer))
return
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm
index 255b60c142..dba2df4e8a 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/portal.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/portal.dm
@@ -27,7 +27,7 @@
M.see_rift(src)
eat()
-/obj/singularity/narsie/large/exit/acquire(var/mob/food)
+/obj/singularity/narsie/large/exit/acquire(mob/food)
return
/obj/singularity/narsie/large/exit/consume(const/atom/A)
@@ -75,7 +75,7 @@
//thou shall always be able to see the rift
var/image/riftimage = null
-/mob/proc/see_rift(var/obj/singularity/narsie/large/exit/R)
+/mob/proc/see_rift(obj/singularity/narsie/large/exit/R)
var/turf/T_mob = get_turf(src)
if((R.z == T_mob.z) && (get_dist(R,T_mob) <= (R.consume_range+10)) && !(R in view(T_mob)))
if(!riftimage)
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
index 673734602c..aa8ec089e1 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
@@ -7,19 +7,19 @@ GLOBAL_VAR_INIT(universe_has_ended, 0)
decay_rate = 5 // 5% chance of a turf decaying on lighting update/airflow (there's no actual tick for turfs)
-/datum/universal_state/supermatter_cascade/OnShuttleCall(var/mob/user)
+/datum/universal_state/supermatter_cascade/OnShuttleCall(mob/user)
if(user)
to_chat(user, span_sinister("All you hear on the frequency is static and panicked screaming. There will be no shuttle call today."))
return 0
-/datum/universal_state/supermatter_cascade/OnTurfChange(var/turf/T)
+/datum/universal_state/supermatter_cascade/OnTurfChange(turf/T)
var/turf/space/S = T
if(istype(S))
S.color = "#0066FF"
else
S.color = initial(S.color)
-/datum/universal_state/supermatter_cascade/DecayTurf(var/turf/T)
+/datum/universal_state/supermatter_cascade/DecayTurf(turf/T)
if(istype(T,/turf/simulated/wall))
var/turf/simulated/wall/W=T
W.melt()
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 26c6a70ad7..e9bcfb99dc 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -107,7 +107,7 @@ GLOBAL_VAR_INIT(hadevent, 0)
if(H.client && H.appendicitis())
break
-/proc/alien_infestation(var/spawncount = 1) // -- TLE
+/proc/alien_infestation(spawncount = 1) // -- TLE
//command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert")
// play_simple_announcement(world, ANNOUNCER_MSG_UNIDENTIFIED_LIFESIGNS)
var/list/vents = list()
diff --git a/code/game/gamemodes/events/black_hole.dm b/code/game/gamemodes/events/black_hole.dm
index 2ec56169aa..1ccff9e806 100644
--- a/code/game/gamemodes/events/black_hole.dm
+++ b/code/game/gamemodes/events/black_hole.dm
@@ -78,7 +78,7 @@
anchored = TRUE
controller()
-/obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
+/obj/effect/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance)
if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen
qdel(src)
return
@@ -89,7 +89,7 @@
affect_coord(x-r, y-t, ex_act_force, pull_chance, turf_removal_chance)
return
-/obj/effect/bhole/proc/affect_coord(var/x, var/y, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
+/obj/effect/bhole/proc/affect_coord(x, y, ex_act_force, pull_chance, turf_removal_chance)
//Get turf at coordinate
var/turf/T = locate(x, y, z)
if(isnull(T)) return
diff --git a/code/game/gamemodes/events/clang.dm b/code/game/gamemodes/events/clang.dm
index 7afd471b10..3ac0280a2b 100644
--- a/code/game/gamemodes/events/clang.dm
+++ b/code/game/gamemodes/events/clang.dm
@@ -77,7 +77,7 @@
var/turf/despawn_loc = null
var/has_hunted_unlucky = FALSE
-/obj/effect/immovablerod/proc/TakeFlight(var/turf/end)
+/obj/effect/immovablerod/proc/TakeFlight(turf/end)
despawn_loc = end
walk_towards(src, despawn_loc, 1)
explosion(loc, 2, 3, 5) // start out with a bang
diff --git a/code/game/gamemodes/events/dust.dm b/code/game/gamemodes/events/dust.dm
index 11613c33f7..dccc80802b 100644
--- a/code/game/gamemodes/events/dust.dm
+++ b/code/game/gamemodes/events/dust.dm
@@ -7,7 +7,7 @@ No command report on the common version of this event.
The "dust" will damage the hull of the station causin minor hull breaches.
*/
-/proc/dust_swarm(var/strength = "weak", var/list/affecting_z)
+/proc/dust_swarm(strength = "weak", list/affecting_z)
var/numbers = 1
var/dust_type = /obj/effect/space_dust
switch(strength)
diff --git a/code/game/gamemodes/events/power_failure.dm b/code/game/gamemodes/events/power_failure.dm
index 0189fe1804..c67cd68008 100644
--- a/code/game/gamemodes/events/power_failure.dm
+++ b/code/game/gamemodes/events/power_failure.dm
@@ -1,5 +1,5 @@
-/proc/power_failure(var/announce = 1)
+/proc/power_failure(announce = 1)
if(announce)
GLOB.command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = ANNOUNCER_MSG_POWER_OFF)
@@ -23,7 +23,7 @@
if(!C.is_critical && C.cell && (C.z in using_map.station_levels))
C.cell.charge = 0
-/proc/power_restore(var/announce = 1)
+/proc/power_restore(announce = 1)
var/list/skipped_areas = list(/area/ai)
if(announce)
@@ -41,7 +41,7 @@
S.update_icon()
S.power_change()
-/proc/power_restore_quick(var/announce = 1)
+/proc/power_restore_quick(announce = 1)
if(announce)
GLOB.command_announcement.Announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = ANNOUNCER_MSG_POWER_ON)
diff --git a/code/game/gamemodes/events/wormholes.dm b/code/game/gamemodes/events/wormholes.dm
index c4d42ca600..a1bf017c48 100644
--- a/code/game/gamemodes/events/wormholes.dm
+++ b/code/game/gamemodes/events/wormholes.dm
@@ -1,4 +1,4 @@
-/proc/wormhole_event(var/set_duration = 5 MINUTES, var/wormhole_duration_modifier = 1)
+/proc/wormhole_event(set_duration = 5 MINUTES, wormhole_duration_modifier = 1)
spawn()
// CHOMPEdit Start - Only allowing these to go to the station
var/list/pick_turfs = list()
@@ -77,7 +77,7 @@
//maybe this proc can even be used as an admin tool for teleporting players without ruining immulsions?
-/proc/create_wormhole(var/turf/enter as turf, var/atom/exit, var/min_duration = 30 SECONDS, var/max_duration = 60 SECONDS) // CHOMPEdit
+/proc/create_wormhole(turf/enter as turf, atom/exit, min_duration = 30 SECONDS, max_duration = 60 SECONDS) // CHOMPEdit
set waitfor = FALSE
var/obj/effect/portal/P = new /obj/effect/portal( enter )
P.target = exit
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index c7d354f922..64a1b887a1 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
///can_start()
///Checks to see if the game can be setup and ran with the current number of players or whatnot.
-/datum/game_mode/proc/can_start(var/do_not_spawn)
+/datum/game_mode/proc/can_start(do_not_spawn)
var/playerC = 0
for(var/mob/new_player/player in GLOB.player_list)
if((player.client)&&(player.ready))
@@ -399,7 +399,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
/datum/game_mode/proc/check_win() //universal trigger to be called at mob death, nuke explosion, etc. To be called from everywhere.
return 0
-/datum/game_mode/proc/get_players_for_role(var/role, var/antag_id, var/ghosts_only)
+/datum/game_mode/proc/get_players_for_role(role, antag_id, ghosts_only)
var/list/players = list()
var/list/candidates = list()
@@ -554,7 +554,7 @@ GLOBAL_LIST_EMPTY(additional_antag_types)
if(dudes.len == 0) return null
return pick(dudes)
-/proc/show_objectives(var/datum/mind/player)
+/proc/show_objectives(datum/mind/player)
if(!player || !player.current) return
diff --git a/code/game/gamemodes/game_mode_latespawn.dm b/code/game/gamemodes/game_mode_latespawn.dm
index 9b29150cd7..72333aa85d 100644
--- a/code/game/gamemodes/game_mode_latespawn.dm
+++ b/code/game/gamemodes/game_mode_latespawn.dm
@@ -3,7 +3,7 @@
/datum/game_mode/var/max_autotraitor_delay = 12000 // Approx 20 minutes.
/datum/game_mode/var/process_count = 0
-/datum/game_mode/proc/get_usable_templates(var/list/supplied_templates)
+/datum/game_mode/proc/get_usable_templates(list/supplied_templates)
var/list/usable_templates = list()
for(var/datum/antagonist/A in supplied_templates)
if(A.can_late_spawn())
@@ -20,13 +20,13 @@
process_count = 0
try_latespawn()
-/datum/game_mode/proc/latespawn(var/mob/living/carbon/human/character)
+/datum/game_mode/proc/latespawn(mob/living/carbon/human/character)
if(!character.mind)
return
try_latespawn(character.mind)
return 0
-/datum/game_mode/proc/try_latespawn(var/datum/mind/player, var/latejoin_only)
+/datum/game_mode/proc/try_latespawn(datum/mind/player, latejoin_only)
if(SSemergency_shuttle.departed || !round_autoantag)
return
diff --git a/code/game/gamemodes/malfunction/malf_research.dm b/code/game/gamemodes/malfunction/malf_research.dm
index b9314ca4ca..91b0ac7885 100644
--- a/code/game/gamemodes/malfunction/malf_research.dm
+++ b/code/game/gamemodes/malfunction/malf_research.dm
@@ -43,7 +43,7 @@
// Proc: process()
// Parameters: None
// Description: Processes CPU gain and research progress based on "realtime" calculation.
-/datum/malf_research/process(var/idle = 0)
+/datum/malf_research/process(idle = 0)
if(idle) // No power or running on APU. Do nothing.
last_tick = world.time
return
diff --git a/code/game/gamemodes/malfunction/malf_research_ability.dm b/code/game/gamemodes/malfunction/malf_research_ability.dm
index f267e9243a..5c7d414b7a 100644
--- a/code/game/gamemodes/malfunction/malf_research_ability.dm
+++ b/code/game/gamemodes/malfunction/malf_research_ability.dm
@@ -7,7 +7,7 @@
var/datum/malf_research_ability/next = null // Next research (if applicable).
-/datum/malf_research_ability/process(var/time = 0)
+/datum/malf_research_ability/process(time = 0)
invested += time
if(invested >= price)
unlocked = 1
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm
index e46fec21b5..5b73be4c22 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/HELPERS.dm
@@ -96,7 +96,7 @@
// Proc: ability_prechecks()
// Parameters 2 - (user - User which used this ability check_price - If different than 0 checks for ability CPU price too. Does NOT use the CPU time!)
// Description: This is pre-check proc used to determine if the AI can use the ability.
-/proc/ability_prechecks(var/mob/living/silicon/ai/user = null, var/check_price = 0, var/override = 0)
+/proc/ability_prechecks(mob/living/silicon/ai/user = null, check_price = 0, override = 0)
if(!user)
return 0
if(!istype(user))
@@ -125,7 +125,7 @@
// Proc: ability_pay()
// Parameters 2 - (user - User from which we deduct CPU from, price - Amount of CPU power to use)
// Description: Uses up certain amount of CPU power. Returns 1 on success, 0 on failure.
-/proc/ability_pay(var/mob/living/silicon/ai/user = null, var/price = 0)
+/proc/ability_pay(mob/living/silicon/ai/user = null, price = 0)
if(!user)
return 0
if(user.APU_power)
@@ -146,7 +146,7 @@
// Proc: announce_hack_failure()
// Parameters 2 - (user - hacking user, text - Used in alert text creation)
// Description: Uses up certain amount of CPU power. Returns 1 on success, 0 on failure.
-/proc/announce_hack_failure(var/mob/living/silicon/ai/user = null, var/text)
+/proc/announce_hack_failure(mob/living/silicon/ai/user = null, text)
if(!user || !text)
return 0
var/fulltext = ""
@@ -167,7 +167,7 @@
// Proc: get_unhacked_apcs()
// Parameters: None
// Description: Returns a list of all unhacked APCs
-/proc/get_unhacked_apcs(var/mob/living/silicon/ai/user)
+/proc/get_unhacked_apcs(mob/living/silicon/ai/user)
var/list/H = list()
for(var/obj/machinery/power/apc/A in GLOB.apcs)
if(A.hacker && A.hacker == user)
@@ -177,7 +177,7 @@
// Helper procs which return lists of relevant mobs.
-/proc/get_unlinked_cyborgs(var/mob/living/silicon/ai/A)
+/proc/get_unlinked_cyborgs(mob/living/silicon/ai/A)
if(!A || !istype(A))
return
@@ -190,12 +190,12 @@
L.Add(RB)
return L
-/proc/get_linked_cyborgs(var/mob/living/silicon/ai/A)
+/proc/get_linked_cyborgs(mob/living/silicon/ai/A)
if(!A || !istype(A))
return
return A.connected_robots
-/proc/get_other_ais(var/mob/living/silicon/ai/A)
+/proc/get_other_ais(mob/living/silicon/ai/A)
if(!A || !istype(A))
return
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
index c3cc6dcf68..68c02b8ab7 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_interdiction.dm
@@ -56,7 +56,7 @@
cancel_call_proc(user)
-/datum/game_mode/malfunction/verb/unlock_cyborg(var/mob/living/silicon/robot/target = null as mob in get_linked_cyborgs(usr))
+/datum/game_mode/malfunction/verb/unlock_cyborg(mob/living/silicon/robot/target = null as mob in get_linked_cyborgs(usr))
set name = "Unlock Cyborg"
set desc = "125 CPU - Bypasses firewalls on Cyborg lock mechanism, allowing you to override lock command from robotics control console."
set category = "Software"
@@ -128,7 +128,7 @@
user.hacking = 0
-/datum/game_mode/malfunction/verb/hack_cyborg(var/mob/living/silicon/robot/target as mob in get_unlinked_cyborgs(usr))
+/datum/game_mode/malfunction/verb/hack_cyborg(mob/living/silicon/robot/target as mob in get_unlinked_cyborgs(usr))
set name = "Hack Cyborg"
set desc = "350 CPU - Allows you to hack cyborgs which are not slaved to you, bringing them under your control."
set category = "Software"
@@ -193,7 +193,7 @@
user.hacking = 0
-/datum/game_mode/malfunction/verb/hack_ai(var/mob/living/silicon/ai/target as mob in get_other_ais(usr))
+/datum/game_mode/malfunction/verb/hack_ai(mob/living/silicon/ai/target as mob in get_other_ais(usr))
set name = "Hack AI"
set desc = "600 CPU - Allows you to hack other AIs, slaving them under you."
set category = "Software"
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm
index df50a5ab3d..23c623bfc2 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_manipulation.dm
@@ -54,7 +54,7 @@
AP.set_broken()
-/datum/game_mode/malfunction/verb/hack_camera(var/obj/machinery/camera/target in GLOB.cameranet.cameras)
+/datum/game_mode/malfunction/verb/hack_camera(obj/machinery/camera/target in GLOB.cameranet.cameras)
set name = "Hack Camera"
set desc = "100 CPU - Hacks existing camera, allowing you to add upgrade of your choice to it. Alternatively it lets you reactivate broken camera."
set category = "Software"
@@ -111,7 +111,7 @@
return
-/datum/game_mode/malfunction/verb/emergency_forcefield(var/turf/T as turf in world)
+/datum/game_mode/malfunction/verb/emergency_forcefield(turf/T as turf in world)
set name = "Emergency Forcefield"
set desc = "275 CPU - Uses station's emergency shielding system to create temporary barrier which lasts for few minutes, but won't resist gunfire."
set category = "Software"
diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm
index 500c0ebdc6..ccf86e1eef 100644
--- a/code/game/gamemodes/meme/meme.dm
+++ b/code/game/gamemodes/meme/meme.dm
@@ -103,7 +103,7 @@
return
-/datum/game_mode/proc/forge_meme_objectives(var/datum/mind/meme, var/datum/mind/first_host)
+/datum/game_mode/proc/forge_meme_objectives(datum/mind/meme, datum/mind/first_host)
if (CONFIG_GET(flag/objectives_disabled)) // CHOMPEdit
return
@@ -124,7 +124,7 @@
return
-/datum/game_mode/proc/greet_meme(var/datum/mind/meme, var/you_are=1)
+/datum/game_mode/proc/greet_meme(datum/mind/meme, you_are=1)
if (you_are)
to_chat(meme.current, span_danger("You are a meme!"))
show_objectives(meme)
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index d55a0be0e7..f794411f61 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -42,12 +42,12 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
//Meteor spawning global procs
///////////////////////////////
-/proc/spawn_meteors(var/number = 10, var/list/meteortypes, var/startSide, var/zlevel)
+/proc/spawn_meteors(number = 10, list/meteortypes, startSide, zlevel)
log_game("Spawning [number] meteors on the [dir2text(startSide)] of [zlevel]")
for(var/i = 0; i < number; i++)
spawn_meteor(meteortypes, startSide, zlevel)
-/proc/spawn_meteor(var/list/meteortypes, var/startSide, var/startLevel)
+/proc/spawn_meteor(list/meteortypes, startSide, startLevel)
if(isnull(startSide))
startSide = pick(GLOB.cardinal)
if(isnull(startLevel))
@@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
return T
// Override for special behavior when getting hit by meteors, and only meteors. Return one if the meteor hasn't been 'stopped'.
-/atom/proc/handle_meteor_impact(var/obj/effect/meteor/meteor)
+/atom/proc/handle_meteor_impact(obj/effect/meteor/meteor)
return TRUE
///////////////////////
@@ -180,7 +180,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
/obj/effect/meteor/CanPass(atom/movable/mover, turf/target)
return istype(mover, /obj/effect/meteor) ? TRUE : ..()
-/obj/effect/meteor/proc/ram_turf(var/turf/T)
+/obj/effect/meteor/proc/ram_turf(turf/T)
//first bust whatever is in the turf
for(var/atom/A in T)
if(A == src) // Don't hit ourselves.
@@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
if(hits <= 0)
die(TRUE)
-/obj/effect/meteor/proc/die(var/explode = TRUE)
+/obj/effect/meteor/proc/die(explode = TRUE)
make_debris()
meteor_effect(explode)
qdel(src)
@@ -219,7 +219,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
return
..()
-/obj/effect/meteor/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/meteor/bullet_act(obj/item/projectile/Proj)
if(Proj.excavation_amount)
get_hit()
@@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
var/dist = get_dist(M.loc, src.loc)
shake_camera(M, dist > 20 ? 3 : 5, dist > 20 ? 1 : 3)
-/obj/effect/meteor/proc/meteor_effect(var/explode)
+/obj/effect/meteor/proc/meteor_effect(explode)
if(heavy)
shake_players()
@@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
dropamt = 3
wall_power = 200
-/obj/effect/meteor/medium/meteor_effect(var/explode)
+/obj/effect/meteor/medium/meteor_effect(explode)
..()
if(explode)
explosion(src.loc, 0, 1, 2, 3, 0)
@@ -283,7 +283,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
dropamt = 4
wall_power = 400
-/obj/effect/meteor/big/meteor_effect(var/explode)
+/obj/effect/meteor/big/meteor_effect(explode)
..()
if(explode)
explosion(src.loc, 1, 2, 3, 4, 0)
@@ -297,7 +297,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
meteordrop = /obj/item/ore/phoron
wall_power = 100
-/obj/effect/meteor/flaming/meteor_effect(var/explode)
+/obj/effect/meteor/flaming/meteor_effect(explode)
..()
if(explode)
explosion(src.loc, 1, 2, 3, 4, 0, 0, 5)
@@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
meteordrop = /obj/item/ore/uranium
wall_power = 75
-/obj/effect/meteor/irradiated/meteor_effect(var/explode)
+/obj/effect/meteor/irradiated/meteor_effect(explode)
..()
if(explode)
explosion(src.loc, 0, 0, 4, 3, 0)
@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
dropamt = 3
wall_power = 80
-/obj/effect/meteor/emp/meteor_effect(var/explode)
+/obj/effect/meteor/emp/meteor_effect(explode)
..()
// Best case scenario: Comparable to a low-yield EMP grenade.
// Worst case scenario: Comparable to a standard yield EMP grenade.
@@ -345,7 +345,7 @@ GLOBAL_LIST_INIT(meteors_catastrophic, list(
meteordrop = /obj/item/ore/phoron
wall_power = 150
-/obj/effect/meteor/tunguska/meteor_effect(var/explode)
+/obj/effect/meteor/tunguska/meteor_effect(explode)
..()
if(explode)
explosion(src.loc, 3, 6, 9, 20, 0)
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 3122530ace..beeb37aa02 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -9,7 +9,7 @@
#define IMPOSSIBLE 3
-/proc/GenerateTheft(var/job,var/datum/mind/traitor)
+/proc/GenerateTheft(job,datum/mind/traitor)
var/list/datum/objective/objectives = list()
for(var/o in typesof(/datum/objective/steal))
@@ -19,7 +19,7 @@
objectives[target] = target.weight
return objectives
-/proc/GenerateAssassinate(var/job,var/datum/mind/traitor)
+/proc/GenerateAssassinate(job,datum/mind/traitor)
var/list/datum/objective/assassinate/missions = list()
for(var/datum/mind/target in SSticker.minds)
@@ -30,7 +30,7 @@
missions[target_obj] = target_obj.weight
return missions
-/proc/GenerateFrame(var/job,var/datum/mind/traitor)
+/proc/GenerateFrame(job,datum/mind/traitor)
var/list/datum/objective/frame/missions = list()
for(var/datum/mind/target in SSticker.minds)
@@ -41,7 +41,7 @@
missions[target_obj] = target_obj.weight
return missions
-/proc/GenerateProtection(var/job,var/datum/mind/traitor)
+/proc/GenerateProtection(job,datum/mind/traitor)
var/list/datum/objective/frame/missions = list()
for(var/datum/mind/target in SSticker.minds)
@@ -53,7 +53,7 @@
return missions
-/proc/SelectObjectives(var/job,var/datum/mind/traitor,var/hijack = 0)
+/proc/SelectObjectives(job,datum/mind/traitor,hijack = 0)
var/list/chosenobjectives = list()
var/list/theftobjectives = GenerateTheft(job,traitor) //Separated all the objective types so they can be picked independantly of each other.
var/list/killobjectives = GenerateAssassinate(job,traitor)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index cbd8813aea..9b7d4fc636 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(all_objectives)
var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter.
var/completed = 0 //currently only used for custom objectives.
-/datum/objective/New(var/text)
+/datum/objective/New(text)
GLOB.all_objectives |= src
if(text)
explanation_text = text
@@ -568,7 +568,7 @@ GLOBAL_LIST_EMPTY(all_objectives)
return 1
-/datum/objective/absorb/proc/gen_amount_goal(var/lowbound = 4, var/highbound = 6)
+/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6)
target_amount = rand (lowbound,highbound)
if (SSticker)
var/n_p = 1 //autowin
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index c50ce6f8fe..278a74ce06 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -3,7 +3,7 @@
/////////////////////////
// Traitgenes Setup genetics using traits as a foundation for each gene. Basically making genetics automagic instead of something that needs to be maintained...
-/proc/setupgenetics(var/list/trait_list)
+/proc/setupgenetics(list/trait_list)
if(!trait_list)
return
var/list/blocks_remaining = list()
diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm
index c5e69d3ab9..ea078f0748 100644
--- a/code/game/gamemodes/technomancer/catalog.dm
+++ b/code/game/gamemodes/technomancer/catalog.dm
@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(all_technomancer_assistance, subtypesof(/datum/technomancer/ass
// Proc: bind_to_owner()
// Parameters: 1 (new_owner - mob that the book is trying to bind to)
// Description: Links the catalog to hopefully the technomancer, so that only they can access it.
-/obj/item/technomancer_catalog/proc/bind_to_owner(var/mob/living/carbon/human/new_owner)
+/obj/item/technomancer_catalog/proc/bind_to_owner(mob/living/carbon/human/new_owner)
if(!owner && (GLOB.technomancers.is_antagonist(new_owner.mind) || universal)) //VOREStation Edit - Universal catalogs
owner = new_owner
@@ -99,7 +99,7 @@ GLOBAL_LIST_INIT(all_technomancer_assistance, subtypesof(/datum/technomancer/ass
// Parameters: 1 (category - the category link to display)
// Description: Shows an href link to go to a spell subcategory if the category is not already selected, otherwise is bold, to reduce
// code duplicating.
-/obj/item/technomancer_catalog/proc/show_categories(var/category)
+/obj/item/technomancer_catalog/proc/show_categories(category)
if(category)
if(spell_tab != category)
return "[category]"
@@ -357,7 +357,7 @@ GLOBAL_LIST_INIT(all_technomancer_assistance, subtypesof(/datum/technomancer/ass
break
attack_self(H)
-/obj/item/technomancer_catalog/attackby(var/atom/movable/AM, var/mob/user)
+/obj/item/technomancer_catalog/attackby(atom/movable/AM, mob/user)
var/turf/T = get_turf(user)
if(T.z in using_map.player_levels)
to_chat(user, span_danger("You can only refund at your base, it's too late now!"))
diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm
index 8d3bf982b3..1abae251ff 100644
--- a/code/game/gamemodes/technomancer/core_obj.dm
+++ b/code/game/gamemodes/technomancer/core_obj.dm
@@ -137,7 +137,7 @@
var/obj/item/technomancer_core/core = null
var/ability_icon_state = null
-/obj/spellbutton/Initialize(mapload, var/path, var/new_name, var/new_icon_state)
+/obj/spellbutton/Initialize(mapload, path, new_name, new_icon_state)
. = ..()
src.core = loc
if(!path || !ispath(path) || !istype(core))
@@ -162,7 +162,7 @@
var/obj/item/technomancer_core/core = back
. += setup_technomancer_stat(core)
-/mob/living/carbon/human/proc/setup_technomancer_stat(var/obj/item/technomancer_core/core)
+/mob/living/carbon/human/proc/setup_technomancer_stat(obj/item/technomancer_core/core)
. = list()
if(core)
var/charge_status = "[core.energy]/[core.max_energy] ([round( (core.energy / core.max_energy) * 100)]%) \
@@ -174,7 +174,7 @@
for(var/obj/spellbutton/button in core.spells)
. += button
-/obj/item/technomancer_core/proc/add_spell(var/path, var/new_name, var/ability_icon_state)
+/obj/item/technomancer_core/proc/add_spell(path, new_name, ability_icon_state)
if(!path || !ispath(path))
message_admins("ERROR: /obj/item/technomancer_core/add_spell() was not given a proper path! \
The path supplied was [path].")
@@ -184,7 +184,7 @@
if(wearer)
wearer.ability_master.add_technomancer_ability(spell, ability_icon_state)
-/obj/item/technomancer_core/proc/remove_spell(var/obj/spellbutton/spell_to_remove)
+/obj/item/technomancer_core/proc/remove_spell(obj/spellbutton/spell_to_remove)
if(spell_to_remove in spells)
spells.Remove(spell_to_remove)
if(wearer)
@@ -198,7 +198,7 @@
spells.Remove(spell)
qdel(spell)
-/obj/item/technomancer_core/proc/has_spell(var/datum/technomancer/spell_to_check)
+/obj/item/technomancer_core/proc/has_spell(datum/technomancer/spell_to_check)
for(var/obj/spellbutton/spell in spells)
if(spell.spellpath == spell_to_check.obj_path)
return 1
diff --git a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm
index ed9ac36ebf..c619b4a6ee 100644
--- a/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm
+++ b/code/game/gamemodes/technomancer/devices/gloves_of_regen.dm
@@ -19,7 +19,7 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
-/obj/item/clothing/gloves/regen/equipped(var/mob/user)
+/obj/item/clothing/gloves/regen/equipped(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.gloves == src)
diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm
index ab61fdd960..2857540b32 100644
--- a/code/game/gamemodes/technomancer/devices/shield_armor.dm
+++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm
@@ -33,7 +33,7 @@
qdel(spark_system)
return ..()
-/obj/item/clothing/suit/armor/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/shield/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
//Since this is a pierce of armor that is passive, we do not need to check if the user is incapacitated.
if(!active)
return 0
diff --git a/code/game/gamemodes/technomancer/devices/tesla_armor.dm b/code/game/gamemodes/technomancer/devices/tesla_armor.dm
index f6888495a7..387fff252e 100644
--- a/code/game/gamemodes/technomancer/devices/tesla_armor.dm
+++ b/code/game/gamemodes/technomancer/devices/tesla_armor.dm
@@ -21,7 +21,7 @@
var/normal_icon_state = "tesla_armor_0"
var/cooldown_to_charge = 15 SECONDS
-/obj/item/clothing/suit/armor/tesla/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/tesla/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
//First, some retaliation.
if(active)
if(istype(damage_source, /obj/item/projectile))
diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm
index e2e283d9c3..e5d50f68cd 100644
--- a/code/game/gamemodes/technomancer/instability.dm
+++ b/code/game/gamemodes/technomancer/instability.dm
@@ -16,13 +16,13 @@
// Proc: adjust_instability()
// Parameters: 0
// Description: Does nothing, because inheritence.
-/mob/living/proc/adjust_instability(var/amount)
+/mob/living/proc/adjust_instability(amount)
instability = between(0, round(instability + amount, TECHNOMANCER_INSTABILITY_PRECISION), 200)
// Proc: adjust_instability()
// Parameters: 1 (amount - how much instability to give)
// Description: Adds or subtracks instability to the mob, then updates the hud.
-/mob/living/carbon/human/adjust_instability(var/amount)
+/mob/living/carbon/human/adjust_instability(amount)
..()
instability_update_hud()
diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm
index 9304b77554..91af7471fe 100644
--- a/code/game/gamemodes/technomancer/spell_objs.dm
+++ b/code/game/gamemodes/technomancer/spell_objs.dm
@@ -74,7 +74,7 @@
// Parameters: 1 (amount - how much to test and drain if there is enough)
// Description: Use this to make spells cost energy. It returns false if the technomancer cannot pay for the spell for any reason, and
// if they are able to pay, it is deducted automatically.
-/obj/item/spell/proc/pay_energy(var/amount)
+/obj/item/spell/proc/pay_energy(amount)
if(!core)
return 0
return core.pay_energy(amount)
@@ -82,7 +82,7 @@
// Proc: give_energy()
// Parameters: 1 (amount - how much to give to the technomancer)
// Description: Redirects the call to the core's give_energy().
-/obj/item/spell/proc/give_energy(var/amount)
+/obj/item/spell/proc/give_energy(amount)
if(!core)
return 0
return core.give_energy(amount)
@@ -90,7 +90,7 @@
// Proc: adjust_instability()
// Parameters: 1 (amount - how much instability to give)
// Description: Use this to quickly add or subtract instability from the caster of the spell. Owner is set by New().
-/obj/item/spell/proc/adjust_instability(var/amount)
+/obj/item/spell/proc/adjust_instability(amount)
if(!owner || !core)
return 0
amount = round(amount * core.instability_modifier, 0.1)
@@ -111,7 +111,7 @@
// Proc: New()
// Parameters: 0
// Description: Sets owner to equal its loc, links to the owner's core, then applies overlays if needed.
-/obj/item/spell/Initialize(mapload, var/coreless)
+/obj/item/spell/Initialize(mapload, coreless)
. = ..()
if(isliving(loc))
owner = loc
@@ -136,7 +136,7 @@
// Proc: unref_spells()
// Parameters: 0
// Description: Nulls object references on specific mobs so it can qdel() cleanly.
-/mob/proc/unref_spell(var/obj/item/spell/the_spell)
+/mob/proc/unref_spell(obj/item/spell/the_spell)
return
// Proc: update_icon()
@@ -186,7 +186,7 @@
// Proc: get_other_hand()
// Parameters: 1 (I - item being compared to determine what the offhand is)
// Description: Helper for Aspect spells.
-/mob/living/carbon/human/proc/get_other_hand(var/obj/item/I)
+/mob/living/carbon/human/proc/get_other_hand(obj/item/I)
if(r_hand == I)
return l_hand
else
@@ -243,13 +243,13 @@
// Proc: place_spell_in_hand()
// Parameters: 1 (path - the type path for the spell that is desired.)
// Description: Returns immediately, this is here to override for other mobs as needed.
-/mob/living/proc/place_spell_in_hand(var/path)
+/mob/living/proc/place_spell_in_hand(path)
return
// Proc: place_spell_in_hand()
// Parameters: 1 (path - the type path for the spell that is desired.)
// Description: Gives the spell to the human mob, if it is allowed to have spells, hands are not full, etc. Otherwise it deletes itself.
-/mob/living/carbon/human/place_spell_in_hand(var/path)
+/mob/living/carbon/human/place_spell_in_hand(path)
if(!path || !ispath(path))
return 0
diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm
index a74b5d20a5..4881ad2cc6 100644
--- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm
+++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm
@@ -1,5 +1,5 @@
//Returns 1 if the turf is dense, or if there's dense objects/mobs on it, unless told to ignore them.
-/turf/proc/check_density(var/ignore_objs = FALSE, var/ignore_mobs = FALSE)
+/turf/proc/check_density(ignore_objs = FALSE, ignore_mobs = FALSE)
if(density)
return TRUE
if(!ignore_objs || !ignore_mobs)
@@ -14,7 +14,7 @@
return FALSE
// Used to distinguish friend from foe.
-/obj/item/spell/proc/is_ally(var/mob/living/L)
+/obj/item/spell/proc/is_ally(mob/living/L)
if(L == owner) // The best ally is ourselves.
return 1
if(L.mind && GLOB.technomancers.is_antagonist(L.mind)) // This should be done better since we might want opposing technomancers later.
@@ -35,17 +35,17 @@
return FALSE
return TRUE
-/obj/item/spell/proc/within_range(var/atom/target, var/max_range = 7) // Beyond 7 is off the screen.
+/obj/item/spell/proc/within_range(atom/target, max_range = 7) // Beyond 7 is off the screen.
if(target in view(max_range, owner))
return TRUE
return FALSE
-/obj/item/spell/proc/calculate_spell_power(var/amount)
+/obj/item/spell/proc/calculate_spell_power(amount)
if(core)
return round(amount * core.spell_power_modifier, 1)
// Returns a 'target' mob from a radius around T.
-/obj/item/spell/proc/targeting_assist(var/turf/T, radius = 5)
+/obj/item/spell/proc/targeting_assist(turf/T, radius = 5)
var/chosen_target = null
var/potential_targets = view(T,radius)
for(var/mob/living/L in potential_targets)
diff --git a/code/game/gamemodes/technomancer/spells/aspect_aura.dm b/code/game/gamemodes/technomancer/spells/aspect_aura.dm
index f27a3be04d..aa99cadb27 100644
--- a/code/game/gamemodes/technomancer/spells/aspect_aura.dm
+++ b/code/game/gamemodes/technomancer/spells/aspect_aura.dm
@@ -15,7 +15,7 @@
cast_methods = CAST_COMBINE
aspect = ASPECT_CHROMATIC
-/obj/item/spell/aspect_aura/on_combine_cast(obj/item/W, var/mob/living/carbon/human/user)
+/obj/item/spell/aspect_aura/on_combine_cast(obj/item/W, mob/living/carbon/human/user)
if(istype(W, /obj/item/spell))
var/obj/item/spell/spell = W
if(!spell.aspect || spell.aspect == ASPECT_CHROMATIC)
diff --git a/code/game/gamemodes/technomancer/spells/blink.dm b/code/game/gamemodes/technomancer/spells/blink.dm
index 91f019b355..9f7897fb96 100644
--- a/code/game/gamemodes/technomancer/spells/blink.dm
+++ b/code/game/gamemodes/technomancer/spells/blink.dm
@@ -17,7 +17,7 @@
cast_methods = CAST_RANGED | CAST_MELEE | CAST_USE
aspect = ASPECT_TELE
-/proc/safe_blink(atom/movable/AM, var/range = 3)
+/proc/safe_blink(atom/movable/AM, range = 3)
if(AM.anchored || !AM.loc)
return
var/turf/starting = get_turf(AM)
diff --git a/code/game/gamemodes/technomancer/spells/chroma.dm b/code/game/gamemodes/technomancer/spells/chroma.dm
index d91b39b95e..51f55a60f1 100644
--- a/code/game/gamemodes/technomancer/spells/chroma.dm
+++ b/code/game/gamemodes/technomancer/spells/chroma.dm
@@ -24,7 +24,7 @@
invisibility = INVISIBILITY_ABSTRACT
time_to_die = 2 MINUTES //Despawn after this time, if set.
-/obj/effect/temporary_effect/chroma/Initialize(mapload, var/new_color = "#FFFFFF")
+/obj/effect/temporary_effect/chroma/Initialize(mapload, new_color = "#FFFFFF")
. = ..()
set_light(6, 5, l_color = new_color)
diff --git a/code/game/gamemodes/technomancer/spells/control.dm b/code/game/gamemodes/technomancer/spells/control.dm
index c0adc755a3..5c4df31fa0 100644
--- a/code/game/gamemodes/technomancer/spells/control.dm
+++ b/code/game/gamemodes/technomancer/spells/control.dm
@@ -24,7 +24,7 @@
var/allowed_mob_classes = MOB_CLASS_ANIMAL|MOB_CLASS_SYNTHETIC
//This unfortunately is gonna be rather messy due to the various mobtypes involved.
-/obj/item/spell/control/proc/select(var/mob/living/L)
+/obj/item/spell/control/proc/select(mob/living/L)
if(!(L.mob_class & allowed_mob_classes))
return FALSE
@@ -45,7 +45,7 @@
L.add_overlay(control_overlay, TRUE)
controlled_mobs |= L
-/obj/item/spell/control/proc/deselect(var/mob/living/L)
+/obj/item/spell/control/proc/deselect(mob/living/L)
if(!(L in controlled_mobs))
return FALSE
diff --git a/code/game/gamemodes/technomancer/spells/energy_siphon.dm b/code/game/gamemodes/technomancer/spells/energy_siphon.dm
index bc89d629ed..2adc3f9099 100644
--- a/code/game/gamemodes/technomancer/spells/energy_siphon.dm
+++ b/code/game/gamemodes/technomancer/spells/energy_siphon.dm
@@ -188,7 +188,7 @@
return 1
..()
-/obj/item/projectile/beam/lightning/energy_siphon/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier=0)
+/obj/item/projectile/beam/lightning/energy_siphon/attack_mob(mob/living/target_mob, distance, miss_modifier=0)
if(target_mob == firer) // This shouldn't actually occur due to Bump(), but just in-case.
return 1
if(ishuman(target_mob)) // Otherwise someone else stood in the beam and is going to pay for it.
diff --git a/code/game/gamemodes/technomancer/spells/gambit.dm b/code/game/gamemodes/technomancer/spells/gambit.dm
index b871ccea1f..83ea3f2949 100644
--- a/code/game/gamemodes/technomancer/spells/gambit.dm
+++ b/code/game/gamemodes/technomancer/spells/gambit.dm
@@ -29,7 +29,7 @@
give_new_spell(random_spell())
qdel(src)
-/obj/item/spell/gambit/proc/give_new_spell(var/spell_type)
+/obj/item/spell/gambit/proc/give_new_spell(spell_type)
owner.drop_from_inventory(src, null)
owner.place_spell_in_hand(spell_type)
diff --git a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm
index 571f518f96..7bbd3afcde 100644
--- a/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm
+++ b/code/game/gamemodes/technomancer/spells/insert/asphyxiation.dm
@@ -32,7 +32,7 @@
looped_insert(3, H, warned_victim)
-/obj/item/inserted_spell/mend_wires/looped_insert(remaining_callbacks, mob/living/carbon/human/H, var/warned)
+/obj/item/inserted_spell/mend_wires/looped_insert(remaining_callbacks, mob/living/carbon/human/H, warned)
if(H)
remaining_callbacks --
H.adjustOxyLoss(5)
@@ -52,7 +52,7 @@
// if((getOxyLoss() > (species.total_health/2)) || (health <= get_crit_point())
-/obj/item/inserted_spell/asphyxiation/proc/predict_crit(var/pulses_remaining, var/mob/living/carbon/human/victim, var/previous_damage = 0)
+/obj/item/inserted_spell/asphyxiation/proc/predict_crit(pulses_remaining, mob/living/carbon/human/victim, previous_damage = 0)
if(pulses_remaining <= 0) // Infinite loop protection
return 0
var/health_lost
diff --git a/code/game/gamemodes/technomancer/spells/insert/insert.dm b/code/game/gamemodes/technomancer/spells/insert/insert.dm
index eaa0970553..ede4fa4e7b 100644
--- a/code/game/gamemodes/technomancer/spells/insert/insert.dm
+++ b/code/game/gamemodes/technomancer/spells/insert/insert.dm
@@ -20,7 +20,7 @@
var/mob/living/host = null
var/spell_power_at_creation = 1.0 // This is here because the spell object that made this object probably won't exist.
-/obj/item/inserted_spell/Initialize(mapload, var/user, var/obj/item/spell/insert/inserter)
+/obj/item/inserted_spell/Initialize(mapload, user, obj/item/spell/insert/inserter)
. = ..()
host = loc
origin = user
@@ -31,15 +31,15 @@
/obj/item/inserted_spell/proc/on_insert()
return
-/obj/item/inserted_spell/proc/looped_insert(var/remaining_callbacks, var/mob/living/carbon/human/H)
+/obj/item/inserted_spell/proc/looped_insert(remaining_callbacks, mob/living/carbon/human/H)
PROTECTED_RPOC(TRUE)
return
-/obj/item/inserted_spell/proc/on_expire(var/dispelled = 0)
+/obj/item/inserted_spell/proc/on_expire(dispelled = 0)
qdel(src)
return
-/obj/item/spell/insert/proc/insert(var/mob/living/L, mob/user)
+/obj/item/spell/insert/proc/insert(mob/living/L, mob/user)
if(inserting)
if(!allow_stacking)
for(var/obj/item/inserted_spell/IS in L.contents)
diff --git a/code/game/gamemodes/technomancer/spells/mark_recall.dm b/code/game/gamemodes/technomancer/spells/mark_recall.dm
index 133ceac4d0..104613c3b5 100644
--- a/code/game/gamemodes/technomancer/spells/mark_recall.dm
+++ b/code/game/gamemodes/technomancer/spells/mark_recall.dm
@@ -13,7 +13,7 @@
var/image/I
var/turf/T
-/datum/technomancer_marker/New(var/mob/user)
+/datum/technomancer_marker/New(mob/user)
U = WEAKREF(user)
T = get_turf(user)
I = image('icons/goonstation/featherzone.dmi', T, "spawn-wall")
@@ -40,7 +40,7 @@ GLOBAL_LIST_INIT(mark_spells, list())
cast_methods = CAST_USE
aspect = ASPECT_TELE
-/obj/item/spell/mark/on_use_cast(var/mob/living/user)
+/obj/item/spell/mark/on_use_cast(mob/living/user)
if(!allowed_to_teleport()) // Otherwise you could teleport back to the admin Z-level.
to_chat(user, span_warning("You can't teleport here!"))
return 0
@@ -81,7 +81,7 @@ GLOBAL_LIST_INIT(mark_spells, list())
cast_methods = CAST_USE
aspect = ASPECT_TELE
-/obj/item/spell/recall/on_use_cast(var/mob/living/user)
+/obj/item/spell/recall/on_use_cast(mob/living/user)
if(pay_energy(3000))
var/datum/technomancer_marker/marker = GLOB.mark_spells[WEAKREF(user)] //VOREStation Add - Multiple technomancer support
if(!istype(marker))
diff --git a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm
index 6cc62397ad..f2c73cffea 100644
--- a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm
+++ b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm
@@ -24,7 +24,7 @@
return FALSE
-/obj/item/spell/modifier/proc/on_add_modifier(var/mob/living/L)
+/obj/item/spell/modifier/proc/on_add_modifier(mob/living/L)
var/duration = modifier_duration
if(duration)
duration = round(duration * calculate_spell_power(1.0), 1)
diff --git a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
index 828d3e96bf..d6216cc3cd 100644
--- a/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
+++ b/code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
@@ -34,7 +34,7 @@
var/list/hit_mobs = list() //Mobs which were already hit.
var/power = 35 //How hard it will hit for with electrocute_act(), decreases with each bounce.
-/obj/item/projectile/beam/chain_lightning/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier=0)
+/obj/item/projectile/beam/chain_lightning/attack_mob(mob/living/target_mob, distance, miss_modifier=0)
//First we shock the guy we just hit.
if(ishuman(target_mob))
var/mob/living/carbon/human/H = target_mob
diff --git a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm
index 91d3684a9e..e53f6834bd 100644
--- a/code/game/gamemodes/technomancer/spells/projectile/lightning.dm
+++ b/code/game/gamemodes/technomancer/spells/projectile/lightning.dm
@@ -32,7 +32,7 @@
var/power = 60 //How hard it will hit for with electrocute_act().
-/obj/item/projectile/beam/lightning/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier=0)
+/obj/item/projectile/beam/lightning/attack_mob(mob/living/target_mob, distance, miss_modifier=0)
if(ishuman(target_mob))
var/mob/living/carbon/human/H = target_mob
var/obj/item/organ/external/affected = H.get_organ(check_zone(BP_TORSO))
diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm
index 251013bab1..4050fb09cd 100644
--- a/code/game/gamemodes/technomancer/spells/reflect.dm
+++ b/code/game/gamemodes/technomancer/spells/reflect.dm
@@ -30,7 +30,7 @@
spark_system = null
return ..()
-/obj/item/spell/reflect/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/spell/reflect/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(user.incapacitated())
return 0
diff --git a/code/game/gamemodes/technomancer/spells/shield.dm b/code/game/gamemodes/technomancer/spells/shield.dm
index f8c55b4562..71fcf1f3f6 100644
--- a/code/game/gamemodes/technomancer/spells/shield.dm
+++ b/code/game/gamemodes/technomancer/spells/shield.dm
@@ -28,7 +28,7 @@
spark_system = null
return ..()
-/obj/item/spell/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/spell/shield/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(user.incapacitated())
return 0
diff --git a/code/game/gamemodes/technomancer/spells/summon/summon.dm b/code/game/gamemodes/technomancer/spells/summon/summon.dm
index f64ddeca8a..2deb6b079a 100644
--- a/code/game/gamemodes/technomancer/spells/summon/summon.dm
+++ b/code/game/gamemodes/technomancer/spells/summon/summon.dm
@@ -39,5 +39,5 @@
summoned_mob_type = summon_options[choice]
// Called when a new mob is summoned, override for special behaviour.
-/obj/item/spell/summon/proc/on_summon(var/mob/living/summoned)
+/obj/item/spell/summon/proc/on_summon(mob/living/summoned)
return
diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm
index d26a35f78a..4513d65fe7 100644
--- a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm
+++ b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm
@@ -37,7 +37,7 @@
instability_cost = 10
energy_cost = 1000
-/obj/item/spell/summon/summon_creature/on_summon(var/mob/living/simple_mob/summoned)
+/obj/item/spell/summon/summon_creature/on_summon(mob/living/simple_mob/summoned)
if(check_for_scepter())
// summoned.faction = FACTION_TECHNOMANCER
summoned.friends += owner
diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm b/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm
index b5f87550b2..07a1d07568 100644
--- a/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm
+++ b/code/game/gamemodes/technomancer/spells/summon/summon_ward.dm
@@ -16,5 +16,5 @@
instability_cost = 5
energy_cost = 500
-/obj/item/spell/summon/summon_ward/on_summon(var/mob/living/simple_mob/mechanical/ward/monitor/my_ward)
+/obj/item/spell/summon/summon_ward/on_summon(mob/living/simple_mob/mechanical/ward/monitor/my_ward)
my_ward.owner = owner
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index b039896581..ae31af03c1 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -15,7 +15,7 @@
/obj/proc/check_access(obj/item/I)
return check_access_list(I ? I.GetAccess() : null)
-/obj/proc/check_access_list(var/list/L)
+/obj/proc/check_access_list(list/L)
// We don't require access
if(!LAZYLEN(req_access) && !LAZYLEN(req_one_access))
return TRUE
@@ -27,7 +27,7 @@
// Run list comparisons
return has_access(req_access, req_one_access, L)
-/proc/has_access(var/list/req_access, var/list/req_one_access, var/list/accesses)
+/proc/has_access(list/req_access, list/req_one_access, list/accesses)
// req_access list has priority if set
// Requires at least every access in list
for(var/req in req_access)
@@ -87,7 +87,7 @@
/mob/living/silicon/GetIdCard()
return idcard
-/proc/FindNameFromID(var/mob/living/carbon/human/H)
+/proc/FindNameFromID(mob/living/carbon/human/H)
ASSERT(istype(H))
var/obj/item/card/id/C = H.GetIdCard()
if(C)
diff --git a/code/game/jobs/job/blueshield.dm b/code/game/jobs/job/blueshield.dm
index f760973807..538ce30c8e 100644
--- a/code/game/jobs/job/blueshield.dm
+++ b/code/game/jobs/job/blueshield.dm
@@ -22,7 +22,7 @@
outfit_type = /decl/hierarchy/outfit/job/blueshield
job_description = "Placeholder desc: General rules is to not get involved with security matters, your job is only to keep command personnel alive."
-/datum/job/blueshield/equip(var/mob/living/carbon/human/H)
+/datum/job/blueshield/equip(mob/living/carbon/human/H)
. = ..()
if(.)
H.implant_loyalty()
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index e3552012d6..8eaf7c5f83 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -41,7 +41,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca
/*
-/datum/job/captain/equip(var/mob/living/carbon/human/H)
+/datum/job/captain/equip(mob/living/carbon/human/H)
. = ..()
if(.)
H.implant_loyalty()
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index ebb880cd8e..06c0f21ee5 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -248,7 +248,7 @@
dept_time_required = 20 // CHOMPEdit
//YW UNCOMMENTINGSTART: REINSTATE LOYALTY IMPLANT
-/datum/job/lawyer/equip(var/mob/living/carbon/human/H)
+/datum/job/lawyer/equip(mob/living/carbon/human/H)
. = ..()
if(.)
H.implant_loyalty()
diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm
index 427372169d..ea3f8aa3ec 100644
--- a/code/game/jobs/job/civilian_chaplain.dm
+++ b/code/game/jobs/job/civilian_chaplain.dm
@@ -43,7 +43,7 @@
/datum/alt_title/monk
title = JOB_ALT_MONK
-/datum/job/chaplain/equip(var/mob/living/carbon/human/H, var/alt_title, var/ask_questions = TRUE)
+/datum/job/chaplain/equip(mob/living/carbon/human/H, alt_title, ask_questions = TRUE)
. = ..()
if(!.)
return
@@ -136,7 +136,7 @@
var/title = JOB_CHAPLAIN
var/configured = FALSE
-/datum/religion/New(var/r, var/d, var/bn, var/bis, var/bits, var/t)
+/datum/religion/New(r, d, bn, bis, bits, t)
. = ..()
religion = r
deity = d
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index e631091d37..9dd2111370 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -76,14 +76,14 @@
. = ..()
department_accounts = department_accounts || departments_managed
-/datum/job/proc/equip(var/mob/living/carbon/human/H, var/alt_title)
+/datum/job/proc/equip(mob/living/carbon/human/H, alt_title)
var/datum/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title)
if(!outfit)
return FALSE
. = outfit.equip(H, title, alt_title)
return 1
-/datum/job/proc/get_outfit(var/mob/living/carbon/human/H, var/alt_title)
+/datum/job/proc/get_outfit(mob/living/carbon/human/H, alt_title)
if(alt_title && alt_titles)
var/datum/alt_title/A = alt_titles[alt_title]
if(A && initial(A.title_outfit))
@@ -91,7 +91,7 @@
. = . || outfit_type
. = outfit_by_type(.)
-/datum/job/proc/setup_account(var/mob/living/carbon/human/H)
+/datum/job/proc/setup_account(mob/living/carbon/human/H)
if(!account_allowed || (H.mind && H.mind.initial_account))
return
@@ -124,7 +124,7 @@
to_chat(H, span_boldnotice("Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]"))
// overrideable separately so AIs/borgs can have cardborg hats without unneccessary new()/qdel()
-/datum/job/proc/equip_preview(mob/living/carbon/human/H, var/alt_title)
+/datum/job/proc/equip_preview(mob/living/carbon/human/H, alt_title)
var/datum/decl/hierarchy/outfit/outfit = get_outfit(H, alt_title)
if(!outfit)
return FALSE
@@ -145,14 +145,14 @@
return max(0, minimal_player_age - C.player_age)
return 0
-/datum/job/proc/apply_fingerprints(var/mob/living/carbon/human/target)
+/datum/job/proc/apply_fingerprints(mob/living/carbon/human/target)
if(!istype(target))
return 0
for(var/obj/item/item in target.contents)
apply_fingerprints_to_item(target, item)
return 1
-/datum/job/proc/apply_fingerprints_to_item(var/mob/living/carbon/human/holder, var/obj/item/item)
+/datum/job/proc/apply_fingerprints_to_item(mob/living/carbon/human/holder, obj/item/item)
item.add_fingerprint(holder,1)
if(item.contents.len)
for(var/obj/item/sub_item in item.contents)
@@ -161,10 +161,10 @@
/datum/job/proc/is_position_available()
return (current_positions < total_positions) || (total_positions == -1)
-/datum/job/proc/has_alt_title(var/mob/H, var/supplied_title, var/desired_title)
+/datum/job/proc/has_alt_title(mob/H, supplied_title, desired_title)
return (supplied_title == desired_title) || (H.mind && H.mind.role_alt_title == desired_title)
-/datum/job/proc/get_description_blurb(var/alt_title)
+/datum/job/proc/get_description_blurb(alt_title)
var/list/message = list()
message |= job_description
@@ -189,7 +189,7 @@
return SSjob.job_icon_cache[title]
-/datum/job/proc/dress_mannequin(var/mob/living/carbon/human/dummy/mannequin/mannequin)
+/datum/job/proc/dress_mannequin(mob/living/carbon/human/dummy/mannequin/mannequin)
mannequin.delete_inventory(TRUE)
equip_preview(mannequin)
if(mannequin.back)
@@ -229,7 +229,7 @@
SSjob.shift_keys[title] += keylist
//CHOMPadd end
-/datum/job/proc/update_limit(var/comperator)
+/datum/job/proc/update_limit(comperator)
return
// Check client-specific availability rules.
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 2760fcbb08..21bbf71e29 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -53,7 +53,7 @@
title = JOB_ALT_SECURITY_MANAGER
//YW ADDITION START: LOYALTY IMPLANT FOR HOS
-/datum/job/hos/equip(var/mob/living/carbon/human/H)
+/datum/job/hos/equip(mob/living/carbon/human/H)
. = ..()
if(.)
H.implant_loyalty()
diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index 4082419289..b6f5c4089c 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -28,7 +28,7 @@
the " + JOB_AI + "'s commands, and their own Laws."
// AI procs
-/datum/job/ai/equip(var/mob/living/carbon/human/H)
+/datum/job/ai/equip(mob/living/carbon/human/H)
if(!H) return 0
return 1
@@ -78,7 +78,7 @@
and important piece of station property, and is expected to follow its Laws."
// Cyborg procs
-/datum/job/cyborg/equip(var/mob/living/carbon/human/H)
+/datum/job/cyborg/equip(mob/living/carbon/human/H)
if(!H) return 0
return 1
diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm
index 5a6e0ffb87..91b9ba2969 100644
--- a/code/game/jobs/job/special.dm
+++ b/code/game/jobs/job/special.dm
@@ -25,7 +25,7 @@
return SSaccess.get_all_accesses().Copy()
//YW UNCOMMENTINGSTART: INSTATE LOYALTY IMPLANT
-/datum/job/centcom_officer/equip(var/mob/living/carbon/human/H)
+/datum/job/centcom_officer/equip(mob/living/carbon/human/H)
. = ..()
if(.)
H.implant_loyalty()
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 5f4c3dc3b6..ff149bf95b 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -1,4 +1,4 @@
-/proc/guest_jobbans(var/job)
+/proc/guest_jobbans(job)
return
/proc/get_job_datums()
@@ -12,7 +12,7 @@
return occupations
-/proc/get_alternate_titles(var/job)
+/proc/get_alternate_titles(job)
var/list/jobs = get_job_datums()
var/list/titles = list()
diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index 787a0576d4..56d0d6c866 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -155,7 +155,7 @@ ADMIN_VERB(open_whitelist_editor, R_ADMIN|R_SERVER, "Open Whitelist Editor", "Op
GLOB.whitelist = world.file2list(WHITELISTFILE)
if(!GLOB.whitelist.len) GLOB.whitelist = null
-/proc/check_whitelist(mob/M /*, var/rank*/)
+/proc/check_whitelist(mob/M /*, rank*/)
// CHOMPAdd Start
if(!CONFIG_GET(flag/usewhitelist)) //I guess this is an override for the blanket whitelist system.
return 1
@@ -227,7 +227,7 @@ ADMIN_VERB(open_whitelist_editor, R_ADMIN|R_SERVER, "Open Whitelist Editor", "Op
GLOB.robot_whitelist.Cut()
load_alienwhitelist()
-/proc/is_alien_whitelisted(client/C, var/datum/species/species)
+/proc/is_alien_whitelisted(client/C, datum/species/species)
//They are admin or the whitelist isn't in use
if(whitelist_overrides(C))
return TRUE
@@ -294,7 +294,7 @@ ADMIN_VERB(open_whitelist_editor, R_ADMIN|R_SERVER, "Open Whitelist Editor", "Op
GLOB.job_whitelist.Cut()
load_jobwhitelist()
-/proc/is_job_whitelisted(mob/M, var/rank)
+/proc/is_job_whitelisted(mob/M, rank)
// Check if the job actually requires a whitelist
var/datum/job/job = SSjob.get_job(rank)
if(!job.whitelist_only)
@@ -322,7 +322,7 @@ ADMIN_VERB(open_whitelist_editor, R_ADMIN|R_SERVER, "Open Whitelist Editor", "Op
return FALSE
-/proc/is_lang_whitelisted(mob/M, var/datum/language/language)
+/proc/is_lang_whitelisted(mob/M, datum/language/language)
//They are admin or the whitelist isn't in use
if(whitelist_overrides(M))
return TRUE
@@ -344,7 +344,7 @@ ADMIN_VERB(open_whitelist_editor, R_ADMIN|R_SERVER, "Open Whitelist Editor", "Op
return FALSE
-/proc/is_borg_whitelisted(mob/M, var/module)
+/proc/is_borg_whitelisted(mob/M, module)
//They are admin or the whitelist isn't in use
if(whitelist_overrides(M))
return 1
diff --git a/code/game/jobs/whitelist_vr.dm b/code/game/jobs/whitelist_vr.dm
index 1dff822a82..896a1a72c2 100644
--- a/code/game/jobs/whitelist_vr.dm
+++ b/code/game/jobs/whitelist_vr.dm
@@ -12,7 +12,7 @@ GLOBAL_LIST_EMPTY(job_whitelist)
else
GLOB.job_whitelist = splittext(text, "\n")
-/proc/is_job_whitelisted(mob/M, var/rank)
+/proc/is_job_whitelisted(mob/M, rank)
if(!CONFIG_GET(flag/use_jobwhitelist)) // CHOMPedit
return 1 // CHOMPedit
var/datum/job/job = job_master.GetJob(rank)
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index cbdbfffd56..b4ada8a179 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -25,7 +25,7 @@
. = ..()
// update the invisibility and icon
-/obj/machinery/bluespace_beacon/hide(var/intact)
+/obj/machinery/bluespace_beacon/hide(intact)
invisibility = intact ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
update_icon()
diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm
index 3c724a939e..f49c1930a4 100644
--- a/code/game/machinery/CableLayer.dm
+++ b/code/game/machinery/CableLayer.dm
@@ -24,7 +24,7 @@
user.visible_message("\The [user] [!on?"dea":"a"]ctivates \the [src].", "You switch [src] [on? "on" : "off"]")
return
-/obj/machinery/cablelayer/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/cablelayer/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/stack/cable_coil))
var/result = load_cable(O)
@@ -51,7 +51,7 @@
. = ..()
. += "[src]'s cable reel has [cable.get_amount()] length\s left."
-/obj/machinery/cablelayer/proc/load_cable(var/obj/item/stack/cable_coil/CC)
+/obj/machinery/cablelayer/proc/load_cable(obj/item/stack/cable_coil/CC)
if(istype(CC) && CC.get_amount())
var/cur_amount = cable ? cable.get_amount() : 0
var/to_load = max(max_cable - cur_amount,0)
@@ -79,14 +79,14 @@
/obj/machinery/cablelayer/proc/reset()
last_piece = null
-/obj/machinery/cablelayer/proc/dismantleFloor(var/turf/new_turf)
+/obj/machinery/cablelayer/proc/dismantleFloor(turf/new_turf)
if(istype(new_turf, /turf/simulated/floor))
var/turf/simulated/floor/T = new_turf
if(!T.is_plating())
T.make_plating(!(T.broken || T.burnt))
return new_turf.is_plating()
-/obj/machinery/cablelayer/proc/layCable(var/turf/new_turf,var/M_Dir)
+/obj/machinery/cablelayer/proc/layCable(turf/new_turf,M_Dir)
if(!on)
return reset()
else
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index bcc419175e..7ad5333a3e 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -34,10 +34,10 @@
break //VOREStation Edit
-/obj/machinery/sleep_console/attack_ai(var/mob/user)
+/obj/machinery/sleep_console/attack_ai(mob/user)
return attack_hand(user)
-/obj/machinery/sleep_console/attack_hand(var/mob/user)
+/obj/machinery/sleep_console/attack_hand(mob/user)
if(..())
return 1
@@ -54,7 +54,7 @@
if(sleeper)
return tgui_interact(user)
-/obj/machinery/sleep_console/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/sleep_console/attackby(obj/item/I, mob/user)
if(computer_deconstruction_screwdriver(user, I))
return
else
@@ -125,7 +125,7 @@
console.sleeper = null
return ..()
-/obj/machinery/sleeper/RefreshParts(var/limited = 0)
+/obj/machinery/sleeper/RefreshParts(limited = 0)
var/man_rating = 0
var/cap_rating = 0
@@ -167,7 +167,7 @@
available_chemicals += new_chemicals
return
-/obj/machinery/sleeper/attack_hand(var/mob/user)
+/obj/machinery/sleeper/attack_hand(mob/user)
if(!controls_inside)
return FALSE
@@ -372,7 +372,7 @@
/obj/machinery/sleeper/update_icon()
icon_state = "sleeper_[occupant ? "1" : "0"]"
-/obj/machinery/sleeper/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/sleeper/attackby(obj/item/I, mob/user)
add_fingerprint(user)
if(istype(I, /obj/item/grab))
var/obj/item/grab/G = I
@@ -416,12 +416,12 @@
go_out()
add_fingerprint(usr)
-/obj/machinery/sleeper/MouseDrop_T(var/mob/target, var/mob/user)
+/obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user)
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target))
return
go_in(target, user)
-/obj/machinery/sleeper/relaymove(var/mob/user)
+/obj/machinery/sleeper/relaymove(mob/user)
..()
if(user.incapacitated())
return
@@ -457,7 +457,7 @@
return
pumping = !pumping
-/obj/machinery/sleeper/proc/go_in(var/mob/M, var/mob/user)
+/obj/machinery/sleeper/proc/go_in(mob/M, mob/user)
if(!M)
return
if(stat & (BROKEN|NOPOWER))
@@ -514,7 +514,7 @@
beaker = null
toggle_filter()
-/obj/machinery/sleeper/proc/inject_chemical(var/mob/living/user, var/chemical, var/amount)
+/obj/machinery/sleeper/proc/inject_chemical(mob/living/user, chemical, amount)
if(stat & (BROKEN|NOPOWER))
return
if(!(amount in amounts))
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 5ecaae5e2d..89234aa699 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -40,7 +40,7 @@
else
set_light(0)
-/obj/machinery/bodyscanner/attackby(var/obj/item/G, user as mob)
+/obj/machinery/bodyscanner/attackby(obj/item/G, user as mob)
if(istype(G, /obj/item/grab))
var/obj/item/grab/H = G
if(panel_open)
@@ -734,7 +734,7 @@
scanner.console = null
return ..()
-/obj/machinery/body_scanconsole/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/body_scanconsole/attackby(obj/item/I, mob/user)
if(computer_deconstruction_screwdriver(user, I))
return
else if(istype(I, /obj/item/multitool)) //Did you want to link it?
diff --git a/code/game/machinery/adv_med_vr.dm b/code/game/machinery/adv_med_vr.dm
index 7759da93a3..9814d11809 100644
--- a/code/game/machinery/adv_med_vr.dm
+++ b/code/game/machinery/adv_med_vr.dm
@@ -95,7 +95,7 @@
add_overlay(gradient)
-/obj/machinery/body_scanconsole/update_icon(var/h_ratio)
+/obj/machinery/body_scanconsole/update_icon(h_ratio)
if(stat & (NOPOWER|BROKEN))
icon_state = "scanner_terminal_off"
set_light(0)
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 2a4ff071e4..a10dfb1973 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -28,7 +28,7 @@
else
icon_state = disabled ? "liquid_dispenser" : "liquid_dispenser_on"
-/obj/machinery/ai_slipper/proc/setState(var/enabled, var/uses)
+/obj/machinery/ai_slipper/proc/setState(enabled, uses)
disabled = disabled
uses = uses
power_change()
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index 18367749fd..636dc9d3b6 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -29,7 +29,7 @@
var/list/air_scrub_info = list()
var/list/air_alarms = list()
-/area/proc/elect_main_air_alarm(var/exclude_self = FALSE)
+/area/proc/elect_main_air_alarm(exclude_self = FALSE)
// loop through all sensors to update the area's sensor list as well
main_air_alarm = null
var/list/checks = list()
@@ -238,7 +238,7 @@
return
scan_atmo()
-/obj/machinery/alarm/proc/handle_heating_cooling(var/datum/gas_mixture/environment)
+/obj/machinery/alarm/proc/handle_heating_cooling(datum/gas_mixture/environment)
DECLARE_TLV_VALUES
LOAD_TLV_VALUES(TLV["temperature"], target_temperature)
if(!regulating_temperature)
@@ -290,7 +290,7 @@
environment.merge(gas)
-/obj/machinery/alarm/proc/overall_danger_level(var/datum/gas_mixture/environment)
+/obj/machinery/alarm/proc/overall_danger_level(datum/gas_mixture/environment)
var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.temperature/environment.volume
var/environment_pressure = environment.return_pressure()
@@ -430,7 +430,7 @@
else if(dev_type == "AVP")
alarm_area.air_vent_info[id_tag] = signal.data
-/obj/machinery/alarm/proc/register_env_machine(var/m_id, var/device_type)
+/obj/machinery/alarm/proc/register_env_machine(m_id, device_type)
var/new_name
if(device_type == "AVP")
new_name = "[alarm_area.name] Vent Pump #[alarm_area.air_vent_names.len+1]"
@@ -459,7 +459,7 @@
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_TO_AIRALARM)
-/obj/machinery/alarm/proc/send_signal(var/target, var/list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise
+/obj/machinery/alarm/proc/send_signal(target, list/command)//sends signal 'command' to 'target'. Returns 0 if no radio connection, 1 otherwise
if(!radio_connection)
return 0
@@ -511,7 +511,7 @@
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list("power"= 0))
-/obj/machinery/alarm/proc/apply_danger_level(var/new_danger_level)
+/obj/machinery/alarm/proc/apply_danger_level(new_danger_level)
if(report_danger_level && alarm_area.atmosalert(new_danger_level, src))
post_alert(new_danger_level)
for(var/obj/machinery/alarm/AA in alarm_area.air_alarms)
diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm
index 6a2219896f..31720187fe 100644
--- a/code/game/machinery/airconditioner_vr.dm
+++ b/code/game/machinery/airconditioner_vr.dm
@@ -139,7 +139,7 @@
target_temp += rand(0, 1000)
update_icon()
-/obj/machinery/power/thermoregulator/overload(var/obj/machinery/power/source)
+/obj/machinery/power/thermoregulator/overload(obj/machinery/power/source)
if(!anchored || !powernet)
return
var/power_avail = draw_power(active_power_usage*10)
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 77af6e7b8c..92b1e301af 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -95,7 +95,7 @@
return ..()
-/obj/machinery/air_sensor/proc/wrench_act(var/mob/living/user, var/obj/item/tool/wrench/W)
+/obj/machinery/air_sensor/proc/wrench_act(mob/living/user, obj/item/tool/wrench/W)
playsound(src, W.usesound, 50, 1)
user.visible_message("[user] unfastens \the [src].", span_notice("You have unfastened \the [src]."), "You hear ratcheting.")
var/obj/item/pipe_gsensor/gsensor = new /obj/item/pipe_gsensor(loc)
diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm
index e4e9c96c61..52c5715d9c 100644
--- a/code/game/machinery/atmoalter/area_atmos_computer.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer.dm
@@ -18,10 +18,10 @@
. = ..()
scanscrubbers()
-/obj/machinery/computer/area_atmos/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/area_atmos/attack_ai(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/computer/area_atmos/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/area_atmos/attack_hand(mob/user as mob)
if(..(user))
return
tgui_interact(user)
@@ -125,7 +125,7 @@
/obj/machinery/computer/area_atmos/area/scanscrubbers_user(mob/user) //Used when the user is in the UI and scans for scrubbers.
scanscrubbers()
-/obj/machinery/computer/area_atmos/area/validscrubber(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber)
+/obj/machinery/computer/area_atmos/area/validscrubber(obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber)
if(!istype(scrubber))
return FALSE
diff --git a/code/game/machinery/atmoalter/area_atmos_computer_vr.dm b/code/game/machinery/atmoalter/area_atmos_computer_vr.dm
index 6f29e2d934..2423462689 100644
--- a/code/game/machinery/atmoalter/area_atmos_computer_vr.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer_vr.dm
@@ -21,7 +21,7 @@
SStgui.update_uis(src)
-/obj/machinery/computer/area_atmos/tag/validscrubber(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber)
+/obj/machinery/computer/area_atmos/tag/validscrubber(obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber)
if(!istype(scrubber))
return FALSE
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 7a01684a0a..6ec7550c46 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -248,7 +248,7 @@ update_flag
return GM.return_pressure()
return 0
-/obj/machinery/portable_atmospherics/canister/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/portable_atmospherics/canister/bullet_act(obj/item/projectile/Proj)
if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN))
return
@@ -257,7 +257,7 @@ update_flag
healthcheck()
..()
-/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/canister/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WELDER)) //Vorestart: Deconstructable Canisters
var/obj/item/weldingtool/WT = W.get_welder()
if(!WT.remove_fuel(0, user))
@@ -299,10 +299,10 @@ update_flag
SStgui.update_uis(src) // Update all NanoUIs attached to src
-/obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user as mob)
+/obj/machinery/portable_atmospherics/canister/attack_ai(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob)
+/obj/machinery/portable_atmospherics/canister/attack_hand(mob/user as mob)
return tgui_interact(user)
/obj/machinery/portable_atmospherics/canister/tgui_state(mob/user)
@@ -480,6 +480,6 @@ update_flag
air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
update_icon()
-/obj/machinery/portable_atmospherics/canister/take_damage(var/damage)
+/obj/machinery/portable_atmospherics/canister/take_damage(damage)
health -= damage
healthcheck()
diff --git a/code/game/machinery/atmoalter/clamp.dm b/code/game/machinery/atmoalter/clamp.dm
index 282087d8f9..3d11b3c0ba 100644
--- a/code/game/machinery/atmoalter/clamp.dm
+++ b/code/game/machinery/atmoalter/clamp.dm
@@ -14,7 +14,7 @@
var/datum/pipe_network/network_node1
var/datum/pipe_network/network_node2
-/obj/machinery/clamp/Initialize(mapload, var/obj/machinery/atmospherics/pipe/simple/to_attach = null)
+/obj/machinery/clamp/Initialize(mapload, obj/machinery/atmospherics/pipe/simple/to_attach = null)
. = ..()
if(istype(to_attach))
target = to_attach
@@ -37,7 +37,7 @@
var/datum/pipeline/P2 = node2.parent
network_node2 = P2.network
-/obj/machinery/clamp/attack_hand(var/mob/user)
+/obj/machinery/clamp/attack_hand(mob/user)
if(!target)
return FALSE
if(!open)
@@ -135,7 +135,7 @@
icon = 'icons/atmos/clamp.dmi'
icon_state = "pclamp0"
-/obj/item/clamp/afterattack(var/atom/A, mob/user as mob, proximity)
+/obj/item/clamp/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity)
return
diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
index 2d9a5e3153..b45aece97f 100644
--- a/code/game/machinery/atmoalter/meter.dm
+++ b/code/game/machinery/atmoalter/meter.dm
@@ -105,7 +105,7 @@
return ..()
-/obj/machinery/meter/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/meter/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_WRENCH))
playsound(src, W.usesound, 50, 1)
to_chat(user, span_notice("You begin to unfasten \the [src]..."))
@@ -148,5 +148,5 @@
/obj/machinery/meter/turf/select_target()
return loc
-/obj/machinery/meter/turf/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/meter/turf/attackby(obj/item/W as obj, mob/user as mob)
return
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 97bee9c097..2eedd475e2 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -46,7 +46,7 @@
GAS_O2 = O2STANDARD * MolesForPressure(),
GAS_N2 = N2STANDARD * MolesForPressure())
-/obj/machinery/portable_atmospherics/proc/MolesForPressure(var/target_pressure = start_pressure)
+/obj/machinery/portable_atmospherics/proc/MolesForPressure(target_pressure = start_pressure)
return (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
/obj/machinery/portable_atmospherics/update_icon()
@@ -99,7 +99,7 @@
if (network)
network.update = 1
-/obj/machinery/portable_atmospherics/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/attackby(obj/item/W as obj, mob/user as mob)
if ((istype(W, /obj/item/tank) && !( src.destroyed )))
if (src.holding)
return
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index fa4178864e..8689e6dcdb 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -111,14 +111,14 @@
/obj/machinery/portable_atmospherics/powered/pump/return_air()
return air_contents
-/obj/machinery/portable_atmospherics/powered/pump/attack_ai(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/pump/attack_ai(mob/user)
src.add_hiddenprint(user)
return src.attack_hand(user)
-/obj/machinery/portable_atmospherics/powered/pump/attack_ghost(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/pump/attack_ghost(mob/user)
return src.attack_hand(user)
-/obj/machinery/portable_atmospherics/powered/pump/attack_hand(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/pump/attack_hand(mob/user)
tgui_interact(user)
/obj/machinery/portable_atmospherics/powered/pump/tgui_interact(mob/user, datum/tgui/ui)
diff --git a/code/game/machinery/atmoalter/pump_vr.dm b/code/game/machinery/atmoalter/pump_vr.dm
index 79af88761f..3bf35f8d84 100644
--- a/code/game/machinery/atmoalter/pump_vr.dm
+++ b/code/game/machinery/atmoalter/pump_vr.dm
@@ -21,7 +21,7 @@
name = "[name] (ID [id])"
-/obj/machinery/portable_atmospherics/powered/pump/huge/attack_hand(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/pump/huge/attack_hand(mob/user)
to_chat(user, span_notice("You can't directly interact with this machine. Use the pump control console."))
/obj/machinery/portable_atmospherics/powered/pump/huge/update_icon()
@@ -81,7 +81,7 @@
use_power(power_draw)
update_connected_network()
-/obj/machinery/portable_atmospherics/powered/pump/huge/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/portable_atmospherics/powered/pump/huge/attackby(obj/item/I, mob/user)
if(I.has_tool_quality(TOOL_WRENCH))
if(on)
to_chat(user, span_warning("Turn \the [src] off first!"))
@@ -109,7 +109,7 @@
/obj/machinery/portable_atmospherics/powered/pump/huge/stationary
name = "Stationary Air Pump"
-/obj/machinery/portable_atmospherics/powered/pump/huge/stationary/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/portable_atmospherics/powered/pump/huge/stationary/attackby(obj/item/I, mob/user)
if(I.has_tool_quality(TOOL_WRENCH))
to_chat(user, span_warning("The bolts are too tight for you to unscrew!"))
return
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 6e1328d35a..1692d755b2 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -85,14 +85,14 @@
/obj/machinery/portable_atmospherics/powered/scrubber/return_air()
return air_contents
-/obj/machinery/portable_atmospherics/powered/scrubber/attack_ai(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/scrubber/attack_ai(mob/user)
src.add_hiddenprint(user)
return src.attack_hand(user)
-/obj/machinery/portable_atmospherics/powered/scrubber/attack_ghost(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/scrubber/attack_ghost(mob/user)
return src.attack_hand(user)
-/obj/machinery/portable_atmospherics/powered/scrubber/attack_hand(var/mob/user)
+/obj/machinery/portable_atmospherics/powered/scrubber/attack_hand(mob/user)
tgui_interact(user)
/obj/machinery/portable_atmospherics/powered/scrubber/tgui_interact(mob/user, datum/tgui/ui)
@@ -172,7 +172,7 @@
// Not climbable!
RemoveElement(/datum/element/climbable)
-/obj/machinery/portable_atmospherics/powered/scrubber/huge/attack_hand(var/mob/user as mob)
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/attack_hand(mob/user as mob)
to_chat(user, span_notice("You can't directly interact with this machine. Use the scrubber control console."))
/obj/machinery/portable_atmospherics/powered/scrubber/huge/update_icon()
@@ -216,7 +216,7 @@
use_power(power_draw)
update_connected_network()
-/obj/machinery/portable_atmospherics/powered/scrubber/huge/attackby(var/obj/item/I as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/attackby(obj/item/I as obj, mob/user as mob)
if(I.has_tool_quality(TOOL_WRENCH))
if(on)
to_chat(user, span_warning("Turn \the [src] off first!"))
@@ -248,7 +248,7 @@
. = ..()
desc += "This one seems to be tightly secured with large bolts."
-/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(var/obj/item/I as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/attackby(obj/item/I as obj, mob/user as mob)
if(I.has_tool_quality(TOOL_WRENCH))
to_chat(user, span_warning("The bolts are too tight for you to unscrew!"))
return
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 06cc0a89eb..9a661a7b1f 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -397,7 +397,7 @@
drop_direction = 0
return CLICK_ACTION_SUCCESS
-/obj/machinery/autolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/autolathe/attackby(obj/item/O as obj, mob/user as mob)
if(is_robot_module(O))
return
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index d4cc1b1e9b..cafd732acf 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -218,7 +218,7 @@
icon_state = "biogen-work"
return
-/obj/machinery/biogenerator/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/biogenerator/attackby(obj/item/O, mob/user)
if(default_deconstruction_screwdriver(user, O))
return
if(default_deconstruction_crowbar(user, O))
diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm
index 0be614554f..8069d0f8e2 100644
--- a/code/game/machinery/bioprinter.dm
+++ b/code/game/machinery/bioprinter.dm
@@ -79,7 +79,7 @@
)
// CHOMPadd end
-/obj/machinery/organ_printer/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/organ_printer/attackby(obj/item/O, mob/user)
if(default_deconstruction_screwdriver(user, O))
return
if(default_deconstruction_crowbar(user, O))
@@ -104,7 +104,7 @@
default_apply_parts()
AddElement(/datum/element/climbable)
-/obj/machinery/organ_printer/examine(var/mob/user)
+/obj/machinery/organ_printer/examine(mob/user)
. = ..()
var/biomass = get_biomass_volume()
if(biomass)
@@ -236,7 +236,7 @@
return biomass_count
-/obj/machinery/organ_printer/proc/can_print(var/choice, var/masscount = 0)
+/obj/machinery/organ_printer/proc/can_print(choice, masscount = 0)
var/biomass = get_biomass_volume()
if(biomass < masscount)
visible_message(span_infoplain(span_bold("\The [src]") + " displays a warning: 'Not enough biomass. [biomass] stored and [masscount] needed.'"))
@@ -248,7 +248,7 @@
return 1
-/obj/machinery/organ_printer/proc/print_organ(var/choice)
+/obj/machinery/organ_printer/proc/print_organ(choice)
var/new_organ = choice
var/obj/item/organ/O = new new_organ(get_turf(src))
O.status |= ORGAN_CUT_AWAY
@@ -309,7 +309,7 @@
container = null
return ..()
-/obj/machinery/organ_printer/flesh/print_organ(var/choice)
+/obj/machinery/organ_printer/flesh/print_organ(choice)
var/obj/item/organ/O = ..()
playsound(src, 'sound/machines/ding.ogg', 50, 1)
@@ -372,7 +372,7 @@
new /obj/item/stack/material/steel(get_turf(src), FLOOR(stored_matter/matter_amount_per_sheet, 1))
return ..()
-/obj/machinery/organ_printer/robot/print_organ(var/choice)
+/obj/machinery/organ_printer/robot/print_organ(choice)
var/obj/item/organ/O = ..()
O.robotize()
O.status |= ORGAN_CUT_AWAY // robotize() resets status to 0
@@ -380,7 +380,7 @@
audible_message(span_info("\The [src] dings, then spits out \a [O]."))
return O
-/obj/machinery/organ_printer/robot/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/organ_printer/robot/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/material) && W.get_material_name() == matter_type)
if((max_stored_matter-stored_matter) < matter_amount_per_sheet)
to_chat(user, span_warning("\The [src] is too full."))
diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm
index b5e68fc00a..6b5b0c7090 100644
--- a/code/game/machinery/bomb_tester_vr.dm
+++ b/code/game/machinery/bomb_tester_vr.dm
@@ -85,7 +85,7 @@
scan_rating += S.rating
simulation_delay = 25 SECONDS - scan_rating SECONDS
-/obj/machinery/bomb_tester/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/bomb_tester/attackby(obj/item/I, mob/user)
if(default_deconstruction_screwdriver(user, I))
return
if(default_deconstruction_crowbar(user, I))
@@ -106,7 +106,7 @@
return
..()
-/obj/machinery/bomb_tester/attack_hand(var/mob/user)
+/obj/machinery/bomb_tester/attack_hand(mob/user)
add_fingerprint(user)
tgui_interact(user)
@@ -362,7 +362,7 @@
P.name = "Explosive Simulator printout"
P.info = simulation_results
-/obj/machinery/bomb_tester/proc/format_gas_for_results(var/datum/gas_mixture/G)
+/obj/machinery/bomb_tester/proc/format_gas_for_results(datum/gas_mixture/G)
G.update_values() //Just in case
var/results = ""
var/pressure = G.return_pressure()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index c0cb23aad5..e56f11c13b 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -103,7 +103,7 @@
update_coverage()
START_PROCESSING(SSobj, src)
-/obj/machinery/camera/bullet_act(var/obj/item/projectile/P)
+/obj/machinery/camera/bullet_act(obj/item/projectile/P)
take_damage(P.get_structure_damage())
/obj/machinery/camera/ex_act(severity)
@@ -130,7 +130,7 @@
visible_message(span_boldwarning("[src] was hit by [O]."))
take_damage(O.throwforce)
-/obj/machinery/camera/proc/setViewRange(var/num = 7)
+/obj/machinery/camera/proc/setViewRange(num = 7)
src.view_range = num
GLOB.cameranet.updateVisibility(src, 0)
@@ -249,7 +249,7 @@
else
..()
-/obj/machinery/camera/proc/deactivate(user as mob, var/choice = 1)
+/obj/machinery/camera/proc/deactivate(user as mob, choice = 1)
// The only way for AI to reactivate cameras are malf abilities, this gives them different messages.
if(isAI(user))
user = null
@@ -275,7 +275,7 @@
playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = initial(icon_state)
-/obj/machinery/camera/take_damage(var/force, var/message)
+/obj/machinery/camera/take_damage(force, message)
//prob(25) gives an average of 3-4 hits
if (force >= toughness && (force > toughness*4 || prob(25)))
destroy()
@@ -295,7 +295,7 @@
spark_system.start()
playsound(src, "sparks", 50, 1)
-/obj/machinery/camera/proc/set_status(var/newstatus)
+/obj/machinery/camera/proc/set_status(newstatus)
if (status != newstatus)
status = newstatus
update_coverage()
@@ -308,7 +308,7 @@
else
icon_state = initial(icon_state)
-/obj/machinery/camera/proc/triggerCameraAlarm(var/duration = 0)
+/obj/machinery/camera/proc/triggerCameraAlarm(duration = 0)
alarm_on = 1
GLOB.camera_alarm.triggerAlarm(loc, src, duration)
@@ -359,13 +359,13 @@
//Return a working camera that can see a given mob
//or null if none
-/proc/seen_by_camera(var/mob/M)
+/proc/seen_by_camera(mob/M)
for(var/obj/machinery/camera/C in oview(4, M))
if(C.can_use()) // check if camera disabled
return C
return null
-/proc/near_range_camera(var/mob/M)
+/proc/near_range_camera(mob/M)
for(var/obj/machinery/camera/C in range(4, M))
if(C.can_use()) // check if camera disabled
@@ -373,7 +373,7 @@
return null
-/obj/machinery/camera/proc/weld(var/obj/item/weldingtool/WT, var/mob/user)
+/obj/machinery/camera/proc/weld(obj/item/weldingtool/WT, mob/user)
WT = WT.get_welder()
if(busy)
@@ -404,13 +404,13 @@
wires.Interact(user)
-/obj/machinery/camera/proc/add_network(var/network_name)
+/obj/machinery/camera/proc/add_network(network_name)
add_networks(list(network_name))
-/obj/machinery/camera/proc/remove_network(var/network_name)
+/obj/machinery/camera/proc/remove_network(network_name)
remove_networks(list(network_name))
-/obj/machinery/camera/proc/add_networks(var/list/networks)
+/obj/machinery/camera/proc/add_networks(list/networks)
var/network_added
network_added = 0
for(var/network_name in networks)
@@ -421,7 +421,7 @@
if(network_added)
update_coverage(1)
-/obj/machinery/camera/proc/remove_networks(var/list/networks)
+/obj/machinery/camera/proc/remove_networks(list/networks)
var/network_removed
network_removed = 0
for(var/network_name in networks)
@@ -432,7 +432,7 @@
if(network_removed)
update_coverage(1)
-/obj/machinery/camera/proc/replace_networks(var/list/networks)
+/obj/machinery/camera/proc/replace_networks(list/networks)
if(networks.len != network.len)
network = networks
update_coverage(1)
@@ -460,7 +460,7 @@
cam["z"] = z
return cam
-/obj/machinery/camera/proc/update_coverage(var/network_change = 0)
+/obj/machinery/camera/proc/update_coverage(network_change = 0)
if(network_change)
var/list/open_networks = difflist(network, GLOB.restricted_camera_networks)
// Add or remove camera from the camera net as necessary
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index f77ea2ec86..83bb1b5c1c 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -153,7 +153,7 @@
if(!anchored)
..()
-/obj/item/camera_assembly/proc/weld(var/obj/item/weldingtool/WT, var/mob/user)
+/obj/item/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/user)
WT = WT.get_welder()
if(busy)
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index b85fae71ee..d38be7dc39 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -24,7 +24,7 @@
// If they aren't in range, lose the target.
lostTarget(target)
-/obj/machinery/camera/proc/newTarget(var/mob/target)
+/obj/machinery/camera/proc/newTarget(mob/target)
if (isAI(target)) return 0
if (detectTime == 0)
detectTime = world.time // start the clock
@@ -32,7 +32,7 @@
LAZYADD(motionTargets, target)
return 1
-/obj/machinery/camera/proc/lostTarget(var/mob/target)
+/obj/machinery/camera/proc/lostTarget(mob/target)
if (target in motionTargets)
LAZYREMOVE(motionTargets, target)
if (LAZYLEN(motionTargets) == 0)
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 3908906d7b..f25d90f306 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -25,7 +25,7 @@
return T
-/mob/living/silicon/ai/proc/ai_camera_list(var/camera in get_camera_list())
+/mob/living/silicon/ai/proc/ai_camera_list(camera in get_camera_list())
set category = "AI.Camera Control"
set name = "Show Camera List"
@@ -128,7 +128,7 @@
src.track = TB
return targets
-/mob/living/silicon/ai/proc/ai_camera_track(var/target_name in trackable_mobs())
+/mob/living/silicon/ai/proc/ai_camera_track(target_name in trackable_mobs())
set category = "AI.Camera Control"
set name = "Follow With Camera"
set desc = "Select who you would like to track."
@@ -143,7 +143,7 @@
src.track = null
ai_actual_track(target)
-/mob/living/silicon/ai/proc/ai_cancel_tracking(var/forced = 0)
+/mob/living/silicon/ai/proc/ai_cancel_tracking(forced = 0)
if(!cameraFollow)
return
@@ -187,7 +187,7 @@
return TRUE
-/obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob)
+/obj/machinery/camera/attack_ai(mob/living/silicon/ai/user as mob)
if (!istype(user))
return
if (!src.can_use())
@@ -195,7 +195,7 @@
user.eyeobj.setLoc(get_turf(src))
-/mob/living/silicon/ai/attack_ai(var/mob/user as mob)
+/mob/living/silicon/ai/attack_ai(mob/user as mob)
ai_camera_list()
/proc/camera_sort(list/L)
diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm
index 43917cc6ce..5f0ad32cf9 100644
--- a/code/game/machinery/clawmachine.dm
+++ b/code/game/machinery/clawmachine.dm
@@ -155,7 +155,7 @@
var/prizeselect = pickweight(prizes)
new prizeselect(src.loc)
-/obj/machinery/clawmachine/proc/insert_cash(var/obj/item/spacecash/cashmoney, mob/user)
+/obj/machinery/clawmachine/proc/insert_cash(obj/item/spacecash/cashmoney, mob/user)
if (ispowered == 0)
return
if (isbroken)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index ee8e05db17..ad6598c779 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -4,7 +4,7 @@
//Potential replacement for genetics revives or something I dunno (?)
//Find a dead mob with a brain and client.
-/proc/find_dead_player(var/find_key)
+/proc/find_dead_player(find_key)
if(isnull(find_key))
return
@@ -63,7 +63,7 @@
go_out()
. = ..()
-/obj/machinery/clonepod/proc/set_occupant(var/mob/living/L)
+/obj/machinery/clonepod/proc/set_occupant(mob/living/L)
SHOULD_NOT_OVERRIDE(TRUE)
if(!L)
weakref_occupant = null
@@ -90,7 +90,7 @@
return
//Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(var/datum/transhuman/body_record/BR)
+/obj/machinery/clonepod/proc/growclone(datum/transhuman/body_record/BR)
if(mess || attempting)
return 0
var/datum/mind/clonemind = locate(BR.mydna.mind)
@@ -270,7 +270,7 @@
else
..()
-/obj/machinery/clonepod/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/clonepod/emag_act(remaining_charges, mob/user)
if(isnull(get_occupant()))
return
to_chat(user, "You force an emergency ejection.")
@@ -279,7 +279,7 @@
return 1
//Put messages in the connected computer's temp var for display.
-/obj/machinery/clonepod/proc/connected_message(var/message)
+/obj/machinery/clonepod/proc/connected_message(message)
if((isnull(connected)) || (!istype(connected, /obj/machinery/computer/cloning)))
return 0
if(!message)
@@ -350,7 +350,7 @@
return biomass_count
// Removes [amount] biomass, spread across all containers. Doesn't have any check that you actually HAVE enough biomass, though.
-/obj/machinery/clonepod/proc/remove_biomass(var/amount = CLONE_BIOMASS) //Just in case it doesn't get passed a new amount, assume one clone
+/obj/machinery/clonepod/proc/remove_biomass(amount = CLONE_BIOMASS) //Just in case it doesn't get passed a new amount, assume one clone
var/to_remove = 0 // Tracks how much biomass has been found so far
if(LAZYLEN(containers))
for(var/obj/item/reagent_containers/glass/G in containers)
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 816c0d7b3d..7e1eaf5d08 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -223,7 +223,7 @@
* I have no idea why you would ever perform these surgeries, given that Bicaradine and Kelotane exist.
* So I'm not even going to bother trying to represent them here. Fuck it.
*/
-/obj/machinery/computer/operating/proc/find_stage(var/obj/item/organ/external/E)
+/obj/machinery/computer/operating/proc/find_stage(obj/item/organ/external/E)
. = "None."
switch(E.open)
if(1)
@@ -263,7 +263,7 @@
* This converts a typepath into a pretty name.
* As best as it can, anyways.
*/
-/proc/pretty_type(var/datum/A)
+/proc/pretty_type(datum/A)
var/typeStr = "[A.type]"
. = copytext(typeStr, findlasttext(typeStr, "/") + 1, length(typeStr) + 1)
. = capitalize(replacetext(., "_", " "))
diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm
index eb2085737b..d20eabeaa4 100644
--- a/code/game/machinery/computer/RCON_Console.dm
+++ b/code/game/machinery/computer/RCON_Console.dm
@@ -27,7 +27,7 @@
// Proc: attack_hand()
// Parameters: 1 (user - Person which clicked this computer)
// Description: Opens UI of this machine.
-/obj/machinery/computer/rcon/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/rcon/attack_hand(mob/user as mob)
..()
tgui_interact(user)
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index fe4c4ee02a..670937f1e5 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -201,7 +201,7 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva
GLOB.empty_playable_ai_cores -= src
return ..()
-/obj/structure/AIcore/deactivated/proc/load_ai(var/mob/living/silicon/ai/transfer, var/obj/item/aicard/card, var/mob/user)
+/obj/structure/AIcore/deactivated/proc/load_ai(mob/living/silicon/ai/transfer, obj/item/aicard/card, mob/user)
if(!istype(transfer) || locate(/mob/living/silicon/ai) in src)
return
@@ -222,14 +222,14 @@ GLOBAL_LIST_BOILERPLATE(all_deactivated_AI_cores, /obj/structure/AIcore/deactiva
qdel(src)
-/obj/structure/AIcore/deactivated/proc/check_malf(var/mob/living/silicon/ai/ai)
+/obj/structure/AIcore/deactivated/proc/check_malf(mob/living/silicon/ai/ai)
if(!ai)
return
for (var/datum/mind/malfai in GLOB.malf.current_antagonists)
if (ai.mind == malfai)
return 1
-/obj/structure/AIcore/deactivated/attackby(var/obj/item/W, var/mob/user)
+/obj/structure/AIcore/deactivated/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/aicard))
var/obj/item/aicard/card = W
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 34c8c42762..cf801c109d 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -203,7 +203,7 @@
add_fingerprint(ui.user)
return TRUE
-/obj/machinery/computer/arcade/battle/proc/arcade_action(var/mob/user)
+/obj/machinery/computer/arcade/battle/proc/arcade_action(mob/user)
if ((enemy_mp <= 0) || (enemy_hp <= 0))
if(!gameover)
gameover = 1
@@ -274,7 +274,7 @@
return
-/obj/machinery/computer/arcade/battle/emag_act(var/charges, var/mob/user)
+/obj/machinery/computer/arcade/battle/emag_act(charges, mob/user)
if(!emagged)
to_chat(user, span_notice("You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Hyper-Lethal Mode."))
@@ -366,7 +366,7 @@
"You have made it to Orion! Congratulations! Your crew is one of the few to start a new foothold for mankind!"
)
-/obj/machinery/computer/arcade/orion_trail/proc/newgame(var/mob/user)
+/obj/machinery/computer/arcade/orion_trail/proc/newgame(mob/user)
// Set names of settlers in crew
settlers = list()
for(var/i = 1; i <= 3; i++)
@@ -973,7 +973,7 @@
eventdat += "Depart Spaceport "
-/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(var/specific = "")
+/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(specific = "")
var/newcrew = ""
if(specific)
newcrew = specific
@@ -987,7 +987,7 @@
alive++
return newcrew
-/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(var/specific = "", var/dont_remove = "")
+/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(specific = "", dont_remove = "")
var/list/safe2remove = settlers
var/removed = ""
if(dont_remove)
@@ -1005,7 +1005,7 @@
return removed
-/obj/machinery/computer/arcade/orion_trail/proc/win(var/mob/user)
+/obj/machinery/computer/arcade/orion_trail/proc/win(mob/user)
gameStatus = ORION_STATUS_START
src.visible_message("\The [src] plays a triumpant tune, stating 'CONGRATULATIONS, YOU HAVE MADE IT TO ORION.'")
playsound(src, 'sound/arcade/ori_win.ogg', 50, 1, extrarange = -3, falloff = 0.1, ignore_walls = FALSE)
@@ -1128,7 +1128,7 @@
return
////// Cash
-/obj/machinery/computer/arcade/clawmachine/proc/pay_with_cash(var/obj/item/spacecash/cashmoney, mob/user)
+/obj/machinery/computer/arcade/clawmachine/proc/pay_with_cash(obj/item/spacecash/cashmoney, mob/user)
if(!emagged)
if(gameprice > cashmoney.worth)
@@ -1157,7 +1157,7 @@
///// Ewallet
-/obj/machinery/computer/arcade/clawmachine/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet, var/mob/user)
+/obj/machinery/computer/arcade/clawmachine/proc/pay_with_ewallet(obj/item/spacecash/ewallet/wallet, mob/user)
if(!emagged)
visible_message(span_info("\The [user] swipes \the [wallet] through \the [src]."))
playsound(src, 'sound/machines/id_swipe.ogg', 50, 1)
@@ -1173,7 +1173,7 @@
to_chat(user, span_info("It doesn't seem to accept that! Seem you'll need to swipe a valid ID."))
///// ID
-/obj/machinery/computer/arcade/clawmachine/proc/pay_with_card(var/obj/item/card/id/I, var/obj/item/ID_container, var/mob/user)
+/obj/machinery/computer/arcade/clawmachine/proc/pay_with_card(obj/item/card/id/I, obj/item/ID_container, mob/user)
if(I==ID_container || ID_container == null)
visible_message(span_info("\The [user] swipes \the [I] through \the [src]."))
else
@@ -1229,7 +1229,7 @@
/// Add to vendor account
-/obj/machinery/computer/arcade/clawmachine/proc/credit_purchase(var/target as text)
+/obj/machinery/computer/arcade/clawmachine/proc/credit_purchase(target as text)
GLOB.vendor_account.money += gameprice
var/datum/transaction/T = new()
@@ -1289,7 +1289,7 @@
instructions = "Insert 1 thaler or swipe a card to play!"
clawvend(ui.user)
-/obj/machinery/computer/arcade/clawmachine/proc/clawvend(var/mob/user) /// True to a real claw machine, it's NEARLY impossible to win.
+/obj/machinery/computer/arcade/clawmachine/proc/clawvend(mob/user) /// True to a real claw machine, it's NEARLY impossible to win.
winprob += 1 /// Yeah.
if(prob(winprob)) /// YEAH.
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 890c4e5596..6814318be2 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -25,7 +25,7 @@
light_color = "#00cc00"
density = 0
-/obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/atmoscontrol/attack_ai(mob/user as mob)
tgui_interact(user)
/obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
@@ -33,7 +33,7 @@
return 1
tgui_interact(user)
-/obj/machinery/computer/atmoscontrol/emag_act(var/remaining_carges, var/mob/user)
+/obj/machinery/computer/atmoscontrol/emag_act(remaining_carges, mob/user)
if(!emagged)
user.visible_message(span_warning("\The [user] does something \the [src], causing the screen to flash!"),\
span_warning("You cause the screen to flash as you gain full control."),\
@@ -41,7 +41,7 @@
atmos_control.emagged = 1
return 1
-/obj/machinery/computer/atmoscontrol/tgui_interact(var/mob/user)
+/obj/machinery/computer/atmoscontrol/tgui_interact(mob/user)
if(!atmos_control)
atmos_control = new(src, req_access, req_one_access, monitored_alarm_ids)
atmos_control.tgui_interact(user)
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 1732523e2d..163f136de4 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -71,7 +71,7 @@
SStgui.update_uis(src)
attack_hand(user)
-/obj/machinery/computer/card/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/card/attack_ai(mob/user as mob)
return attack_hand(user)
/obj/machinery/computer/card/attack_hand(mob/user as mob)
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 298f608b31..83d1194dcf 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -362,7 +362,7 @@
add_fingerprint(ui.user)
-/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob, var/scan_brain = 0)
+/obj/machinery/computer/cloning/proc/scan_mob(mob/living/carbon/human/subject as mob, scan_brain = 0)
if(stat & NOPOWER)
return
if(scanner.stat & (NOPOWER|BROKEN))
@@ -433,7 +433,7 @@
SStgui.update_uis(src)
//Find a specific record by key.
-/obj/machinery/computer/cloning/proc/find_record(var/find_key)
+/obj/machinery/computer/cloning/proc/find_record(find_key)
var/selected_record = null
for(var/datum/transhuman/body_record/BR in records)
if(BR.mydna.ckey == find_key)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 57fc7823b3..e96875d0f4 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -16,7 +16,7 @@
. = ..()
communications = new(src)
-/obj/machinery/computer/communications/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/communications/emag_act(remaining_charges, mob/user)
if(!emagged)
emagged = TRUE
communications.emagged = TRUE
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 4795ad34af..86a2a5df9a 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -56,7 +56,7 @@
set_broken()
return
-/obj/machinery/computer/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/computer/bullet_act(obj/item/projectile/Proj)
if(prob(Proj.get_structure_damage()))
set_broken()
..()
diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index 0a0085cc72..a31da4d91d 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -132,7 +132,7 @@
return
..()
-/obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/guestpass/attack_ai(mob/user as mob)
return attack_hand(user)
/obj/machinery/computer/guestpass/verb/eject_id()
@@ -155,7 +155,7 @@
to_chat(usr, span_warning("There is nothing to remove from the console."))
return
-/obj/machinery/computer/guestpass/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/guestpass/attack_hand(mob/user as mob)
if(..())
return
diff --git a/code/game/machinery/computer/id_restorer_vr.dm b/code/game/machinery/computer/id_restorer_vr.dm
index 86bbc28243..f0928ba84a 100644
--- a/code/game/machinery/computer/id_restorer_vr.dm
+++ b/code/game/machinery/computer/id_restorer_vr.dm
@@ -95,5 +95,5 @@
y_offset = 30
icon_override = 'icons/obj/machines/id_restorer_vr.dmi'
-/datum/frame/frame_types/id_restorer/get_icon_state(var/state)
+/datum/frame/frame_types/id_restorer/get_icon_state(state)
return "restorer_b[state]"
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index c54b5ee32c..861b90df65 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -36,7 +36,7 @@
..()
-/obj/machinery/computer/aiupload/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/aiupload/attack_hand(mob/user as mob)
if(src.stat & NOPOWER)
to_chat(user, "The upload computer has no power!")
return
@@ -72,7 +72,7 @@
return ..()
-/obj/machinery/computer/borgupload/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/borgupload/attack_hand(mob/user as mob)
if(src.stat & NOPOWER)
to_chat(user, "The upload computer has no power!")
return
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 4b9e18e6aa..56b02ff42d 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -85,7 +85,7 @@
to_chat(usr, "There is nothing to remove from the console.")
return
-/obj/machinery/computer/med_data/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/computer/med_data/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/card/id) && !scan && user.unEquip(O))
O.loc = src
scan = O
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 4d829ef643..f4775c2f97 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -42,7 +42,7 @@
..()
return
-/obj/machinery/computer/message_monitor/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/message_monitor/emag_act(remaining_charges, mob/user)
// Will create sparks and print out the console's password. You will then have to wait a while for the console to be back online.
// It'll take more time if there's more characters in the password..
if(!emag && operable())
@@ -149,7 +149,7 @@
return data
-/obj/machinery/computer/message_monitor/attack_hand(var/mob/living/user as mob)
+/obj/machinery/computer/message_monitor/attack_hand(mob/living/user as mob)
if(stat & (NOPOWER|BROKEN))
return
if(!istype(user))
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 9212dfb3f8..38f9f6bd09 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -106,10 +106,10 @@
*/
-/obj/machinery/computer/pod/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/pod/attack_ai(mob/user as mob)
return attack_hand(user)
-/obj/machinery/computer/pod/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/pod/attack_hand(mob/user as mob)
. = ..()
if(.)
return
@@ -194,7 +194,7 @@
title = "External Airlock Controls"
req_access = list(ACCESS_SYNDICATE)
-/obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/pod/old/syndicate/attack_hand(mob/user as mob)
if(!allowed(user))
to_chat(user, span_warning("Access Denied"))
return
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 55abad72a9..e7fec74019 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -15,7 +15,7 @@
var/stop = 0.0
var/screen = 0 // 0 - No Access Denied, 1 - Access allowed
-/obj/machinery/computer/prisoner/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/prisoner/attack_ai(mob/user as mob)
return src.attack_hand(user)
/obj/machinery/computer/prisoner/attack_hand(mob/user)
diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm
index f96e595c39..1108d919c7 100644
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -23,10 +23,10 @@ GLOBAL_VAR_INIT(prison_shuttle_timeleft, 0)
var/allowedtocall = 0
var/prison_break = 0
-/obj/machinery/computer/prison_shuttle/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/prison_shuttle/attack_ai(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/computer/prison_shuttle/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/prison_shuttle/attack_hand(mob/user as mob)
if(!src.allowed(user) && (!hacked))
to_chat(user, span_warning("Access Denied."))
return
@@ -116,7 +116,7 @@ GLOBAL_VAR_INIT(prison_shuttle_timeleft, 0)
prison_break = 0
-/obj/machinery/computer/prison_shuttle/proc/post_signal(var/command)
+/obj/machinery/computer/prison_shuttle/proc/post_signal(command)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1311)
if(!frequency) return
var/datum/signal/status_signal = new
@@ -208,7 +208,7 @@ GLOBAL_VAR_INIT(prison_shuttle_timeleft, 0)
start_location.move_contents_to(end_location)
return
-/obj/machinery/computer/prison_shuttle/emag_act(var/charges, var/mob/user)
+/obj/machinery/computer/prison_shuttle/emag_act(charges, mob/user)
if(!hacked)
hacked = 1
to_chat(user, span_notice("You disable the lock."))
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index a200037df2..e9bd1c0c77 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -8,10 +8,10 @@
circuit = /obj/item/circuitboard/robotics
var/safety = 1
-/obj/machinery/computer/robotics/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/robotics/attack_ai(mob/user as mob)
tgui_interact(user)
-/obj/machinery/computer/robotics/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/robotics/attack_hand(mob/user as mob)
if(..())
return
if(stat & (NOPOWER|BROKEN))
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index cecb7aea32..24fcc91a31 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -73,7 +73,7 @@
to_chat(usr, "There is nothing to remove from the console.")
return
-/obj/machinery/computer/secure_data/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/card/id) && !scan && user.unEquip(O))
O.loc = src
scan = O
@@ -476,10 +476,10 @@
if(update_now)
SStgui.update_uis(src)
-/obj/machinery/computer/secure_data/proc/is_not_allowed(var/mob/user)
+/obj/machinery/computer/secure_data/proc/is_not_allowed(mob/user)
return !src.authenticated || user.stat || user.restrained() || (!in_range(src, user) && (!istype(user, /mob/living/silicon)))
-/obj/machinery/computer/secure_data/proc/get_photo(var/mob/user)
+/obj/machinery/computer/secure_data/proc/get_photo(mob/user)
if(istype(user.get_active_hand(), /obj/item/photo))
var/obj/item/photo/photo = user.get_active_hand()
return photo.img
diff --git a/code/game/machinery/computer/shutoff_monitor.dm b/code/game/machinery/computer/shutoff_monitor.dm
index 2f08d5a036..92b1849257 100644
--- a/code/game/machinery/computer/shutoff_monitor.dm
+++ b/code/game/machinery/computer/shutoff_monitor.dm
@@ -15,7 +15,7 @@
QDEL_NULL(monitor)
. = ..()
-/obj/machinery/computer/shutoff_monitor/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/shutoff_monitor/attack_hand(mob/user as mob)
..()
monitor.tgui_interact(user)
diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm
index c50f7d1d6f..00571335dd 100644
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -8,7 +8,7 @@
var/list/authorized = list( )
-/obj/machinery/computer/shuttle/attackby(var/obj/item/card/W as obj, var/mob/user as mob)
+/obj/machinery/computer/shuttle/attackby(obj/item/card/W as obj, mob/user as mob)
if(stat & (BROKEN|NOPOWER)) return
if ((!( istype(W, /obj/item/card) ) || !( SSticker ) || SSemergency_shuttle.location() || !( user ))) return
if (istype(W, /obj/item/card/id)||istype(W, /obj/item/pda))
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index a22ca22be1..3382b0b822 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -57,7 +57,7 @@
active1 = null
return ..()
-/obj/machinery/computer/skills/attackby(obj/item/O as obj, var/mob/user)
+/obj/machinery/computer/skills/attackby(obj/item/O as obj, mob/user)
if(istype(O, /obj/item/card/id) && !scan && user.unEquip(O))
O.loc = src
scan = O
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index e592a34163..9cb490a67c 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -246,13 +246,13 @@ GLOBAL_VAR_INIT(specops_shuttle_timeleft, 0)
return 0
return 1
-/obj/machinery/computer/specops_shuttle/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/specops_shuttle/attack_ai(mob/user as mob)
return attack_hand(user)
-/obj/machinery/computer/specops_shuttle/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/specops_shuttle/emag_act(remaining_charges, mob/user)
to_chat(user, span_notice("The electronic systems in this console are far too advanced for your primitive hacking peripherals."))
-/obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/specops_shuttle/attack_hand(mob/user as mob)
if(!allowed(user))
to_chat(user, span_warning("Access Denied."))
return
diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm
index 4d086feb17..acd68e4e5f 100644
--- a/code/game/machinery/computer/supply.dm
+++ b/code/game/machinery/computer/supply.dm
@@ -27,10 +27,10 @@
circuit = /obj/item/circuitboard/supplycomp/control
authorization = SUP_SEND_SHUTTLE | SUP_ACCEPT_ORDERS
-/obj/machinery/computer/supplycomp/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/supplycomp/attack_ai(mob/user as mob)
return attack_hand(user)
-/obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/supplycomp/attack_hand(mob/user as mob)
if(..())
return
if(!allowed(user))
@@ -39,7 +39,7 @@
tgui_interact(user)
return
-/obj/machinery/computer/supplycomp/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/supplycomp/emag_act(remaining_charges, mob/user)
if(!can_order_contraband)
to_chat(user, span_notice("Special supplies unlocked."))
authorization |= SUP_CONTRABAND
@@ -486,7 +486,7 @@
add_fingerprint(ui.user)
-/obj/machinery/computer/supplycomp/proc/post_signal(var/command)
+/obj/machinery/computer/supplycomp/proc/post_signal(command)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency) return
diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm
index b50e31e9de..ec94e5ab07 100644
--- a/code/game/machinery/computer/timeclock_vr.dm
+++ b/code/game/machinery/computer/timeclock_vr.dm
@@ -64,7 +64,7 @@
return
. = ..()
-/obj/machinery/computer/timeclock/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/timeclock/attack_hand(mob/user as mob)
if(..())
return
tgui_interact(user)
@@ -149,7 +149,7 @@
update_icon()
return TRUE
-/obj/machinery/computer/timeclock/proc/getOpenOnDutyJobs(var/mob/user, var/department)
+/obj/machinery/computer/timeclock/proc/getOpenOnDutyJobs(mob/user, department)
var/list/available_jobs = list()
for(var/datum/job/job in SSjob.occupations)
if(isOpenOnDutyJob(user, department, job))
@@ -160,7 +160,7 @@
available_jobs[job.title] += alt_job
return available_jobs
-/obj/machinery/computer/timeclock/proc/isOpenOnDutyJob(var/mob/user, var/department, var/datum/job/job)
+/obj/machinery/computer/timeclock/proc/isOpenOnDutyJob(mob/user, department, datum/job/job)
return job \
&& job.is_position_available() \
&& !job.whitelist_only \
@@ -171,7 +171,7 @@
&& !job.disallow_jobhop \
&& job.timeoff_factor > 0
-/obj/machinery/computer/timeclock/proc/makeOnDuty(var/newrank, var/newassignment, var/mob/user)
+/obj/machinery/computer/timeclock/proc/makeOnDuty(newrank, newassignment, mob/user)
var/datum/job/oldjob = SSjob.get_job(card.rank)
var/datum/job/newjob = SSjob.get_job(newrank)
if(!oldjob || !isOpenOnDutyJob(user, oldjob.pto_type, newjob))
@@ -203,7 +203,7 @@
announce.autosay("[card.registered_name] has moved On-Duty as [card.assignment].", "Employee Oversight", channel, zlevels = using_map.get_map_levels(get_z(src)))
return
-/obj/machinery/computer/timeclock/proc/makeOffDuty(var/mob/user)
+/obj/machinery/computer/timeclock/proc/makeOffDuty(mob/user)
var/datum/job/foundjob = SSjob.get_job(card.rank)
if(!foundjob)
return
@@ -229,7 +229,7 @@
announce.autosay("[card.registered_name], [oldtitle], has moved Off-Duty.", "Employee Oversight", channel, zlevels = using_map.get_map_levels(get_z(src)))
return
-/obj/machinery/computer/timeclock/proc/checkCardCooldown(var/mob/user)
+/obj/machinery/computer/timeclock/proc/checkCardCooldown(mob/user)
if(!card)
return FALSE
var/time_left = getCooldown()
@@ -241,7 +241,7 @@
/obj/machinery/computer/timeclock/proc/getCooldown()
return 1 MINUTES - (world.time - card.last_job_switch) // CHOMPedit: 10 minute wait down to 1 minute.
-/obj/machinery/computer/timeclock/proc/checkFace(var/mob/user)
+/obj/machinery/computer/timeclock/proc/checkFace(mob/user)
var/turf/location = get_turf(src) // CHOMPedit: Needed for admin logs.
if(!card)
to_chat(user, span_notice("No ID is inserted."))
@@ -289,7 +289,7 @@ CHOMPedit end. */
y_offset = 30
icon_override = 'icons/obj/machines/timeclock_vr.dmi'
-/datum/frame/frame_types/timeclock_terminal/get_icon_state(var/state)
+/datum/frame/frame_types/timeclock_terminal/get_icon_state(state)
return "timeclock_b[state]"
//
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 6888ac1276..59e2f00b83 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -166,7 +166,7 @@
add_fingerprint(ui.user)
-/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/G as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/unary/cryo_cell/attackby(obj/item/G as obj, mob/user as mob)
if(istype(G, /obj/item/reagent_containers/glass))
if(beaker)
to_chat(user, span_warning("A beaker is already loaded into the machine."))
@@ -193,7 +193,7 @@
return
-/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(var/mob/target, var/mob/user) //Allows borgs to put people into cryo without external assistance
+/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) //Allows borgs to put people into cryo without external assistance
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !ishuman(target))
return
put_mob(target)
@@ -344,7 +344,7 @@
return
put_mob(L)
-/atom/proc/return_air_for_internal_lifeform(var/mob/living/lifeform)
+/atom/proc/return_air_for_internal_lifeform(mob/living/lifeform)
return return_air()
/obj/machinery/atmospherics/unary/cryo_cell/return_air_for_internal_lifeform()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index bf12ddf756..fcb0ba10af 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -357,7 +357,7 @@
// This function can not be undone; do not call this unless you are sure
// Also make sure there is a valid control computer
-/obj/machinery/cryopod/robot/despawn_occupant(var/mob/to_despawn)
+/obj/machinery/cryopod/robot/despawn_occupant(mob/to_despawn)
var/mob/living/silicon/robot/R = to_despawn
if(!istype(R)) return ..()
@@ -379,7 +379,7 @@
// This function can not be undone; do not call this unless you are sure
// Also make sure there is a valid control computer
-/obj/machinery/cryopod/proc/despawn_occupant(var/mob/to_despawn)
+/obj/machinery/cryopod/proc/despawn_occupant(mob/to_despawn)
//Recursively despawn mobs
for(var/mob/M in to_despawn)
despawn_occupant(M)
@@ -568,7 +568,7 @@
qdel(to_despawn)
set_occupant(null)
-/obj/machinery/cryopod/attackby(var/obj/item/G as obj, var/mob/user as mob)
+/obj/machinery/cryopod/attackby(obj/item/G as obj, mob/user as mob)
if(istype(G, /obj/item/grab))
@@ -665,12 +665,12 @@
for(var/obj/machinery/gateway/G in range(1,src))
G.icon_state = "on"
-/obj/machinery/cryopod/robot/door/gateway/go_out(var/skip_move = FALSE)
+/obj/machinery/cryopod/robot/door/gateway/go_out(skip_move = FALSE)
..(skip_move)
for(var/obj/machinery/gateway/G in range(1,src))
G.icon_state = "off"
-/obj/machinery/cryopod/proc/go_out(var/skip_move = FALSE)
+/obj/machinery/cryopod/proc/go_out(skip_move = FALSE)
if(!occupant)
return
@@ -686,18 +686,18 @@
return
-/obj/machinery/cryopod/proc/set_occupant(var/new_occupant)
+/obj/machinery/cryopod/proc/set_occupant(new_occupant)
occupant = new_occupant
name = initial(name)
if(occupant)
name = "[name] ([occupant])"
-/obj/machinery/cryopod/MouseDrop_T(var/mob/target, var/mob/user)
+/obj/machinery/cryopod/MouseDrop_T(mob/target, mob/user)
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user))
return
go_in(target, user)
-/obj/machinery/cryopod/proc/go_in(var/mob/M, var/mob/user)
+/obj/machinery/cryopod/proc/go_in(mob/M, mob/user)
if(!check_occupant_allowed(M))
return
if(!M)
diff --git a/code/game/machinery/cryopod_vr.dm b/code/game/machinery/cryopod_vr.dm
index d39ac03b0b..e95ea0b740 100644
--- a/code/game/machinery/cryopod_vr.dm
+++ b/code/game/machinery/cryopod_vr.dm
@@ -50,7 +50,7 @@
desc = "An interface between visitors and the residential oversight systems tasked with keeping track of all visitors in the residential district."
*/
-/obj/machinery/cryopod/proc/log_special_item(var/atom/movable/item,var/mob/to_despawn)
+/obj/machinery/cryopod/proc/log_special_item(atom/movable/item,mob/to_despawn)
ASSERT(item && to_despawn)
var/loaded_from_key
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 19e45590a1..f82de38fa5 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -74,7 +74,7 @@ Deployable items
explode()
return
-/obj/machinery/deployable/barrier/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/machinery/deployable/barrier/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
playsound(src, 'sound/weapons/smash.ogg', 50, 1)
user.do_attack_animation(src)
@@ -82,7 +82,7 @@ Deployable items
CheckHealth()
return
-/obj/machinery/deployable/barrier/take_damage(var/damage)
+/obj/machinery/deployable/barrier/take_damage(damage)
health -= damage
CheckHealth()
return
@@ -127,7 +127,7 @@ Deployable items
if(src)
qdel(src)
-/obj/machinery/deployable/barrier/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/deployable/barrier/emag_act(remaining_charges, mob/user)
if(emagged == 0)
emagged = 1
LAZYCLEARLIST(req_access)
diff --git a/code/game/machinery/deployable_vr.dm b/code/game/machinery/deployable_vr.dm
index f772bd0c95..11687b77e4 100644
--- a/code/game/machinery/deployable_vr.dm
+++ b/code/game/machinery/deployable_vr.dm
@@ -57,20 +57,20 @@
topple()
..()
-/obj/structure/barricade/cutout/attack_hand(var/mob/user)
+/obj/structure/barricade/cutout/attack_hand(mob/user)
if((. = ..()))
return
if(toppled)
untopple()
-/obj/structure/barricade/cutout/examine(var/mob/user)
+/obj/structure/barricade/cutout/examine(mob/user)
. = ..()
if(Adjacent(user))
. += span_notice("... from this distance, they seem to be made of [material.name] ...")
-/obj/structure/barricade/cutout/attackby(var/obj/I, var/mob/user)
+/obj/structure/barricade/cutout/attackby(obj/I, mob/user)
if(is_type_in_list(I, painters))
var/choice = tgui_input_list(user, "What would you like to paint the cutout as?", "Cutout Painting", cutout_types)
if(!choice || !Adjacent(user) || I != user.get_active_hand())
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index d3f6b7f841..d52c50c7f4 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -28,7 +28,7 @@
/obj/machinery/button/remote/attackby(obj/item/W, mob/user as mob)
return attack_hand(user)
-/obj/machinery/button/remote/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/button/remote/emag_act(remaining_charges, mob/user)
if(LAZYLEN(req_access) || LAZYLEN(req_one_access))
LAZYCLEARLIST(req_access)
LAZYCLEARLIST(req_one_access)
@@ -256,7 +256,7 @@
desc = "It controls shields, remotely."
icon = 'icons/obj/stationobjs.dmi'
-/obj/machinery/button/remote/shields/trigger(var/mob/user)
+/obj/machinery/button/remote/shields/trigger(mob/user)
for(var/obj/machinery/shield_gen/SG in GLOB.machines)
if(SG.id == id)
if(SG?.anchored)
diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm
index 01fa524eff..9d643439d9 100644
--- a/code/game/machinery/doorbell_vr.dm
+++ b/code/game/machinery/doorbell_vr.dm
@@ -92,7 +92,7 @@
use_power = USE_POWER_OFF
flags = WALL_ITEM
-/obj/machinery/button/doorbell/Initialize(mapload, var/dir, var/building = FALSE)
+/obj/machinery/button/doorbell/Initialize(mapload, dir, building = FALSE)
. = ..()
if(building)
pixel_x = (dir & 3)? 0 : (dir == 4 ? -32 : 32)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index e6b57ade4c..0aa9af21df 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -74,7 +74,7 @@
/obj/item = 12,
)
-/obj/machinery/door/airlock/attack_generic(var/mob/living/user, var/damage)
+/obj/machinery/door/airlock/attack_generic(mob/living/user, damage)
if(stat & (BROKEN|NOPOWER))
if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD)
if(locked || welded)
@@ -99,7 +99,7 @@
return
..()
-/obj/machinery/door/airlock/attack_alien(var/mob/user) //Familiar, right? Doors. -Mechoid
+/obj/machinery/door/airlock/attack_alien(mob/user) //Familiar, right? Doors. -Mechoid
if(!ishuman(user))
return ..()
var/mob/living/carbon/human/X = user
@@ -296,7 +296,7 @@ About the new airlock wires panel:
update_icon()
-/obj/machinery/door/airlock/proc/electrify(var/duration, var/feedback = 0)
+/obj/machinery/door/airlock/proc/electrify(duration, feedback = 0)
var/message = ""
if(wires.is_cut(WIRE_ELECTRIFY) && arePowerSystemsOn())
message = text("The electrification wire is cut - Door permanently electrified.")
@@ -322,7 +322,7 @@ About the new airlock wires panel:
if(feedback && message)
to_chat(usr,message)
-/obj/machinery/door/airlock/proc/set_idscan(var/activate, var/feedback = 0)
+/obj/machinery/door/airlock/proc/set_idscan(activate, feedback = 0)
var/message = ""
if(wires.is_cut(WIRE_IDSCAN))
message = "The IdScan wire is cut - IdScan feature permanently disabled."
@@ -336,7 +336,7 @@ About the new airlock wires panel:
if(feedback && message)
to_chat(usr,message)
-/obj/machinery/door/airlock/proc/set_safeties(var/activate, var/feedback = 0)
+/obj/machinery/door/airlock/proc/set_safeties(activate, feedback = 0)
var/message = ""
// Safeties! We don't need no stinking safeties!
if (wires.is_cut(WIRE_SAFETY))
@@ -976,25 +976,25 @@ About the new airlock wires panel:
/mob/living/blocks_airlock()
return !is_incorporeal()
-/atom/movable/proc/airlock_crush(var/crush_damage)
+/atom/movable/proc/airlock_crush(crush_damage)
return FALSE
-/obj/machinery/portable_atmospherics/canister/airlock_crush(var/crush_damage)
+/obj/machinery/portable_atmospherics/canister/airlock_crush(crush_damage)
. = ..()
health -= crush_damage
healthcheck()
-/obj/effect/energy_field/airlock_crush(var/crush_damage)
+/obj/effect/energy_field/airlock_crush(crush_damage)
adjust_strength(crush_damage)
-/obj/structure/closet/airlock_crush(var/crush_damage)
+/obj/structure/closet/airlock_crush(crush_damage)
..()
damage(crush_damage)
for(var/atom/movable/AM in src)
AM.airlock_crush()
return TRUE
-/mob/living/airlock_crush(var/crush_damage)
+/mob/living/airlock_crush(crush_damage)
if(is_incorporeal())
return FALSE
. = ..()
@@ -1006,12 +1006,12 @@ About the new airlock wires panel:
T.add_blood(src)
return TRUE
-/mob/living/carbon/airlock_crush(var/crush_damage)
+/mob/living/carbon/airlock_crush(crush_damage)
. = ..()
if(. && can_feel_pain()) // Only scream if actually crushed!
emote("scream")
-/mob/living/silicon/robot/airlock_crush(var/crush_damage)
+/mob/living/silicon/robot/airlock_crush(crush_damage)
adjustBruteLoss(crush_damage)
return FALSE
@@ -1090,7 +1090,7 @@ About the new airlock wires panel:
killthis.ex_act(2)//Smashin windows
. = ..()
-/obj/machinery/door/airlock/proc/lock(var/forced=0)
+/obj/machinery/door/airlock/proc/lock(forced=0)
if(locked)
return FALSE
@@ -1104,7 +1104,7 @@ About the new airlock wires panel:
update_icon()
return TRUE
-/obj/machinery/door/airlock/proc/unlock(var/forced=0)
+/obj/machinery/door/airlock/proc/unlock(forced=0)
if(!locked)
return
@@ -1124,7 +1124,7 @@ About the new airlock wires panel:
return FALSE
. = ..()
-/obj/machinery/door/airlock/Initialize(mapload, var/obj/structure/door_assembly/assembly=null)
+/obj/machinery/door/airlock/Initialize(mapload, obj/structure/door_assembly/assembly=null)
//if assembly is given, create the new door from the assembly
if (assembly && istype(assembly))
assembly_type = assembly.type
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index dcab1057e0..ee38ea1af5 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -34,7 +34,7 @@
do_command(cur_command)
-/obj/machinery/door/airlock/proc/check_completion(var/do_lock, var/delayed_status)
+/obj/machinery/door/airlock/proc/check_completion(do_lock, delayed_status)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(do_lock)
@@ -46,7 +46,7 @@
cur_command = null
send_status()
-/obj/machinery/door/airlock/proc/do_command(var/command)
+/obj/machinery/door/airlock/proc/do_command(command)
switch(command)
if("open")
open()
@@ -82,7 +82,7 @@
open()
addtimer(CALLBACK(src, PROC_REF(check_completion), TRUE), anim_length_before_density + anim_length_before_finalize)
-/obj/machinery/door/airlock/proc/command_completed(var/command)
+/obj/machinery/door/airlock/proc/command_completed(command)
switch(command)
if("open")
return (!density)
@@ -107,7 +107,7 @@
return 1 //Unknown command. Just assume it's completed.
-/obj/machinery/door/airlock/proc/send_status(var/bumped = 0)
+/obj/machinery/door/airlock/proc/send_status(bumped = 0)
if(radio_connection)
var/datum/signal/signal = new
signal.transmission_method = TRANSMISSION_RADIO //radio signal
@@ -128,7 +128,7 @@
if(!surpress_send) send_status()
-/obj/machinery/door/airlock/close(var/forced= FALSE, var/ignore_safties = FALSE, var/crush_damage = DOOR_CRUSH_DAMAGE)
+/obj/machinery/door/airlock/close(forced= FALSE, ignore_safties = FALSE, crush_damage = DOOR_CRUSH_DAMAGE)
. = ..()
if(!forced) send_status()
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index a5d6fb07b1..e02de8432a 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -16,7 +16,7 @@
var/locked = 1
var/emagged = 0
-/obj/item/airlock_electronics/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/airlock_electronics/emag_act(remaining_charges, mob/user)
if(!emagged)
emagged = 1
to_chat(user, span_notice("You remove the access restrictions on [src]!"))
@@ -108,7 +108,7 @@
attack_self(usr)
-/obj/item/airlock_electronics/proc/toggle_access(var/acc)
+/obj/item/airlock_electronics/proc/toggle_access(acc)
if (acc == "all")
conf_access = null
else
@@ -124,7 +124,7 @@
if (!conf_access.len)
conf_access = null
-/obj/item/airlock_electronics/proc/get_available_accesses(var/mob/user)
+/obj/item/airlock_electronics/proc/get_available_accesses(mob/user)
var/obj/item/card/id/id
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -150,6 +150,6 @@
desc = "designed to be somewhat more resistant to hacking than standard electronics."
secure = 1
-/obj/item/airlock_electronics/secure/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/airlock_electronics/secure/emag_act(remaining_charges, mob/user)
to_chat(user, span_warning("You don't appear to be able to bypass this hardened device!"))
return -1
diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm
index eae297003f..f6d217b9cc 100644
--- a/code/game/machinery/doors/blast_door.dm
+++ b/code/game/machinery/doors/blast_door.dm
@@ -138,7 +138,7 @@
// Proc: force_toggle()
// Parameters: None
// Description: Opens or closes the door, depending on current state. No checks are done inside this proc.
-/obj/machinery/door/blast/proc/force_toggle(var/forced = 0, mob/user as mob)
+/obj/machinery/door/blast/proc/force_toggle(forced = 0, mob/user as mob)
if (forced)
playsound(src, 'sound/machines/door/airlock_creaking.ogg', 100, 1)
@@ -227,7 +227,7 @@
// Proc: attack_alien()
// Parameters: Attacking Xeno mob.
// Description: Forces open the door after a delay.
-/obj/machinery/door/blast/attack_alien(var/mob/user) //Familiar, right? Doors.
+/obj/machinery/door/blast/attack_alien(mob/user) //Familiar, right? Doors.
if(ishuman(user))
var/mob/living/carbon/human/X = user
if(istype(X.species, /datum/species/xenos))
@@ -274,7 +274,7 @@
// Proc: open()
// Parameters: None
// Description: Opens the door. Does necessary checks. Automatically closes if autoclose is true
-/obj/machinery/door/blast/open(var/forced = 0)
+/obj/machinery/door/blast/open(forced = 0)
if(forced)
force_open()
return 1
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 0ed32a088c..8fbdbb744f 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -46,7 +46,7 @@
var/update_adjacent_tiles = TRUE
-/obj/machinery/door/attack_generic(var/mob/user, var/damage)
+/obj/machinery/door/attack_generic(mob/user, damage)
if(isanimal(user))
var/mob/living/simple_mob/S = user
if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD)
@@ -196,7 +196,7 @@
do_animate("deny")
return
-/obj/machinery/door/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/door/bullet_act(obj/item/projectile/Proj)
..()
var/damage = Proj.get_structure_damage()
@@ -364,7 +364,7 @@
return FALSE
-/obj/machinery/door/emag_act(var/remaining_charges)
+/obj/machinery/door/emag_act(remaining_charges)
if(density && operable())
do_animate("spark")
addtimer(CALLBACK(src, PROC_REF(trigger_emag)), 0.6 SECONDS)
@@ -376,7 +376,7 @@
open()
operating = -1
-/obj/machinery/door/take_damage(var/damage)
+/obj/machinery/door/take_damage(damage)
var/initialhealth = health
health = max(0, health - damage)
if(health <= 0 && initialhealth > 0)
@@ -473,7 +473,7 @@
playsound(src, 'sound/machines/buzz-two.ogg', 50, 0)
return
-/obj/machinery/door/proc/open(var/forced = 0)
+/obj/machinery/door/proc/open(forced = 0)
if(!can_open(forced))
return
operating = 1
@@ -485,14 +485,14 @@
set_opacity(0)
addtimer(CALLBACK(src, PROC_REF(open_internalsetdensity),forced), anim_length_before_density)
-/obj/machinery/door/proc/open_internalsetdensity(var/forced = 0)
+/obj/machinery/door/proc/open_internalsetdensity(forced = 0)
PRIVATE_PROC(TRUE) //do not touch this or BYOND will devour you
SHOULD_NOT_OVERRIDE(TRUE)
density = FALSE
update_nearby_tiles()
addtimer(CALLBACK(src, PROC_REF(open_internalfinish),forced), anim_length_before_finalize)
-/obj/machinery/door/proc/open_internalfinish(var/forced = 0)
+/obj/machinery/door/proc/open_internalfinish(forced = 0)
PRIVATE_PROC(TRUE) //do not touch this or BYOND will devour you
SHOULD_NOT_OVERRIDE(TRUE)
layer = open_layer
@@ -530,7 +530,7 @@
open_speed = 15
return (normalspeed ? open_speed : 5)
-/obj/machinery/door/proc/close(var/forced = 0, var/ignore_safties = FALSE, var/crush_damage = DOOR_CRUSH_DAMAGE)
+/obj/machinery/door/proc/close(forced = 0, ignore_safties = FALSE, crush_damage = DOOR_CRUSH_DAMAGE)
if(!can_close(forced))
return
operating = 1
@@ -541,7 +541,7 @@
do_animate("closing")
addtimer(CALLBACK(src, PROC_REF(close_internalsetdensity),forced), anim_length_before_density)
-/obj/machinery/door/proc/close_internalsetdensity(var/forced = 0)
+/obj/machinery/door/proc/close_internalsetdensity(forced = 0)
PRIVATE_PROC(TRUE) //do not touch this or BYOND will devour you
SHOULD_NOT_OVERRIDE(TRUE)
density = TRUE
@@ -550,7 +550,7 @@
update_nearby_tiles()
addtimer(CALLBACK(src, PROC_REF(close_internalfinish),forced), anim_length_before_finalize)
-/obj/machinery/door/proc/close_internalfinish(var/forced = 0)
+/obj/machinery/door/proc/close_internalfinish(forced = 0)
PROTECTED_PROC(TRUE) //do not touch this or BYOND will devour you
update_icon()
if(visible && !glass)
@@ -588,7 +588,7 @@
return TRUE
-/obj/machinery/door/proc/update_heat_protection(var/turf/simulated/source)
+/obj/machinery/door/proc/update_heat_protection(turf/simulated/source)
if(istype(source))
if(density && (opacity || heat_proof))
source.thermal_conductivity = DOOR_HEAT_TRANSFER_COEFFICIENT
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 0f57f2a772..c1a66d72f8 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -195,7 +195,7 @@
nextstate = FIREDOOR_CLOSED
close()
-/obj/machinery/door/firedoor/attack_alien(var/mob/user) //Familiar, right? Doors.
+/obj/machinery/door/firedoor/attack_alien(mob/user) //Familiar, right? Doors.
if(ishuman(user))
var/mob/living/carbon/human/X = user
if(istype(X.species, /datum/species/xenos))
@@ -220,7 +220,7 @@
return
..()
-/obj/machinery/door/firedoor/attack_generic(var/mob/living/user, var/damage)
+/obj/machinery/door/firedoor/attack_generic(mob/living/user, damage)
if(stat & (BROKEN|NOPOWER))
if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD)
var/time_to_force = (2 + (2 * blocked)) * 5
@@ -424,7 +424,7 @@
if(density)
START_MACHINE_PROCESSING(src)
-/obj/machinery/door/firedoor/open(var/forced = 0)
+/obj/machinery/door/firedoor/open(forced = 0)
if(hatch_open)
hatch_open = 0
visible_message("The maintenance hatch of \the [src] closes.")
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index caeae018a4..acbf2955c7 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -30,7 +30,7 @@
else
icon_state = "[base_state]open"
-/obj/machinery/door/window/proc/shatter(var/display_message = 1)
+/obj/machinery/door/window/proc/shatter(display_message = 1)
new /obj/item/material/shard(src.loc)
new /obj/item/material/shard(src.loc)
new /obj/item/stack/cable_coil(src.loc, 1)
@@ -152,7 +152,7 @@
operating = FALSE
return TRUE
-/obj/machinery/door/window/take_damage(var/damage)
+/obj/machinery/door/window/take_damage(damage)
src.health = max(0, src.health - damage)
if (src.health <= 0)
shatter()
@@ -185,7 +185,7 @@
return
-/obj/machinery/door/window/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/door/window/emag_act(remaining_charges, mob/user)
if (density && operable())
operating = -1
flick("[src.base_state]spark", src)
diff --git a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm
index 44f4376dd4..881bc34e91 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm
@@ -30,16 +30,16 @@
master_controller.dummy_terminals -= src
return ..()
-/obj/machinery/dummy_airlock_controller/interface_interact(var/mob/user)
+/obj/machinery/dummy_airlock_controller/interface_interact(mob/user)
open_remote_ui(user)
return TRUE
-/obj/machinery/dummy_airlock_controller/proc/open_remote_ui(var/mob/user)
+/obj/machinery/dummy_airlock_controller/proc/open_remote_ui(mob/user)
if(master_controller)
appearance = master_controller
return master_controller.ui_interact(user, state = remote_state)
-/obj/machinery/dummy_airlock_controller/powered(var/chan = -1, var/area/check_area = null)
+/obj/machinery/dummy_airlock_controller/powered(chan = -1, area/check_area = null)
if(master_controller)
var/area/A = get_area(master_controller)
return master_controller.powered(chan, A)
diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm
index 2cddb1628a..ef3b9b0db1 100644
--- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm
+++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm
@@ -58,7 +58,7 @@
/datum/embedded_program/docking/airlock
var/datum/embedded_program/airlock/docking/airlock_program
-/datum/embedded_program/docking/airlock/New(var/obj/machinery/embedded_controller/M, var/datum/embedded_program/airlock/docking/A)
+/datum/embedded_program/docking/airlock/New(obj/machinery/embedded_controller/M, datum/embedded_program/airlock/docking/A)
..(M)
airlock_program = A
airlock_program.master_prog = src
@@ -128,7 +128,7 @@
toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open")
toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open")
-/datum/embedded_program/airlock/docking/cycleDoors(var/target)
+/datum/embedded_program/airlock/docking/cycleDoors(target)
if (master_prog.undocked() || master_prog.override_enabled) //only allow the port to be used as an airlock if nothing is docked here or the override is enabled
..(target)
@@ -152,7 +152,7 @@
set src in view(1)
src.program:print_state()
-/obj/machinery/embedded_controller/radio/airlock/docking_port/verb/spoof_signal(var/command as text, var/sender as text)
+/obj/machinery/embedded_controller/radio/airlock/docking_port/verb/spoof_signal(command as text, sender as text)
set category = "Debug"
set src in view(1)
var/datum/signal/signal = new
@@ -162,7 +162,7 @@
src.program:receive_signal(signal)
-/obj/machinery/embedded_controller/radio/airlock/docking_port/verb/debug_init_dock(var/target as text)
+/obj/machinery/embedded_controller/radio/airlock/docking_port/verb/debug_init_dock(target as text)
set category = "Debug"
set src in view(1)
src.program:initiate_docking(target)
diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
index 1321bca2b9..f3142b0de2 100644
--- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
+++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm
@@ -76,7 +76,7 @@
set src in view(1)
src.program:print_state()
-/obj/machinery/embedded_controller/radio/docking_port_multi/verb/spoof_signal(var/command as text, var/sender as text)
+/obj/machinery/embedded_controller/radio/docking_port_multi/verb/spoof_signal(command as text, sender as text)
set category = "Debug"
set src in view(1)
var/datum/signal/signal = new
@@ -86,7 +86,7 @@
src.program:receive_signal(signal)
-/obj/machinery/embedded_controller/radio/docking_port_multi/verb/debug_init_dock(var/target as text)
+/obj/machinery/embedded_controller/radio/docking_port_multi/verb/debug_init_dock(target as text)
set category = "Debug"
set src in view(1)
src.program:initiate_docking(target)
diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm
index 50fa8bade1..3e72b85bcf 100644
--- a/code/game/machinery/embedded_controller/airlock_program.dm
+++ b/code/game/machinery/embedded_controller/airlock_program.dm
@@ -28,7 +28,7 @@
var/tag_pump_out_external
var/tag_pump_out_internal
-/datum/embedded_program/airlock/New(var/obj/machinery/embedded_controller/M)
+/datum/embedded_program/airlock/New(obj/machinery/embedded_controller/M)
..(M)
memory["chamber_sensor_pressure"] = ONE_ATMOSPHERE
@@ -312,13 +312,13 @@
var/int_closed = check_interior_door_secured()
return (ext_closed && int_closed)
-/datum/embedded_program/airlock/proc/signalDoor(var/tag, var/command)
+/datum/embedded_program/airlock/proc/signalDoor(tag, command)
var/datum/signal/signal = new
signal.data["tag"] = tag
signal.data["command"] = command
post_signal(signal, RADIO_AIRLOCK)
-/datum/embedded_program/airlock/proc/signalPump(var/tag, var/power, var/direction, var/pressure)
+/datum/embedded_program/airlock/proc/signalPump(tag, power, direction, pressure)
var/datum/signal/signal = new
signal.data = list(
"tag" = tag,
@@ -330,7 +330,7 @@
post_signal(signal)
//this is called to set the appropriate door state at the end of a cycling process, or for the exterior buttons
-/datum/embedded_program/airlock/proc/cycleDoors(var/target)
+/datum/embedded_program/airlock/proc/cycleDoors(target)
switch(target)
if(TARGET_OUTOPEN)
toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "close")
@@ -346,7 +346,7 @@
signalDoor(tag_exterior_door, command)
signalDoor(tag_interior_door, command)
-/datum/embedded_program/airlock/proc/signal_mech_sensor(var/command, var/sensor)
+/datum/embedded_program/airlock/proc/signal_mech_sensor(command, sensor)
var/datum/signal/signal = new
signal.data["tag"] = sensor
signal.data["command"] = command
@@ -372,7 +372,7 @@ Only sends a command if it is needed, i.e. if the door is
already open, passing an open command to this proc will not
send an additional command to open the door again.
----------------------------------------------------------*/
-/datum/embedded_program/airlock/proc/toggleDoor(var/list/doorStatus, var/doorTag, var/secure, var/command)
+/datum/embedded_program/airlock/proc/toggleDoor(list/doorStatus, doorTag, secure, command)
var/doorCommand = null
if(command == "toggle")
diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm
index c5885e2727..702debbfd9 100644
--- a/code/game/machinery/embedded_controller/docking_program.dm
+++ b/code/game/machinery/embedded_controller/docking_program.dm
@@ -198,7 +198,7 @@
control_mode = MODE_NONE
-/datum/embedded_program/docking/proc/initiate_docking(var/target)
+/datum/embedded_program/docking/proc/initiate_docking(target)
if (dock_state != STATE_UNDOCKED || control_mode == MODE_SERVER) //must be undocked and not serving another request to begin a new docking handshake
return
@@ -274,7 +274,7 @@
/datum/embedded_program/docking/proc/can_launch()
return undocked()
-/datum/embedded_program/docking/proc/send_docking_command(var/recipient, var/command)
+/datum/embedded_program/docking/proc/send_docking_command(recipient, command)
var/datum/signal/signal = new
signal.data["tag"] = id_tag
signal.data["command"] = command
diff --git a/code/game/machinery/embedded_controller/docking_program_multi.dm b/code/game/machinery/embedded_controller/docking_program_multi.dm
index b4f22bc244..f733fc8fae 100644
--- a/code/game/machinery/embedded_controller/docking_program_multi.dm
+++ b/code/game/machinery/embedded_controller/docking_program_multi.dm
@@ -11,7 +11,7 @@
var/list/children_ready
var/list/children_override
-/datum/embedded_program/docking/multi/New(var/obj/machinery/embedded_controller/M)
+/datum/embedded_program/docking/multi/New(obj/machinery/embedded_controller/M)
..(M)
if (istype(M,/obj/machinery/embedded_controller/radio/docking_port_multi)) //if our parent controller is the right type, then we can auto-init stuff at construction
@@ -115,7 +115,7 @@
var/docking_mode = 0 //0 = docking, 1 = undocking
var/response_sent = 0
-/datum/embedded_program/airlock/multi_docking/New(var/obj/machinery/embedded_controller/M)
+/datum/embedded_program/airlock/multi_docking/New(obj/machinery/embedded_controller/M)
..(M)
if (istype(M, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi)) //if our parent controller is the right type, then we can auto-init stuff at construction
@@ -207,11 +207,11 @@
toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open")
toggleDoor(memory["exterior_status"], tag_exterior_door, memory["secure"], "open")
-/datum/embedded_program/airlock/multi_docking/cycleDoors(var/target)
+/datum/embedded_program/airlock/multi_docking/cycleDoors(target)
if (!docking_enabled|| override_enabled) //only allow the port to be used as an airlock if nothing is docked here or the override is enabled
..(target)
-/datum/embedded_program/airlock/multi_docking/proc/send_signal_to_master(var/command)
+/datum/embedded_program/airlock/multi_docking/proc/send_signal_to_master(command)
var/datum/signal/signal = new
signal.data["tag"] = id_tag
signal.data["command"] = command
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 06c4c44285..047404355d 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -103,7 +103,7 @@
else
icon_state = "airlock_control_off"
-/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, var/radio_filter = null)
+/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, radio_filter = null)
signal.transmission_method = TRANSMISSION_RADIO
if(radio_connection)
//use_power(radio_power_use) //neat idea, but causes way too much lag.
diff --git a/code/game/machinery/embedded_controller/embedded_program_base.dm b/code/game/machinery/embedded_controller/embedded_program_base.dm
index 7e49d792df..e4fc60340b 100644
--- a/code/game/machinery/embedded_controller/embedded_program_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_program_base.dm
@@ -5,7 +5,7 @@
var/id_tag
-/datum/embedded_program/New(var/obj/machinery/embedded_controller/M)
+/datum/embedded_program/New(obj/machinery/embedded_controller/M)
master = M
if (istype(M, /obj/machinery/embedded_controller/radio))
var/obj/machinery/embedded_controller/radio/R = M
diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm
index fcb46fe786..8d96391c81 100644
--- a/code/game/machinery/embedded_controller/mapping_helpers.dm
+++ b/code/game/machinery/embedded_controller/mapping_helpers.dm
@@ -43,7 +43,7 @@ Any frequency works, it's self-setting, but it seems like people have decided AU
my_device = null
return ..()
-/obj/effect/map_helper/airlock/proc/get_controller(var/area/A)
+/obj/effect/map_helper/airlock/proc/get_controller(area/A)
if(!A)
return null
diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm
index 1c70ce07cf..c443fb1072 100644
--- a/code/game/machinery/embedded_controller/simple_docking_controller.dm
+++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm
@@ -19,7 +19,7 @@
/datum/embedded_program/docking/simple
var/tag_door
-/datum/embedded_program/docking/simple/New(var/obj/machinery/embedded_controller/M)
+/datum/embedded_program/docking/simple/New(obj/machinery/embedded_controller/M)
..(M)
memory["door_status"] = list(state = "closed", lock = "locked") //assume closed and locked in case the doors dont report in
@@ -59,13 +59,13 @@
else
. = FALSE
-/datum/embedded_program/docking/simple/proc/signal_door(var/command)
+/datum/embedded_program/docking/simple/proc/signal_door(command)
var/datum/signal/signal = new
signal.data["tag"] = tag_door
signal.data["command"] = command
post_signal(signal)
-///datum/embedded_program/docking/simple/proc/signal_mech_sensor(var/command)
+///datum/embedded_program/docking/simple/proc/signal_mech_sensor(command)
// signal_door(command)
// return
@@ -110,7 +110,7 @@
set src in view(1)
src.program:print_state()
-/obj/machinery/embedded_controller/radio/simple_docking_controller/verb/spoof_signal(var/command as text, var/sender as text)
+/obj/machinery/embedded_controller/radio/simple_docking_controller/verb/spoof_signal(command as text, sender as text)
set category = "Debug"
set src in view(1)
var/datum/signal/signal = new
@@ -120,7 +120,7 @@
src.program:receive_signal(signal)
-/obj/machinery/embedded_controller/radio/simple_docking_controller/verb/debug_init_dock(var/target as text)
+/obj/machinery/embedded_controller/radio/simple_docking_controller/verb/debug_init_dock(target as text)
set category = "Debug"
set src in view(1)
src.program:initiate_docking(target)
diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm
index b422b1a206..41fa57aa00 100644
--- a/code/game/machinery/exonet_node.dm
+++ b/code/game/machinery/exonet_node.dm
@@ -203,7 +203,7 @@
// content - The actual message.
// Description: This writes to the logs list, so that people can see what people are doing on the Exonet ingame. Note that this is not an admin logging function.
// Communicators are already logged seperately.
-/obj/machinery/exonet_node/proc/write_log(var/origin_address, var/target_address, var/data_type, var/content)
+/obj/machinery/exonet_node/proc/write_log(origin_address, target_address, data_type, content)
//var/timestamp = time2text(station_time_in_ds, "hh:mm:ss")
var/timestamp = "[stationdate2text()] [stationtime2text()]"
var/msg = "[timestamp] | FROM [origin_address] TO [target_address] | TYPE: [data_type] | CONTENT: [content]"
diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm
index 047831bfec..19f2d14bb2 100644
--- a/code/game/machinery/fire_alarm.dm
+++ b/code/game/machinery/fire_alarm.dm
@@ -226,7 +226,7 @@ FIRE ALARM
if(user)
log_game("[user] reset a fire alarm at [COORD(src)]")
-/obj/machinery/firealarm/proc/alarm(var/duration = 0, mob/user)
+/obj/machinery/firealarm/proc/alarm(duration = 0, mob/user)
if(!(working))
return
var/area/area = get_area(src)
@@ -241,7 +241,7 @@ FIRE ALARM
if(user)
log_game("[user] triggered a fire alarm at [COORD(src)]")
-/obj/machinery/firealarm/proc/set_security_level(var/newlevel)
+/obj/machinery/firealarm/proc/set_security_level(newlevel)
if(seclevel != newlevel)
seclevel = newlevel
update_icon()
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 8c395c375c..1fe45ee2eb 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -44,7 +44,7 @@
// Returns 0 on failure and 1 on success
-/obj/machinery/floodlight/proc/turn_on(var/loud = 0)
+/obj/machinery/floodlight/proc/turn_on(loud = 0)
if(!cell)
return 0
if(cell.charge < (use * CELLRATE))
@@ -59,7 +59,7 @@
visible_message("\The [src] turns on.")
return 1
-/obj/machinery/floodlight/proc/turn_off(var/loud = 0)
+/obj/machinery/floodlight/proc/turn_off(loud = 0)
on = 0
set_light_on(FALSE)
update_icon()
diff --git a/code/game/machinery/floor_light.dm b/code/game/machinery/floor_light.dm
index 725dd19ffb..5c7b6ca9dc 100644
--- a/code/game/machinery/floor_light.dm
+++ b/code/game/machinery/floor_light.dm
@@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(floor_light_cache)
/obj/machinery/floor_light/prebuilt
anchored = TRUE
-/obj/machinery/floor_light/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/floor_light/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_SCREWDRIVER))
anchored = !anchored
visible_message(span_notice("\The [user] has [anchored ? "attached" : "detached"] \the [src]."))
@@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(floor_light_cache)
attack_hand(user)
return
-/obj/machinery/floor_light/attack_hand(var/mob/user)
+/obj/machinery/floor_light/attack_hand(mob/user)
if(user.a_intent == I_HURT && !issmall(user))
if(!isnull(damaged) && !(stat & BROKEN))
diff --git a/code/game/machinery/floorlayer.dm b/code/game/machinery/floorlayer.dm
index 6c7d8b924f..1160f38dfd 100644
--- a/code/game/machinery/floorlayer.dm
+++ b/code/game/machinery/floorlayer.dm
@@ -33,7 +33,7 @@
user.visible_message(span_notice("[user] has [!on?"de":""]activated \the [src]."), span_notice("You [!on?"de":""]activate \the [src]."))
return
-/obj/machinery/floorlayer/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/floorlayer/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
var/m = tgui_input_list(user, "Choose work mode", "Mode", mode)
mode[m] = !mode[m]
@@ -74,7 +74,7 @@
on=0
return
-/obj/machinery/floorlayer/proc/dismantleFloor(var/turf/new_turf)
+/obj/machinery/floorlayer/proc/dismantleFloor(turf/new_turf)
if(istype(new_turf, /turf/simulated/floor))
var/turf/simulated/floor/T = new_turf
if(!T.is_plating())
@@ -92,19 +92,19 @@
for(var/obj/item/stack/tile/tile2 in contents)
tile2.transfer_to(tile1)
-/obj/machinery/floorlayer/proc/layFloor(var/turf/w_turf)
+/obj/machinery/floorlayer/proc/layFloor(turf/w_turf)
if(!T)
if(!TakeNewStack())
return 0
w_turf.attackby(T , src)
return 1
-/obj/machinery/floorlayer/proc/TakeTile(var/obj/item/stack/tile/tile)
+/obj/machinery/floorlayer/proc/TakeTile(obj/item/stack/tile/tile)
if(!T) T = tile
tile.loc = src
SortStacks()
-/obj/machinery/floorlayer/proc/CollectTiles(var/turf/w_turf)
+/obj/machinery/floorlayer/proc/CollectTiles(turf/w_turf)
for(var/obj/item/stack/tile/tile in w_turf)
TakeTile(tile)
diff --git a/code/game/machinery/frame.dm b/code/game/machinery/frame.dm
index 9bd38b971b..d9bffc733f 100644
--- a/code/game/machinery/frame.dm
+++ b/code/game/machinery/frame.dm
@@ -26,7 +26,7 @@ GLOBAL_LIST(construction_frame_floor)
var/y_offset // For wall frames: pixel_y
// Get the icon state to use at a given state. Default implementation is based on the frame's name
-/datum/frame/frame_types/proc/get_icon_state(var/state)
+/datum/frame/frame_types/proc/get_icon_state(state)
var/type = lowertext(name)
type = replacetext(type, " ", "_")
return "[type]_[state]"
@@ -327,7 +327,7 @@ GLOBAL_LIST(construction_frame_floor)
for(var/obj/ct as anything in req_components)
req_component_names[ct] = initial(ct.name)
-/obj/structure/frame/Initialize(mapload, var/dir, var/building = 0, var/datum/frame/frame_types/type, mob/user as mob)
+/obj/structure/frame/Initialize(mapload, dir, building = 0, datum/frame/frame_types/type, mob/user as mob)
. = ..()
if(building)
frame_type = type
@@ -646,7 +646,7 @@ GLOBAL_LIST(construction_frame_floor)
update_icon()
-/obj/structure/frame/proc/install_part(var/mob/user, var/obj/item/P, var/defer_feedback = FALSE)
+/obj/structure/frame/proc/install_part(mob/user, obj/item/P, defer_feedback = FALSE)
var/installed_part = FALSE
for(var/I in req_components)
if(!istype(P, I) || (req_components[I] == 0))
@@ -686,7 +686,7 @@ GLOBAL_LIST(construction_frame_floor)
to_chat(user, span_warning("You cannot add that component to the machine!"))
return FALSE
-/obj/structure/frame/proc/mass_install_parts(var/mob/user, var/obj/item/storage/S)
+/obj/structure/frame/proc/mass_install_parts(mob/user, obj/item/storage/S)
var/installed_part = FALSE
for(var/obj/item/P in S.contents)
installed_part |= install_part(user, P, TRUE)
diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm
index e6b0f4d316..2710017898 100644
--- a/code/game/machinery/gear_dispenser.dm
+++ b/code/game/machinery/gear_dispenser.dm
@@ -17,14 +17,14 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
var/amount = 0
var/list/req_one_access
-/datum/gear_disp/proc/allowed(var/mob/living/carbon/human/user)
+/datum/gear_disp/proc/allowed(mob/living/carbon/human/user)
if(LAZYLEN(req_one_access))
var/accesses = user.GetAccess()
return has_access(null, req_one_access, accesses)
return 1
-/datum/gear_disp/proc/spawn_gear(var/turf/T, var/mob/living/carbon/human/user)
+/datum/gear_disp/proc/spawn_gear(turf/T, mob/living/carbon/human/user)
var/list/spawned = list()
for(var/O in to_spawn)
spawned += new O(T)
@@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
var/ckey_allowed
var/character_allowed
-/datum/gear_disp/custom/allowed(var/mob/living/carbon/human/user)
+/datum/gear_disp/custom/allowed(mob/living/carbon/human/user)
if(ckey_allowed && user.ckey != ckey_allowed)
return 0
@@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
var/life_support = TRUE // try to spawn a tank or suit cooler
var/refit = TRUE // should we adapt this to the user's species
-/datum/gear_disp/voidsuit/spawn_gear(var/turf/T, var/mob/living/carbon/human/user)
+/datum/gear_disp/voidsuit/spawn_gear(turf/T, mob/living/carbon/human/user)
ASSERT(voidsuit_type)
. = ..()
if(voidsuit_type && !ispath(voidsuit_type, /obj/item/clothing/suit/space/void))
@@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
var/ckey_allowed
var/character_allowed
-/datum/gear_disp/voidsuit/custom/allowed(var/mob/living/carbon/human/user)
+/datum/gear_disp/voidsuit/custom/allowed(mob/living/carbon/human/user)
if(ckey_allowed && user.ckey != ckey_allowed)
return 0
@@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
dispenses = real_gear_list
-/obj/machinery/gear_dispenser/attack_hand(var/mob/living/carbon/human/user)
+/obj/machinery/gear_dispenser/attack_hand(mob/living/carbon/human/user)
if(!can_use(user))
return
dispenser_flags |= GD_BUSY
@@ -196,7 +196,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
dispense(one_setting,user)
-/obj/machinery/gear_dispenser/proc/can_use(var/mob/living/carbon/human/user)
+/obj/machinery/gear_dispenser/proc/can_use(mob/living/carbon/human/user)
var/list/used_by = GLOB.gear_distributed_to["[type]"]
if(needs_power && inoperable())
to_chat(user,span_warning("The machine does not respond to your prodding."))
@@ -232,7 +232,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
return 0
-/obj/machinery/gear_dispenser/proc/get_gear_list(var/mob/living/carbon/human/user)
+/obj/machinery/gear_dispenser/proc/get_gear_list(mob/living/carbon/human/user)
if(emagged)
return dispenses
@@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
choices[choice] = G
return choices
-/obj/machinery/gear_dispenser/proc/dispense(var/datum/gear_disp/S,var/mob/living/carbon/human/user,var/greet=TRUE)
+/obj/machinery/gear_dispenser/proc/dispense(datum/gear_disp/S,mob/living/carbon/human/user,greet=TRUE)
if(!S.amount && !(dispenser_flags & GD_UNLIMITED))
to_chat(user,span_warning("There are no more [S.name]s left!"))
dispenser_flags &= ~GD_BUSY
@@ -336,7 +336,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
if(operable())
add_overlay("light2")
-/obj/machinery/gear_dispenser/suit_fancy/attack_hand(var/mob/living/carbon/human/user)
+/obj/machinery/gear_dispenser/suit_fancy/attack_hand(mob/living/carbon/human/user)
if(held_gear_disp)
var/turf/T = get_turf(user)
var/list/spawned = held_gear_disp.spawn_gear(T, user)
@@ -348,7 +348,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
return
return ..()
-/obj/machinery/gear_dispenser/suit_fancy/dispense(var/datum/gear_disp/S,var/mob/living/carbon/human/user,var/greet=TRUE)
+/obj/machinery/gear_dispenser/suit_fancy/dispense(datum/gear_disp/S,mob/living/carbon/human/user,greet=TRUE)
if(!S.amount && !(dispenser_flags & GD_UNLIMITED))
to_chat(user,span_warning("There are no more [S.name]s left!"))
dispenser_flags &= ~GD_BUSY
@@ -747,7 +747,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
to_spawn = list()
amount = 4
-/datum/gear_disp/voidsuit/random/spawn_gear(var/turf/T, var/mob/living/carbon/user)
+/datum/gear_disp/voidsuit/random/spawn_gear(turf/T, mob/living/carbon/user)
// I copied these from the /obj/random/multiple/voidsuit, but added the "suit" and "helmet"
var/list/choice = pick(
prob(5);list(
@@ -848,7 +848,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
name = "Weapon"
amount = 2
-/datum/gear_disp/randomweapons/spawn_gear(var/turf/T, var/mob/living/carbon/user)
+/datum/gear_disp/randomweapons/spawn_gear(turf/T, mob/living/carbon/user)
var/choice = pick(
prob(3);/obj/random/multiple/gun/projectile/handgun,
prob(2);/obj/random/multiple/gun/projectile/smg,
@@ -925,7 +925,7 @@ GLOBAL_LIST_EMPTY(dispenser_presets)
name = "Ranged Weapon"
amount = 1
//from /obj/random/projectile/random
-/datum/gear_disp/adventure_box/weapon/spawn_gear(var/turf/T, var/mob/living/carbon/user)
+/datum/gear_disp/adventure_box/weapon/spawn_gear(turf/T, mob/living/carbon/user)
var/choice = pick(
prob(3);/obj/random/multiple/gun/projectile/handgun,
prob(2);/obj/random/multiple/gun/projectile/smg,
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 6db6569bf3..17710a663b 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -51,7 +51,7 @@ Possible to do for anyone motivated enough:
attack_hand(user)
return
-/obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests.
+/obj/machinery/hologram/holopad/attack_hand(mob/living/carbon/human/user) //Carn: Hologram requests.
if(!istype(user))
return
if(tgui_alert(user,"Would you like to request an AI's presence?","Request AI",list("Yes","No")) == "Yes")
diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm
index 4d725bdd8e..4fcf97cc1e 100644
--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -90,7 +90,7 @@
remote.update_music()
//VOREStation Add End
-/obj/machinery/media/jukebox/proc/set_hacked(var/newhacked)
+/obj/machinery/media/jukebox/proc/set_hacked(newhacked)
if(hacked == newhacked)
return
hacked = newhacked
@@ -249,7 +249,7 @@
/obj/machinery/media/jukebox/attack_ai(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/media/jukebox/attack_hand(var/mob/user as mob)
+/obj/machinery/media/jukebox/attack_hand(mob/user as mob)
interact(user)
/obj/machinery/media/jukebox/allow_pai_interaction(mob/living/silicon/pai/user, proximity_flag)
@@ -286,7 +286,7 @@
return
return ..()
-/obj/machinery/media/jukebox/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/media/jukebox/emag_act(remaining_charges, mob/user)
if(!emagged)
emagged = 1
StopPlaying()
@@ -364,7 +364,7 @@
return
/obj/machinery/media/jukebox/ghost/attack_ai(mob/user as mob)
return
-/obj/machinery/media/jukebox/ghost/attack_hand(var/mob/user as mob)
+/obj/machinery/media/jukebox/ghost/attack_hand(mob/user as mob)
return
/obj/machinery/media/jukebox/ghost/update_use_power(new_use_power)
return
@@ -383,7 +383,7 @@
animate(src, alpha = initial(alpha), time = 10)
// End junk
-/obj/machinery/media/jukebox/ghost/attack_ghost(var/mob/observer/dead/M)
+/obj/machinery/media/jukebox/ghost/attack_ghost(mob/observer/dead/M)
if(!istype(M))
return
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 80512c7ec9..7a10d44fc3 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -192,7 +192,7 @@ Class Procs:
return
return
-/obj/machinery/vv_edit_var(var/var_name, var/new_value)
+/obj/machinery/vv_edit_var(var_name, new_value)
if(var_name == NAMEOF(src, use_power))
update_use_power(new_value)
return TRUE
@@ -207,10 +207,10 @@ Class Procs:
return TRUE
return ..()
-/obj/machinery/proc/operable(var/additional_flags = 0)
+/obj/machinery/proc/operable(additional_flags = 0)
return !inoperable(additional_flags)
-/obj/machinery/proc/inoperable(var/additional_flags = 0)
+/obj/machinery/proc/inoperable(additional_flags = 0)
return (stat & (NOPOWER | BROKEN | additional_flags))
// Duplicate of below because we don't want to fuck around with CanUseTopic in TGUI
@@ -220,7 +220,7 @@ Class Procs:
return STATUS_CLOSE
return ..()
-/obj/machinery/CanUseTopic(var/mob/user)
+/obj/machinery/CanUseTopic(mob/user)
if(!interact_offline && (stat & (NOPOWER | BROKEN)))
return STATUS_CLOSE
return ..()
@@ -268,7 +268,7 @@ Class Procs:
uid = gl_uid
gl_uid++
-/obj/machinery/proc/state(var/msg)
+/obj/machinery/proc/state(msg)
for(var/mob/O in hearers(src, null))
O.show_message("[icon2html(src,O.client)] " + span_notice("[msg]"), 2)
@@ -315,7 +315,7 @@ Class Procs:
RefreshParts()
return C
-/obj/machinery/proc/default_part_replacement(var/mob/user, var/obj/item/storage/part_replacer/R)
+/obj/machinery/proc/default_part_replacement(mob/user, obj/item/storage/part_replacer/R)
var/parts_replaced = FALSE
if(!istype(R))
return 0
@@ -355,7 +355,7 @@ Class Procs:
return
// Default behavior for wrenching down machines. Supports both delay and instant modes.
-/obj/machinery/proc/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 0)
+/obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/W, time = 0)
if(!W.has_tool_quality(TOOL_WRENCH))
return FALSE
if(panel_open)
@@ -406,7 +406,7 @@ Class Procs:
to_chat(user, span_notice("You disconnect the monitor."))
. = dismantle()
-/obj/machinery/proc/alarm_deconstruction_screwdriver(var/mob/user, var/obj/item/S)
+/obj/machinery/proc/alarm_deconstruction_screwdriver(mob/user, obj/item/S)
if(!S.has_tool_quality(TOOL_SCREWDRIVER))
return 0
playsound(src, S.usesound, 50, 1)
@@ -415,7 +415,7 @@ Class Procs:
update_icon()
return 1
-/obj/machinery/proc/alarm_deconstruction_wirecutters(var/mob/user, var/obj/item/W)
+/obj/machinery/proc/alarm_deconstruction_wirecutters(mob/user, obj/item/W)
if(!W.has_tool_quality(TOOL_WIRECUTTER))
return 0
if(!panel_open)
@@ -487,7 +487,7 @@ Class Procs:
** severity: Same severities as ex_act (so lower is more destructive)
** scatter: If you want the parts to slide around 1 turf in random directions
*/
-/obj/machinery/proc/fall_apart(var/severity = 3, var/scatter = TRUE)
+/obj/machinery/proc/fall_apart(severity = 3, scatter = TRUE)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
diff --git a/code/game/machinery/machinery_power.dm b/code/game/machinery/machinery_power.dm
index 4bb7df03b7..e2e5525f8e 100644
--- a/code/game/machinery/machinery_power.dm
+++ b/code/game/machinery/machinery_power.dm
@@ -19,7 +19,7 @@
// returns true if the area has power on given channel (or doesn't require power).
// defaults to power_channel
-/obj/machinery/proc/powered(var/chan = CURRENT_CHANNEL) // defaults to power_channel
+/obj/machinery/proc/powered(chan = CURRENT_CHANNEL) // defaults to power_channel
//Don't do this. It allows machines that set use_power to 0 when off (many machines) to
//be turned on again and used after a power failure because they never gain the NOPOWER flag.
//if(!use_power)
@@ -49,12 +49,12 @@
return POWER_CONSUMPTION
// DEPRECATED! - USE use_power_oneoff() instead!
-/obj/machinery/proc/use_power(var/amount, var/chan = -1) // defaults to power_channel
+/obj/machinery/proc/use_power(amount, chan = -1) // defaults to power_channel
return src.use_power_oneoff(amount, chan);
// This will have this machine have its area eat this much power next tick, and not afterwards. Do not use for continued power draw.
// Returns actual amount drawn (In theory this could be less than the amount asked for. In pratice it won't be FOR NOW)
-/obj/machinery/proc/use_power_oneoff(var/amount, var/chan = CURRENT_CHANNEL)
+/obj/machinery/proc/use_power_oneoff(amount, chan = CURRENT_CHANNEL)
var/area/A = get_area(src) // make sure it's in an area
if(!A)
return
@@ -65,7 +65,7 @@
// Check if we CAN use a given amount of extra power as a one off. Returns amount we could use without actually using it.
// For backwards compatibilty this returns true if the channel is powered. This is consistant with pre-static-power
// behavior of APC powerd machines, but at some point we might want to make this a bit cooler.
-/obj/machinery/proc/can_use_power_oneoff(var/amount, var/chan = CURRENT_CHANNEL)
+/obj/machinery/proc/can_use_power_oneoff(amount, chan = CURRENT_CHANNEL)
if(powered(chan))
return amount // If channel is powered then you can do it.
return 0
@@ -142,7 +142,7 @@
//
// Sets the use_power var and then forces an area power update
-/obj/machinery/proc/update_use_power(var/new_use_power)
+/obj/machinery/proc/update_use_power(new_use_power)
if(use_power == new_use_power)
return
if(!power_init_complete)
@@ -155,7 +155,7 @@
return TRUE
// Sets the power_channel var and then forces an area power update.
-/obj/machinery/proc/update_power_channel(var/new_channel)
+/obj/machinery/proc/update_power_channel(new_channel)
if(power_channel == new_channel)
return
if(!power_init_complete)
@@ -168,7 +168,7 @@
return TRUE
// Sets the idle_power_usage var and then forces an area power update if use_power was USE_POWER_IDLE
-/obj/machinery/proc/update_idle_power_usage(var/new_power_usage)
+/obj/machinery/proc/update_idle_power_usage(new_power_usage)
if(idle_power_usage == new_power_usage)
return
var/old_power = idle_power_usage
@@ -177,7 +177,7 @@
REPORT_POWER_CONSUMPTION_CHANGE(old_power, new_power_usage)
// Sets the active_power_usage var and then forces an area power update if use_power was USE_POWER_ACTIVE
-/obj/machinery/proc/update_active_power_usage(var/new_power_usage)
+/obj/machinery/proc/update_active_power_usage(new_power_usage)
if(active_power_usage == new_power_usage)
return
var/old_power = active_power_usage
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index e7f7f70f92..fa742e68dc 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -39,7 +39,7 @@
magnetic_process()
// update the invisibility and icon
-/obj/machinery/magnetic_module/hide(var/intact)
+/obj/machinery/magnetic_module/hide(intact)
invisibility = intact ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
update_icon()
@@ -64,7 +64,7 @@
Cmd(command, modifier)
-/obj/machinery/magnetic_module/proc/Cmd(var/command, var/modifier)
+/obj/machinery/magnetic_module/proc/Cmd(command, modifier)
if(command)
switch(command)
if("set-electriclevel")
@@ -157,7 +157,7 @@
update_icon()
-/obj/machinery/magnetic_module/proc/magnetic_process(var/called_back) // proc that actually does the pulling
+/obj/machinery/magnetic_module/proc/magnetic_process(called_back) // proc that actually does the pulling
if(called_back)
pulling = 0
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 80eab17574..0dd2c618bf 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -20,7 +20,7 @@
. = ..()
default_apply_parts()
-/obj/machinery/mass_driver/attackby(var/obj/item/I, mob/user)
+/obj/machinery/mass_driver/attackby(obj/item/I, mob/user)
if(default_deconstruction_screwdriver(user, I))
return
if(default_deconstruction_crowbar(user, I))
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 165971bd8f..456e6ee257 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -59,7 +59,7 @@
var/list/datum/feed_channel/network_channels = list()
var/datum/feed_message/wanted_issue
-/datum/feed_network/proc/CreateFeedChannel(var/channel_name, var/author, var/locked, var/adminChannel = 0, var/announcement_message)
+/datum/feed_network/proc/CreateFeedChannel(channel_name, author, locked, adminChannel = 0, announcement_message)
var/datum/feed_channel/newChannel = new /datum/feed_channel
newChannel.channel_name = channel_name
newChannel.author = author
@@ -71,7 +71,7 @@
newChannel.announcement = "Breaking news from [channel_name]!"
network_channels += newChannel
-/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/photo/photo, var/adminMessage = 0, var/message_type = "", var/title)
+/datum/feed_network/proc/SubmitArticle(msg, author, channel_name, obj/item/photo/photo, adminMessage = 0, message_type = "", title)
var/datum/feed_message/newMsg = new /datum/feed_message
newMsg.author = author
newMsg.body = msg
@@ -92,13 +92,13 @@
insert_message_in_channel(FC, newMsg) //Adding message to the network's appropriate feed_channel
break
-/datum/feed_network/proc/insert_message_in_channel(var/datum/feed_channel/FC, var/datum/feed_message/newMsg)
+/datum/feed_network/proc/insert_message_in_channel(datum/feed_channel/FC, datum/feed_message/newMsg)
FC.messages += newMsg
newMsg.parent_channel = FC
FC.update()
alert_readers(FC.announcement)
-/datum/feed_network/proc/alert_readers(var/annoncement)
+/datum/feed_network/proc/alert_readers(annoncement)
for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allCasters)
NEWSCASTER.newsAlert(annoncement)
NEWSCASTER.update_icon()
@@ -630,7 +630,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
var/is_synth = 0
var/obj/item/photo/photo = null
-/datum/news_photo/New(var/obj/item/photo/p, var/synth)
+/datum/news_photo/New(obj/item/photo/p, synth)
is_synth = synth
photo = p
@@ -692,7 +692,7 @@ GLOBAL_LIST_BOILERPLATE(allCasters, /obj/machinery/newscaster)
paper_remaining--
return
-/obj/machinery/newscaster/proc/newsAlert(var/news_call)
+/obj/machinery/newscaster/proc/newsAlert(news_call)
if(!node || !node.on || !node.allow_external_newscasters) //The messages will still be there once the connection returns.
return
var/turf/T = get_turf(src)
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index ac897d488b..85ac9df575 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -7,7 +7,7 @@
log_game("[usr]([usr.key]) used station map L[z] in [src.loc.loc]")
drawmap(usr)
-/obj/machinery/computer/security/proc/drawmap(var/mob/user as mob)
+/obj/machinery/computer/security/proc/drawmap(mob/user as mob)
var/icx = round(world.maxx/16) + 1
var/icy = round(world.maxy/16) + 1
diff --git a/code/game/machinery/oxygen_pump.dm b/code/game/machinery/oxygen_pump.dm
index f32f47ae19..b872d0ac2f 100644
--- a/code/game/machinery/oxygen_pump.dm
+++ b/code/game/machinery/oxygen_pump.dm
@@ -38,7 +38,7 @@
QDEL_NULL(contained)
return ..()
-/obj/machinery/oxygen_pump/MouseDrop(var/mob/living/carbon/human/target, src_location, over_location)
+/obj/machinery/oxygen_pump/MouseDrop(mob/living/carbon/human/target, src_location, over_location)
var/mob/living/user = usr
if(!istype(user) || !istype(target) || user.is_incorporeal())
return ..()
@@ -82,7 +82,7 @@
/obj/machinery/oxygen_pump/attack_ai(mob/user as mob)
tgui_interact(user)
-/obj/machinery/oxygen_pump/proc/attach_mask(var/mob/living/carbon/C)
+/obj/machinery/oxygen_pump/proc/attach_mask(mob/living/carbon/C)
if(C && istype(C))
contained.forceMove(get_turf(C))
C.equip_to_slot(contained, slot_wear_mask)
@@ -96,7 +96,7 @@
breather.internals.icon_state = "internal1"
update_use_power(USE_POWER_ACTIVE)
-/obj/machinery/oxygen_pump/proc/can_apply_to_target(var/mob/living/carbon/human/target, mob/user as mob)
+/obj/machinery/oxygen_pump/proc/can_apply_to_target(mob/living/carbon/human/target, mob/user as mob)
if(!user)
user = target
// Check target validity
@@ -151,7 +151,7 @@
if(istype(W, /obj/item/tank) && !stat)
to_chat(user, span_warning("Please open the maintenance hatch first."))
-/obj/machinery/oxygen_pump/examine(var/mob/user)
+/obj/machinery/oxygen_pump/examine(mob/user)
. = ..()
if(tank)
. += "The meter shows [round(tank.air_contents.return_pressure())] kPa."
@@ -245,7 +245,7 @@
mask_type = /obj/item/clothing/mask/breath/anesthetic
// CHOMPStation Add: Cozy Music
-/obj/machinery/oxygen_pump/anesthetic/attach_mask(var/mob/living/carbon/C)
+/obj/machinery/oxygen_pump/anesthetic/attach_mask(mob/living/carbon/C)
if(C && istype(C))
contained.forceMove(get_turf(C))
C.equip_to_slot(contained, slot_wear_mask)
@@ -298,7 +298,7 @@
mask_type = /obj/item/clothing/mask/breath/anesthetic
// CHOMPStation Add: Cozy Music
-/obj/machinery/oxygen_pump/mobile/anesthetic/attach_mask(var/mob/living/carbon/C)
+/obj/machinery/oxygen_pump/mobile/anesthetic/attach_mask(mob/living/carbon/C)
if(C && istype(C))
contained.forceMove(get_turf(C))
C.equip_to_slot(contained, slot_wear_mask)
diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm
index c9c6b3c83a..777b81f49a 100644
--- a/code/game/machinery/painter_vr.dm
+++ b/code/game/machinery/painter_vr.dm
@@ -105,7 +105,7 @@
. = ..()
drop_item(user)
-/obj/machinery/gear_painter/proc/drop_item(var/mob/user)
+/obj/machinery/gear_painter/proc/drop_item(mob/user)
if(!oview(1,src))
return
if(!inserted)
diff --git a/code/game/machinery/partslathe_vr.dm b/code/game/machinery/partslathe_vr.dm
index 6354397a99..02c46614e8 100644
--- a/code/game/machinery/partslathe_vr.dm
+++ b/code/game/machinery/partslathe_vr.dm
@@ -78,7 +78,7 @@
flick("partslathe-lidopen", src)
icon_state = "partslathe-idle"
-/obj/machinery/partslathe/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/partslathe/attackby(obj/item/O, mob/user)
if(busy)
to_chat(user, span_notice("\The [src] is busy. Please wait for completion of previous operation."))
return 1
@@ -110,7 +110,7 @@
return
// Attept to load materials. Returns 0 if item wasn't a stack of materials, otherwise 1 (even if failed to load)
-/obj/machinery/partslathe/proc/try_load_materials(var/mob/user, var/obj/item/stack/material/S)
+/obj/machinery/partslathe/proc/try_load_materials(mob/user, obj/item/stack/material/S)
if(!istype(S))
return 0
if(!(S.material.name in materials))
@@ -159,22 +159,22 @@
update_icon()
playsound(src, 'sound/machines/chime.ogg', 50, 0)
-/obj/machinery/partslathe/proc/addToQueue(var/datum/category_item/partslathe/D)
+/obj/machinery/partslathe/proc/addToQueue(datum/category_item/partslathe/D)
queue += D
return
-/obj/machinery/partslathe/proc/removeFromQueue(var/index)
+/obj/machinery/partslathe/proc/removeFromQueue(index)
if(queue.len >= index)
queue.Cut(index, index + 1)
return
-/obj/machinery/partslathe/proc/canBuild(var/datum/category_item/partslathe/D)
+/obj/machinery/partslathe/proc/canBuild(datum/category_item/partslathe/D)
for(var/M in D.resources)
if(materials[M] < CEILING((D.resources[M] * mat_efficiency), 1))
return 0
return 1
-/obj/machinery/partslathe/proc/getLackingMaterials(var/datum/category_item/partslathe/D)
+/obj/machinery/partslathe/proc/getLackingMaterials(datum/category_item/partslathe/D)
var/ret = ""
for(var/M in D.resources)
if(materials[M] < CEILING((D.resources[M] * mat_efficiency), 1))
@@ -183,7 +183,7 @@
ret += "[CEILING((D.resources[M] * mat_efficiency), 1) - materials[M]] [M]"
return ret
-/obj/machinery/partslathe/proc/build(var/datum/category_item/partslathe/D)
+/obj/machinery/partslathe/proc/build(datum/category_item/partslathe/D)
for(var/M in D.resources)
materials[M] = max(0, materials[M] - CEILING((D.resources[M] * mat_efficiency), 1))
var/obj/item/new_item = D.build(loc);
@@ -195,7 +195,7 @@
new_item.matter[i] = CEILING((new_item.matter[i] * mat_efficiency), 1)
// 0 amount = 0 means ejecting a full stack; -1 means eject everything
-/obj/machinery/partslathe/proc/eject_materials(var/material, var/amount)
+/obj/machinery/partslathe/proc/eject_materials(material, amount)
var/recursive = amount == -1 ? TRUE : FALSE
material = lowertext(material)
var/mattype
@@ -372,5 +372,5 @@
/datum/category_item/partslathe/dd_SortValue()
return name
-/datum/category_item/partslathe/proc/build(var/loc)
+/datum/category_item/partslathe/proc/build(loc)
return new path(loc)
diff --git a/code/game/machinery/pda_multicaster.dm b/code/game/machinery/pda_multicaster.dm
index a84def7f3a..52a92ad090 100644
--- a/code/game/machinery/pda_multicaster.dm
+++ b/code/game/machinery/pda_multicaster.dm
@@ -78,7 +78,7 @@
message_admins(msg)
log_game(msg)
-/obj/machinery/pda_multicaster/proc/update_PDAs(var/turn_off)
+/obj/machinery/pda_multicaster/proc/update_PDAs(turn_off)
for(var/obj/item/pda/pda in contents)
var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger/multicast)
if(M)
diff --git a/code/game/machinery/petrification.dm b/code/game/machinery/petrification.dm
index b057ac18e5..e461f6bc36 100644
--- a/code/game/machinery/petrification.dm
+++ b/code/game/machinery/petrification.dm
@@ -50,7 +50,7 @@
targets[option] = H
return targets
-/obj/machinery/petrification/proc/is_valid_target(var/mob/living/carbon/human/H)
+/obj/machinery/petrification/proc/is_valid_target(mob/living/carbon/human/H)
if (QDELETED(H) || !istype(H) || !H.client)
return FALSE
var/turf/T = H.loc
@@ -64,13 +64,13 @@
return FALSE
return TRUE
-/obj/machinery/petrification/proc/popup_msg(var/mob/user, var/message, var/notice = TRUE)
+/obj/machinery/petrification/proc/popup_msg(mob/user, message, notice = TRUE)
if (notice)
message = "A notice pops up on the interface: \"[message]\""
if (target)
to_chat(user, span_notice("[message]"))
-/obj/machinery/petrification/proc/petrify(var/mob/user, var/obj/item/petrifier/petrifier = null)
+/obj/machinery/petrification/proc/petrify(mob/user, obj/item/petrifier/petrifier = null)
. = FALSE
var/mat = material
var/idt = identifier
@@ -139,7 +139,7 @@
SStgui.update_uis(src)
return TRUE
-/obj/machinery/petrification/attack_hand(var/mob/user as mob)
+/obj/machinery/petrification/attack_hand(mob/user as mob)
if(..())
return
tgui_interact(user)
@@ -164,7 +164,7 @@
data["can_remote"] = is_valid_target(target) && istext(material) && istext(identifier) && istext(adjective) && istext(tint)
return data
-/obj/machinery/petrification/proc/set_input(var/option, mob/user)
+/obj/machinery/petrification/proc/set_input(option, mob/user)
var/list/only_these = list("tint","material","identifier","adjective","able_to_unpetrify","discard_clothes","target")
if (!(option in only_these))
return
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index cd26f4799b..c9a873d811 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -38,7 +38,7 @@ Buildable meters
* @param loc Location
* @pipe_type
*/
-/obj/item/pipe/Initialize(mapload, var/_pipe_type, var/_dir, var/obj/machinery/atmospherics/make_from)
+/obj/item/pipe/Initialize(mapload, _pipe_type, _dir, obj/machinery/atmospherics/make_from)
if(make_from)
make_from_existing(make_from)
else
@@ -163,12 +163,12 @@ Buildable meters
else
return ..()
-/obj/item/pipe/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/pipe/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
return wrench_act(user, W)
return ..()
-/obj/item/pipe/proc/wrench_act(var/mob/living/user, var/obj/item/tool/wrench/W)
+/obj/item/pipe/proc/wrench_act(mob/living/user, obj/item/tool/wrench/W)
if(!isturf(loc))
return TRUE
@@ -252,12 +252,12 @@ Buildable meters
w_class = ITEMSIZE_LARGE
var/piping_layer = PIPING_LAYER_DEFAULT
-/obj/item/pipe_meter/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/pipe_meter/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_WRENCH))
return wrench_act(user, W)
return ..()
-/obj/item/pipe_meter/proc/wrench_act(var/mob/living/user, var/obj/item/tool/wrench/W)
+/obj/item/pipe_meter/proc/wrench_act(mob/living/user, obj/item/tool/wrench/W)
var/obj/machinery/atmospherics/pipe/pipe
for(var/obj/machinery/atmospherics/pipe/P in loc)
if(P.piping_layer == piping_layer)
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 5794fd4f6b..f17578b8c9 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -19,7 +19,7 @@
var/disposals = FALSE
// TODO - Its about time to make this NanoUI don't we think?
-/obj/machinery/pipedispenser/attack_hand(var/mob/user as mob)
+/obj/machinery/pipedispenser/attack_hand(mob/user as mob)
if((. = ..()))
return
tgui_interact(user)
@@ -109,7 +109,7 @@
VARSET_IN(src, wait, FALSE, 15)
-/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/pipedispenser/attackby(obj/item/W as obj, mob/user as mob)
src.add_fingerprint(user)
if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter))
to_chat(user, span_notice("You put [W] back in [src]."))
@@ -155,7 +155,7 @@
disposals = TRUE
//Allow you to drag-drop disposal pipes into it
-/obj/machinery/pipedispenser/disposal/MouseDrop_T(var/obj/structure/disposalconstruct/pipe as obj, mob/user as mob)
+/obj/machinery/pipedispenser/disposal/MouseDrop_T(obj/structure/disposalconstruct/pipe as obj, mob/user as mob)
if(!user.canmove || user.stat || user.restrained())
return
diff --git a/code/game/machinery/pipe/pipe_recipes.dm b/code/game/machinery/pipe/pipe_recipes.dm
index 701e89ceb8..559eb9aefa 100644
--- a/code/game/machinery/pipe/pipe_recipes.dm
+++ b/code/game/machinery/pipe/pipe_recipes.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list(
var/obj/item/pipe/construction_type // The type PATH to the type of pipe fitting object the recipe makes.
var/paintable = FALSE // If TRUE, allow the RPD to paint this pipe. // VOREStation Add
-/datum/pipe_recipe/pipe/New(var/label, var/obj/machinery/atmospherics/path)
+/datum/pipe_recipe/pipe/New(label, obj/machinery/atmospherics/path)
name = label
pipe_type = path
construction_type = initial(path.construction_type)
@@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list(
/datum/pipe_recipe/disposal
var/subtype // subtype is one of the DISPOSAL_SORT_ constants.
-/datum/pipe_recipe/disposal/New(var/label, var/ptype, var/state, dt=PIPE_DIRECTIONAL, var/sort=0)
+/datum/pipe_recipe/disposal/New(label, ptype, state, dt=PIPE_DIRECTIONAL, sort=0)
name = label
icon_state = state
pipe_type = ptype
diff --git a/code/game/machinery/pipe/pipelayer.dm b/code/game/machinery/pipe/pipelayer.dm
index 8d54b64eaf..7cedc488fa 100644
--- a/code/game/machinery/pipe/pipelayer.dm
+++ b/code/game/machinery/pipe/pipelayer.dm
@@ -74,7 +74,7 @@
user.visible_message(span_notice("[user] has [!on?"de":""]activated \the [src]."), span_notice("You [!on?"de":""]activate \the [src]."))
return
-/obj/machinery/pipelayer/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/pipelayer/attackby(obj/item/W as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, W))
return
if(default_deconstruction_crowbar(user, W))
@@ -122,7 +122,7 @@
on = 0
return
-/obj/machinery/pipelayer/proc/load_metal(var/obj/item/stack/MM)
+/obj/machinery/pipelayer/proc/load_metal(obj/item/stack/MM)
if(istype(MM) && MM.get_amount())
var/cur_amount = metal
var/to_load = max(max_metal - round(cur_amount),0)
@@ -151,14 +151,14 @@
amount_ejected += S.get_amount()
return amount_ejected
-/obj/machinery/pipelayer/proc/dismantleFloor(var/turf/new_turf)
+/obj/machinery/pipelayer/proc/dismantleFloor(turf/new_turf)
if(istype(new_turf, /turf/simulated/floor))
var/turf/simulated/floor/T = new_turf
if(!T.is_plating())
T.make_plating(!(T.broken || T.burnt))
return new_turf.is_plating()
-/obj/machinery/pipelayer/proc/layPipe(var/turf/w_turf,var/M_Dir,var/old_dir)
+/obj/machinery/pipelayer/proc/layPipe(turf/w_turf,M_Dir,old_dir)
if(!on || !(M_Dir in list(NORTH, SOUTH, EAST, WEST)) || M_Dir==old_dir)
return reset()
if(!use_metal(pipe_cost))
diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm
index 05636db6a4..9d6de13ee6 100644
--- a/code/game/machinery/pointdefense.dm
+++ b/code/game/machinery/pointdefense.dm
@@ -92,7 +92,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
data["turrets"] = turrets
return data
-/obj/machinery/pointdefense_control/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/pointdefense_control/attackby(obj/item/W, mob/user)
if(W?.has_tool_quality(TOOL_MULTITOOL))
var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "[src]", id_tag, MAX_NAME_LEN)
if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state))
@@ -170,7 +170,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels))
return PDC
-/obj/machinery/pointdefense/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/pointdefense/attackby(obj/item/W, mob/user)
if(W?.has_tool_quality(TOOL_MULTITOOL))
var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "[src]", id_tag, MAX_NAME_LEN)
if(new_ident && new_ident != id_tag && user.Adjacent(src))
@@ -192,7 +192,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
return FALSE
return TRUE
-/obj/machinery/pointdefense/proc/Shoot(var/datum/weakref/target)
+/obj/machinery/pointdefense/proc/Shoot(datum/weakref/target)
var/obj/effect/meteor/M = target.resolve()
if(!istype(M))
engaging = null
@@ -206,7 +206,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
set_dir(ATAN2(transform.b, transform.a) > 0 ? NORTH : SOUTH)
-/obj/machinery/pointdefense/proc/finish_shot(var/datum/weakref/target)
+/obj/machinery/pointdefense/proc/finish_shot(datum/weakref/target)
var/obj/machinery/pointdefense_control/PC = get_controller()
engaging = null
@@ -273,7 +273,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
Shoot(target)
return
-/obj/machinery/pointdefense/proc/targeting_check(var/obj/effect/meteor/M)
+/obj/machinery/pointdefense/proc/targeting_check(obj/effect/meteor/M)
// Target in range
var/list/connected_z_levels = GetConnectedZlevels(get_z(src))
if(!(M.z in connected_z_levels))
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 2516488dd5..4f191c98b8 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -265,7 +265,7 @@
/obj/machinery/porta_turret/lasertag/omni
turret_type = "industrial"
-/obj/machinery/porta_turret/lasertag/assess_living(var/mob/living/L)
+/obj/machinery/porta_turret/lasertag/assess_living(mob/living/L)
if(emagged) // FUCK YOU, PERISH
return L.stat ? TURRET_NOT_TARGET : TURRET_PRIORITY_TARGET //we won't be uber evil though. If you're KO'd, let's let you get back up.
@@ -366,7 +366,7 @@
weapon_setup(installation)
-/obj/machinery/porta_turret/proc/weapon_setup(var/guntype)
+/obj/machinery/porta_turret/proc/weapon_setup(guntype)
switch(guntype)
if(/obj/item/gun/energy/gun/burst)
lethal_icon_color = "red"
@@ -603,7 +603,7 @@
visible_message(span_infoplain(span_bold("\The [L]") + " bonks \the [src]'s casing!"))
return ..()
-/obj/machinery/porta_turret/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/porta_turret/emag_act(remaining_charges, mob/user)
if(!emagged)
//Emagging the turret makes it go bonkers and stun everyone. It also makes
//the turret shoot much, much faster.
@@ -616,7 +616,7 @@
VARSET_IN(src, enabled, TRUE, 6 SECONDS) // Turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
return 1
-/obj/machinery/porta_turret/take_damage(var/force)
+/obj/machinery/porta_turret/take_damage(force)
if(!raised && !raising)
force = force / 8
if(force < 5)
@@ -716,7 +716,7 @@
slow_process(shot_targets)
-/obj/machinery/porta_turret/proc/slow_process(var/shot_targets)
+/obj/machinery/porta_turret/proc/slow_process(shot_targets)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
@@ -732,7 +732,7 @@
use_power(20000)
health = min(health+1, maxhealth) // 1HP for 20kJ
-/obj/machinery/porta_turret/proc/set_processing_speed(var/fast)
+/obj/machinery/porta_turret/proc/set_processing_speed(fast)
if(fast == speed_process)
return
speed_process = fast
@@ -754,7 +754,7 @@
if(TURRET_SECONDARY_TARGET)
secondarytargets += L
-/obj/machinery/porta_turret/proc/assess_living(var/mob/living/L)
+/obj/machinery/porta_turret/proc/assess_living(mob/living/L)
if(!istype(L))
return TURRET_NOT_TARGET
@@ -802,7 +802,7 @@
return TURRET_PRIORITY_TARGET //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee
-/obj/machinery/porta_turret/proc/assess_mecha(var/obj/mecha/M)
+/obj/machinery/porta_turret/proc/assess_mecha(obj/mecha/M)
if(!istype(M))
return TURRET_NOT_TARGET
@@ -811,7 +811,7 @@
return assess_living(M.occupant)
-/obj/machinery/porta_turret/proc/assess_perp(var/mob/living/carbon/human/H)
+/obj/machinery/porta_turret/proc/assess_perp(mob/living/carbon/human/H)
if(!H || !istype(H))
return 0
@@ -820,7 +820,7 @@
return H.assess_perp(src, check_access, check_weapons, check_records, check_arrest)
-/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets)
+/obj/machinery/porta_turret/proc/tryToShootAt(list/mob/living/targets)
if(targets.len && last_target && (last_target in targets) && target(last_target))
return TRUE
@@ -892,12 +892,12 @@
set_raised_raising(0, 0)
update_icon()
-/obj/machinery/porta_turret/proc/set_raised_raising(var/incoming_raised, var/incoming_raising)
+/obj/machinery/porta_turret/proc/set_raised_raising(incoming_raised, incoming_raising)
raised = incoming_raised
raising = incoming_raising
density = raised || raising
-/obj/machinery/porta_turret/proc/target(var/mob/living/target)
+/obj/machinery/porta_turret/proc/target(mob/living/target)
if(disabled)
return FALSE
if(target)
@@ -916,7 +916,7 @@
return TRUE
return FALSE
-/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target)
+/obj/machinery/porta_turret/proc/shootAt(mob/living/target)
//any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power!
var/current_delay = shot_delay
if(emagged || attacked) //prevents rapid-fire shooting, unless it's been emagged
@@ -985,7 +985,7 @@
var/check_all
var/ailock
-/obj/machinery/porta_turret/proc/setState(var/datum/turret_checks/TC)
+/obj/machinery/porta_turret/proc/setState(datum/turret_checks/TC)
if(controllock)
return
enabled = TC.enabled
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 858f4c3c5e..2edfe6a6e3 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -156,7 +156,7 @@
go_out()
return
-/obj/machinery/recharge_station/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/recharge_station/attackby(obj/item/O as obj, mob/user as mob)
if(!occupant)
if(default_deconstruction_screwdriver(user, O))
return
@@ -173,7 +173,7 @@
..()
-/obj/machinery/recharge_station/MouseDrop_T(var/mob/target, var/mob/user)
+/obj/machinery/recharge_station/MouseDrop_T(mob/target, mob/user)
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user))
return
@@ -237,10 +237,10 @@
if(icon_update_tick == 0)
build_overlays()
-/obj/machinery/recharge_station/Bumped(var/mob/living/L)
+/obj/machinery/recharge_station/Bumped(mob/living/L)
go_in(L)
-/obj/machinery/recharge_station/proc/go_in(var/mob/living/L)
+/obj/machinery/recharge_station/proc/go_in(mob/living/L)
if(occupant)
return
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index b3f9e65016..ebe3230888 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -230,7 +230,7 @@ GLOBAL_LIST_EMPTY_TYPED(allConsoles, /obj/machinery/requests_console)
. = TRUE
//err... hacking code, which has no reason for existing... but anyway... it was once supposed to unlock priority 3 messaging on that console (EXTREME priority...), but the code for that was removed.
-/obj/machinery/requests_console/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/requests_console/attackby(obj/item/O as obj, mob/user as mob)
if(computer_deconstruction_screwdriver(user, O))
return
if(istype(O, /obj/item/multitool))
@@ -275,7 +275,7 @@ GLOBAL_LIST_EMPTY_TYPED(allConsoles, /obj/machinery/requests_console)
SStgui.update_uis(src)
return
-/obj/machinery/requests_console/proc/reset_message(var/mainmenu = 0)
+/obj/machinery/requests_console/proc/reset_message(mainmenu = 0)
message = ""
recipient = ""
priority = 0
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index b3a916acb9..c98f204dd7 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -16,7 +16,7 @@
..()
*/
-/obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/seed_extractor/attackby(obj/item/O as obj, mob/user as mob)
// Fruits and vegetables.
if(istype(O, /obj/item/reagent_containers/food/snacks/grown) || istype(O, /obj/item/grown))
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 83c97b2c34..debfea2dd3 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -41,7 +41,7 @@
update_icon()
AddElement(/datum/element/climbable)
-/obj/machinery/space_heater/RefreshParts(var/limited = 0)
+/obj/machinery/space_heater/RefreshParts(limited = 0)
min_temperature = DEFAULT_MIN_TEMP
max_temperature = DEFAULT_MAX_TEMP
heating_power = DEFAULT_HEATING_POWER
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index a77dd209b7..02679855ee 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -169,7 +169,7 @@
message2 = ""
index2 = 0
-/obj/machinery/status_display/proc/display_alert(var/newlevel)
+/obj/machinery/status_display/proc/display_alert(newlevel)
remove_display()
if(seclevel != newlevel)
seclevel = newlevel
diff --git a/code/game/machinery/status_display_ai.dm b/code/game/machinery/status_display_ai.dm
index 586287f287..eb4449e43f 100644
--- a/code/game/machinery/status_display_ai.dm
+++ b/code/game/machinery/status_display_ai.dm
@@ -2,7 +2,7 @@
var/overlay
var/ckey
-/datum/ai_emotion/New(var/over, var/key)
+/datum/ai_emotion/New(over, key)
overlay = over
ckey = key
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(ai_status_emotions, list(
"Tribunal Malfunctioning" = new /datum/ai_emotion("ai_tribunal_malf", "serithi")
))
-/proc/get_ai_emotions(var/ckey)
+/proc/get_ai_emotions(ckey)
var/list/emotions = list()
for(var/emotion_name in GLOB.ai_status_emotions)
var/datum/ai_emotion/emotion = GLOB.ai_status_emotions[emotion_name]
@@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(ai_status_emotions, list(
set_picture("ai_bsod")
return
-/obj/machinery/ai_status_display/proc/set_picture(var/state)
+/obj/machinery/ai_status_display/proc/set_picture(state)
picture_state = state
cut_overlays()
add_overlay(picture_state)
diff --git a/code/game/machinery/suit_storage/suit_cycler.dm b/code/game/machinery/suit_storage/suit_cycler.dm
index 041244f9c2..c5cf775e0a 100644
--- a/code/game/machinery/suit_storage/suit_cycler.dm
+++ b/code/game/machinery/suit_storage/suit_cycler.dm
@@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY(suit_cycler_typecache)
..()
-/obj/machinery/suit_cycler/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/suit_cycler/emag_act(remaining_charges, mob/user)
if(emagged)
to_chat(user, span_danger("The cycler has already been subverted."))
return
diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm
index e4d9b42939..344bc895e0 100644
--- a/code/game/machinery/supplybeacon.dm
+++ b/code/game/machinery/supplybeacon.dm
@@ -47,7 +47,7 @@
name = "supermatter supply beacon"
drop_type = "supermatter"
-/obj/machinery/power/supply_beacon/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/power/supply_beacon/attackby(obj/item/W, mob/user)
if(!use_power && W.has_tool_quality(TOOL_WRENCH))
if(!anchored && !connect_to_network())
to_chat(user, span_warning("This device must be placed over an exposed cable."))
@@ -58,7 +58,7 @@
return
return ..()
-/obj/machinery/power/supply_beacon/attack_hand(var/mob/user)
+/obj/machinery/power/supply_beacon/attack_hand(mob/user)
if(expended)
update_use_power(USE_POWER_OFF)
@@ -71,11 +71,11 @@
to_chat(user, span_warning("You need to secure the beacon with a wrench first!"))
return
-/obj/machinery/power/supply_beacon/attack_ai(var/mob/user)
+/obj/machinery/power/supply_beacon/attack_ai(mob/user)
if(user.Adjacent(src))
attack_hand(user)
-/obj/machinery/power/supply_beacon/proc/activate(var/mob/user)
+/obj/machinery/power/supply_beacon/proc/activate(mob/user)
if(expended)
return
if(surplus() < 500)
@@ -86,7 +86,7 @@
update_use_power(USE_POWER_IDLE)
if(user) to_chat(user, span_notice("You activate the beacon. The supply drop will be dispatched soon."))
-/obj/machinery/power/supply_beacon/proc/deactivate(var/mob/user, var/permanent)
+/obj/machinery/power/supply_beacon/proc/deactivate(mob/user, permanent)
if(permanent)
expended = 1
icon_state = "beacon_depleted"
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 915c437bc7..c391962c9d 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -16,7 +16,7 @@
var/selfdestructing = 0
var/charges = 1
-/obj/machinery/syndicate_beacon/attack_hand(var/mob/user as mob)
+/obj/machinery/syndicate_beacon/attack_hand(mob/user as mob)
user.set_machine(src)
var/dat = span_darkgreen(span_italics("Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...
Identity confirmed,
"))
if(ishuman(user) || isAI(user))
@@ -115,7 +115,7 @@
/obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob)
return
-/obj/machinery/power/singularity_beacon/attack_hand(var/mob/user as mob)
+/obj/machinery/power/singularity_beacon/attack_hand(mob/user as mob)
if(anchored)
return active ? Deactivate(user) : Activate(user)
else
diff --git a/code/game/machinery/syndicatebeacon_vr.dm b/code/game/machinery/syndicatebeacon_vr.dm
index 99901cae6f..975e331741 100644
--- a/code/game/machinery/syndicatebeacon_vr.dm
+++ b/code/game/machinery/syndicatebeacon_vr.dm
@@ -1,6 +1,6 @@
// Virgo modified syndie beacon, does not give objectives
-/obj/machinery/syndicate_beacon/virgo/attack_hand(var/mob/user)
+/obj/machinery/syndicate_beacon/virgo/attack_hand(mob/user)
user.set_machine(src)
var/dat = span_darkgreen(span_italics("Scanning [pick("retina pattern", "voice print", "fingerprints", "dna sequence")]...
Identity confirmed,
"))
if(ishuman(user) || isAI(user))
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index 764a8d35a7..f786e2af63 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -30,7 +30,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
//Linked bluespace radios
var/list/linked_radios_weakrefs = list()
-/obj/machinery/telecomms/broadcaster/proc/link_radio(var/obj/item/radio/R)
+/obj/machinery/telecomms/broadcaster/proc/link_radio(obj/item/radio/R)
if(!istype(R))
return
linked_radios_weakrefs |= WEAKREF(R)
@@ -146,7 +146,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
var/list/linked_radios_weakrefs = list()
-/obj/machinery/telecomms/allinone/proc/link_radio(var/obj/item/radio/R)
+/obj/machinery/telecomms/allinone/proc/link_radio(obj/item/radio/R)
if(!istype(R))
return
linked_radios_weakrefs |= WEAKREF(R)
@@ -556,7 +556,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
return 1
-/proc/Broadcast_SimpleMessage(var/source, var/frequency, list/message_pieces, var/data, var/mob/M, var/compression, var/level, var/list/forced_radios)
+/proc/Broadcast_SimpleMessage(source, frequency, list/message_pieces, data, mob/M, compression, level, list/forced_radios)
var/text = multilingual_to_message(message_pieces)
/* ###### Prepare the radio connection ###### */
@@ -740,7 +740,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages
var/pos_z = get_z(src)
return ((pos_z in signal.data["level"]) && signal.data["done"])
-/atom/proc/telecomms_process(var/do_sleep = 1)
+/atom/proc/telecomms_process(do_sleep = 1)
// First, we want to generate a new radio signal
var/datum/signal/signal = new
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index 50fa71c34f..bc1ad84a74 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -144,12 +144,12 @@
temp = null
. = TRUE
-/obj/machinery/computer/telecomms/server/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/telecomms/server/emag_act(remaining_charges, mob/user)
if(!emagged)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
to_chat(user, span_notice("You you disable the security protocols"))
return 1
-/obj/machinery/computer/telecomms/server/proc/set_temp(var/text, var/color = "average")
+/obj/machinery/computer/telecomms/server/proc/set_temp(text, color = "average")
temp = list("color" = color, "text" = text)
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index eca6ec4e31..3268622566 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -36,7 +36,7 @@
if(default_deconstruction_crowbar(user, P))
return
-/obj/machinery/telecomms/attack_ai(var/mob/user as mob)
+/obj/machinery/telecomms/attack_ai(mob/user as mob)
attack_hand(user)
/obj/machinery/telecomms/tgui_data(mob/user)
@@ -98,7 +98,7 @@
return STATUS_CLOSE
. = ..()
-/obj/machinery/telecomms/attack_hand(var/mob/user as mob)
+/obj/machinery/telecomms/attack_hand(mob/user as mob)
tgui_interact(user)
/obj/machinery/telecomms/tgui_interact(mob/user, datum/tgui/ui)
@@ -373,12 +373,12 @@
add_fingerprint(ui.user)
-/obj/machinery/telecomms/proc/canAccess(var/mob/user)
+/obj/machinery/telecomms/proc/canAccess(mob/user)
if(issilicon(user) || in_range(user, src))
return 1
return 0
-/obj/machinery/telecomms/proc/set_temp(var/text, var/color = "average")
+/obj/machinery/telecomms/proc/set_temp(text, color = "average")
temp = list("color" = color, "text" = text)
#undef TELECOMM_Z
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 1f74802811..8078ecbb1f 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -163,7 +163,7 @@
. = ..()
// Used in auto linking
-/obj/machinery/telecomms/proc/add_link(var/obj/machinery/telecomms/T)
+/obj/machinery/telecomms/proc/add_link(obj/machinery/telecomms/T)
var/pos_z = get_z(src)
var/tpos_z = get_z(T)
if((pos_z == tpos_z) || (src.long_range_link && T.long_range_link))
@@ -298,7 +298,7 @@
var/list/linked_radios_weakrefs = list()
-/obj/machinery/telecomms/receiver/proc/link_radio(var/obj/item/radio/R)
+/obj/machinery/telecomms/receiver/proc/link_radio(obj/item/radio/R)
if(!istype(R))
return
linked_radios_weakrefs |= WEAKREF(R)
@@ -658,7 +658,7 @@
relay_information(signal, /obj/machinery/telecomms/broadcaster)
-/obj/machinery/telecomms/server/proc/setcode(var/t)
+/obj/machinery/telecomms/server/proc/setcode(t)
if(t)
if(istext(t))
rawcode = t
@@ -677,7 +677,7 @@
logs--
break
-/obj/machinery/telecomms/server/proc/add_entry(var/content, var/input)
+/obj/machinery/telecomms/server/proc/add_entry(content, input)
var/datum/comm_log_entry/log = new
var/identifier = num2text( rand(-1000,1000) + world.time )
log.name = "[input] ([md5(identifier)])"
@@ -699,7 +699,7 @@
var/input_type = "Speech File"
//Generic telecomm connectivity test proc
-/proc/can_telecomm(var/atom/A, var/atom/B, var/ad_hoc = FALSE)
+/proc/can_telecomm(atom/A, atom/B, ad_hoc = FALSE)
if(!A || !B)
log_mapping("can_telecomm(): Undefined endpoints!")
return FALSE
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 5554178ec3..366591b8cc 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -116,12 +116,12 @@
. = TRUE
-/obj/machinery/computer/telecomms/monitor/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/telecomms/monitor/emag_act(remaining_charges, mob/user)
if(!emagged)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
to_chat(user, span_notice("You you disable the security protocols"))
return 1
-/obj/machinery/computer/telecomms/monitor/proc/set_temp(var/text, var/color = "average")
+/obj/machinery/computer/telecomms/monitor/proc/set_temp(text, color = "average")
temp = list("color" = color, "text" = text)
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index de4fde2ac5..a4661df97c 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -206,7 +206,7 @@
updateUsrDialog(usr)
return
-/obj/machinery/computer/telecomms/traffic/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/telecomms/traffic/emag_act(remaining_charges, mob/user)
if(!emagged)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
diff --git a/code/game/machinery/telecrystal_storage_ch.dm b/code/game/machinery/telecrystal_storage_ch.dm
index e7de2eb233..ec396c116b 100644
--- a/code/game/machinery/telecrystal_storage_ch.dm
+++ b/code/game/machinery/telecrystal_storage_ch.dm
@@ -14,7 +14,7 @@
/obj/machinery/smartfridge/tcrystal/accept_check(obj/item/O)
return istype(O,/obj/item/stack/telecrystal)
-/obj/machinery/smartfridge/tcrystal/proc/mod_amount(var/datum/stored_item/I,var/mod)
+/obj/machinery/smartfridge/tcrystal/proc/mod_amount(datum/stored_item/I,mod)
if(I.amount + mod <= 0)
item_records.Remove(I)
qdel(I)
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 908d527088..4a5b96b36c 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -14,7 +14,7 @@
// On us
new /obj/machinery/conveyor(loc, WEST, 1)
-/obj/machinery/transformer/Bumped(var/atom/movable/AM)
+/obj/machinery/transformer/Bumped(atom/movable/AM)
// HasEntered didn't like people lying down.
if(ishuman(AM))
// Only humans can enter from the west side, while lying down.
@@ -24,7 +24,7 @@
AM.loc = src.loc
transform(AM)
-/obj/machinery/transformer/proc/transform(var/mob/living/carbon/human/H)
+/obj/machinery/transformer/proc/transform(mob/living/carbon/human/H)
if(stat & (BROKEN|NOPOWER))
return
if(!transform_dead && H.stat == DEAD)
diff --git a/code/game/machinery/transportpod.dm b/code/game/machinery/transportpod.dm
index c502fb7019..a9b5b7d3dc 100644
--- a/code/game/machinery/transportpod.dm
+++ b/code/game/machinery/transportpod.dm
@@ -47,10 +47,10 @@
else
icon_state = "borg_pod_opened"
-/obj/machinery/transportpod/Bumped(var/mob/living/O)
+/obj/machinery/transportpod/Bumped(mob/living/O)
go_in(O)
-/obj/machinery/transportpod/proc/go_in(var/mob/living/carbon/human/O)
+/obj/machinery/transportpod/proc/go_in(mob/living/carbon/human/O)
if(occupant)
return
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 14d77a4185..25da6efe9e 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -106,7 +106,7 @@
return
return ..()
-/obj/machinery/turretid/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/turretid/emag_act(remaining_charges, mob/user)
if(!emagged)
to_chat(user, span_danger("You short out the turret controls' access analysis module."))
emagged = TRUE
diff --git a/code/game/machinery/virtual_reality/ar_console.dm b/code/game/machinery/virtual_reality/ar_console.dm
index 300655f20c..34d4b340d2 100644
--- a/code/game/machinery/virtual_reality/ar_console.dm
+++ b/code/game/machinery/virtual_reality/ar_console.dm
@@ -33,7 +33,7 @@
visible_message(span_warning("\The [src] sounds an alarm, swinging its hatch open."))
perform_exit()
-/obj/machinery/vr_sleeper/alien/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/vr_sleeper/alien/attackby(obj/item/I, mob/user)
add_fingerprint(user)
if(occupant && (istype(I, /obj/item/healthanalyzer) || istype(I, /obj/item/robotanalyzer)))
diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm
index 9bd95ed932..702b6261bc 100644
--- a/code/game/machinery/virtual_reality/vr_console.dm
+++ b/code/game/machinery/virtual_reality/vr_console.dm
@@ -86,7 +86,7 @@
return 1
-/obj/machinery/vr_sleeper/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/vr_sleeper/attackby(obj/item/I, mob/user)
add_fingerprint(user)
if(occupant && (istype(I, /obj/item/healthanalyzer) || istype(I, /obj/item/robotanalyzer)))
@@ -103,14 +103,14 @@
return
-/obj/machinery/vr_sleeper/MouseDrop_T(var/mob/target, var/mob/user)
+/obj/machinery/vr_sleeper/MouseDrop_T(mob/target, mob/user)
if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user)|| !isliving(target))
return
go_in(target, user)
-/obj/machinery/vr_sleeper/relaymove(var/mob/user)
+/obj/machinery/vr_sleeper/relaymove(mob/user)
..()
if(user.incapacitated())
return
@@ -163,7 +163,7 @@
return 0 //maybe they should be able to get out with cuffs, but whatever
perform_exit()
-/obj/machinery/vr_sleeper/proc/go_in(var/mob/M, var/mob/user)
+/obj/machinery/vr_sleeper/proc/go_in(mob/M, mob/user)
if(!M)
return
if(stat & (BROKEN|NOPOWER))
diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index 6d9e257674..9fe870c099 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -11,7 +11,7 @@
var/chargesa = 1
var/insistinga = 0
-/obj/machinery/wish_granter/attack_hand(var/mob/living/carbon/human/user as mob)
+/obj/machinery/wish_granter/attack_hand(mob/living/carbon/human/user as mob)
if(chargesa <= 0)
to_chat(user, span_infoplain("The Wish Granter lies silent."))
return
diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm
index ad0e3322b0..ea8dda5780 100644
--- a/code/game/magic/archived_book.dm
+++ b/code/game/magic/archived_book.dm
@@ -82,7 +82,7 @@ GLOBAL_DATUM_INIT(book_mgr, /datum/book_manager, new)
//VOREStation Edit End
// delete a book
-/datum/book_manager/proc/remove(var/id)
+/datum/book_manager/proc/remove(id)
fdel(path(id))
/datum/archived_book
@@ -97,7 +97,7 @@ GLOBAL_DATUM_INIT(book_mgr, /datum/book_manager, new)
var/list/icon/photos // in-game photos used
// loads the book corresponding by the specified id
-/datum/archived_book/New(var/path)
+/datum/archived_book/New(path)
if(isnull(path))
return
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 9cd53b65d0..9f21b5c520 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -119,7 +119,7 @@
melee_can_hit = 1
return
-/obj/mecha/combat/moved_inside(var/mob/living/carbon/human/H as mob)
+/obj/mecha/combat/moved_inside(mob/living/carbon/human/H as mob)
if(..())
if(H.client)
H.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi")
@@ -127,7 +127,7 @@
else
return 0
-/obj/mecha/combat/mmi_moved_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob)
+/obj/mecha/combat/mmi_moved_inside(obj/item/mmi/mmi_as_oc as obj,mob/user as mob)
if(..())
if(occupant.client)
occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi")
diff --git a/code/game/mecha/combat/fighter.dm b/code/game/mecha/combat/fighter.dm
index bf952e9f74..c4adb43233 100644
--- a/code/game/mecha/combat/fighter.dm
+++ b/code/game/mecha/combat/fighter.dm
@@ -56,7 +56,7 @@
ion_trail.set_up(src)
ion_trail.stop()
-/obj/mecha/combat/fighter/moved_inside(var/mob/living/carbon/human/H)
+/obj/mecha/combat/fighter/moved_inside(mob/living/carbon/human/H)
. = ..()
consider_gravity()
@@ -173,7 +173,7 @@
else
return TRUE
-/obj/mecha/combat/fighter/proc/consider_gravity(var/moved = FALSE)
+/obj/mecha/combat/fighter/proc/consider_gravity(moved = FALSE)
var/gravity = get_gravity()
if (gravity && !landing_gear_raised)
playsound(src, 'sound/effects/roll.ogg', 50, 1)
@@ -227,7 +227,7 @@
return 0
-/obj/mecha/combat/fighter/play_entered_noise(var/mob/who)
+/obj/mecha/combat/fighter/play_entered_noise(mob/who)
if(hasInternalDamage())
who << sound('sound/mecha/fighter/fighter_entered_bad.ogg',volume=60)
else
diff --git a/code/game/mecha/combat/gorilla.dm b/code/game/mecha/combat/gorilla.dm
index be153a220f..ba04b21eb1 100644
--- a/code/game/mecha/combat/gorilla.dm
+++ b/code/game/mecha/combat/gorilla.dm
@@ -147,7 +147,7 @@
icon_state = "shell"
damage = 1000 // In order to 1-hit any other mech and royally fuck anyone unfortunate enough to get in the way.
-/obj/item/projectile/bullet/cannon/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/cannon/on_hit(atom/target, blocked = 0)
explosion(target, 0, 0, 2, 4)
return 1
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index c9cd2ba105..0475653941 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -74,7 +74,7 @@
/obj/item/mecha_parts/mecha_equipment/teleporter
)
-/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/cell/C=null)
+/obj/mecha/combat/gygax/dark/add_cell(obj/item/cell/C=null)
if(C)
C.forceMove(src)
cell = C
@@ -116,7 +116,7 @@
. = ..()
hud = new /obj/item/clothing/glasses/hud/health/mech(src)
-/obj/mecha/combat/gygax/serenity/moved_inside(var/mob/living/carbon/human/H as mob)
+/obj/mecha/combat/gygax/serenity/moved_inside(mob/living/carbon/human/H as mob)
if(..())
if(H.glasses)
occupant_message(span_red("[H.glasses] prevent you from using [src] [hud]!"))
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 554aae1184..ddd9e74042 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -49,7 +49,7 @@
return
/* Leaving this until we are really sure we don't need it for reference.
-/obj/mecha/combat/phazon/Bump(var/atom/obstacle)
+/obj/mecha/combat/phazon/Bump(atom/obstacle)
if(phasing && get_charge()>=phasing_energy_drain)
spawn()
if(can_phase)
@@ -127,7 +127,7 @@
return
-/obj/mecha/combat/phazon/janus/dynbulletdamage(var/obj/item/projectile/Proj)
+/obj/mecha/combat/phazon/janus/dynbulletdamage(obj/item/projectile/Proj)
if((Proj.damage && !Proj.nodamage) && !istype(Proj, /obj/item/projectile/beam) && prob(max(1, 33 - round(Proj.damage / 4))))
src.occupant_message(span_alien("The armor absorbs the incoming projectile's force, negating it!"))
src.visible_message(span_alien("The [src.name] absorbs the incoming projectile's force, negating it!"))
diff --git a/code/game/mecha/components/_component.dm b/code/game/mecha/components/_component.dm
index 80700369c3..1a32860fe6 100644
--- a/code/game/mecha/components/_component.dm
+++ b/code/game/mecha/components/_component.dm
@@ -65,11 +65,11 @@
take_damage((4 - severity) * round(integrity * 0.1, 0.1))
-/obj/item/mecha_parts/component/proc/adjust_integrity(var/amt = 0)
+/obj/item/mecha_parts/component/proc/adjust_integrity(amt = 0)
integrity = clamp(integrity + amt, 0, max_integrity)
return
-/obj/item/mecha_parts/component/proc/damage_part(var/dam_amt = 0, var/type = BRUTE)
+/obj/item/mecha_parts/component/proc/damage_part(dam_amt = 0, type = BRUTE)
if(dam_amt <= 0)
return FALSE
@@ -93,7 +93,7 @@
// Attach/Detach code.
-/obj/item/mecha_parts/component/proc/attach(var/obj/mecha/target, var/mob/living/user)
+/obj/item/mecha_parts/component/proc/attach(obj/mecha/target, mob/living/user)
if(target)
if(!(component_type in target.internal_components))
if(user)
diff --git a/code/game/mecha/components/armor.dm b/code/game/mecha/components/armor.dm
index 35fc8d4876..c0bb46edda 100644
--- a/code/game/mecha/components/armor.dm
+++ b/code/game/mecha/components/armor.dm
@@ -111,7 +111,7 @@
"bomb"=0.8
)
-/obj/item/mecha_parts/component/armor/military/attach(var/obj/mecha/target, var/mob/living/user)
+/obj/item/mecha_parts/component/armor/military/attach(obj/mecha/target, mob/living/user)
. = ..()
if(.)
var/typepass = FALSE
@@ -148,7 +148,7 @@
"bomb"=1
)
-/obj/item/mecha_parts/component/armor/marshal/attach(var/obj/mecha/target, var/mob/living/user)
+/obj/item/mecha_parts/component/armor/marshal/attach(obj/mecha/target, mob/living/user)
. = ..()
if(.)
var/typepass = FALSE
@@ -199,7 +199,7 @@
"bomb"=0.7
)
-/obj/item/mecha_parts/component/armor/military/marauder/attach(var/obj/mecha/target, var/mob/living/user)
+/obj/item/mecha_parts/component/armor/military/marauder/attach(obj/mecha/target, mob/living/user)
. = ..()
if(.)
var/typepass = FALSE
@@ -229,7 +229,7 @@
"bomb"=0.7
)
-/obj/item/mecha_parts/component/armor/alien/attach(var/obj/mecha/target, var/mob/living/user)
+/obj/item/mecha_parts/component/armor/alien/attach(obj/mecha/target, mob/living/user)
. = ..()
if(.)
if(istype(target, /obj/mecha/combat/phazon/janus))
diff --git a/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm b/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm
index 17c4d5dc47..2b9ec5d7ca 100644
--- a/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm
+++ b/code/game/mecha/equipment/mecha_equipment_dynamicprocs.dm
@@ -3,15 +3,15 @@
*/
// Used for impacting (thrown) objects, and damage value.
-/obj/item/mecha_parts/mecha_equipment/proc/handle_ranged_contact(var/obj/A, var/inc_damage = 0)
+/obj/item/mecha_parts/mecha_equipment/proc/handle_ranged_contact(obj/A, inc_damage = 0)
return max(0, inc_damage)
// Used for melee strikes with an object, and a mob, and damage value.
-/obj/item/mecha_parts/mecha_equipment/proc/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = 0)
+/obj/item/mecha_parts/mecha_equipment/proc/handle_melee_contact(obj/item/W, mob/living/user, inc_damage = 0)
return max(0, inc_damage)
// Used for projectile impacts from bullet_act.
-/obj/item/mecha_parts/mecha_equipment/proc/handle_projectile_contact(var/obj/item/projectile/Proj, var/inc_damage = 0)
+/obj/item/mecha_parts/mecha_equipment/proc/handle_projectile_contact(obj/item/projectile/Proj, inc_damage = 0)
return max(0, inc_damage)
// Used for on-movement actions.
diff --git a/code/game/mecha/equipment/tools/armor_melee.dm b/code/game/mecha/equipment/tools/armor_melee.dm
index 8c7a46ffdb..c2a43767a0 100644
--- a/code/game/mecha/equipment/tools/armor_melee.dm
+++ b/code/game/mecha/equipment/tools/armor_melee.dm
@@ -16,7 +16,7 @@
if(!chassis) return
return (equip_ready ? span_green("*") : span_red("*")) + " [src.name]"
-/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = null)
+/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/handle_melee_contact(obj/item/W, mob/living/user, inc_damage = null)
if(!action_checks(user))
return inc_damage
chassis.log_message("Attacked by [W]. Attacker - [user]", LOG_GAME)
diff --git a/code/game/mecha/equipment/tools/armor_ranged.dm b/code/game/mecha/equipment/tools/armor_ranged.dm
index bfe8262f6a..16a83bbcb7 100644
--- a/code/game/mecha/equipment/tools/armor_ranged.dm
+++ b/code/game/mecha/equipment/tools/armor_ranged.dm
@@ -12,7 +12,7 @@
equip_type = EQUIP_HULL
-/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/handle_projectile_contact(var/obj/item/projectile/Proj, var/inc_damage)
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/handle_projectile_contact(obj/item/projectile/Proj, inc_damage)
if(istype(Proj, /obj/item/projectile/test))
return inc_damage// Don't care about test projectiles, just what comes after them
if(!action_checks(src))
@@ -30,7 +30,7 @@
do_after_cooldown()
return max(0, inc_damage)
-/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/handle_ranged_contact(var/obj/A, var/inc_damage = 0)
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/handle_ranged_contact(obj/A, inc_damage = 0)
if(!action_checks(A))
return inc_damage
if(prob(chassis.deflect_chance*deflect_coeff))
@@ -69,7 +69,7 @@
..()
return
-/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/dynbulletdamage(var/obj/item/projectile/Proj)
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/dynbulletdamage(obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/test))
return // Don't care about test projectiles, just what comes after them
if(!action_checks(src))
diff --git a/code/game/mecha/equipment/tools/cable_layer.dm b/code/game/mecha/equipment/tools/cable_layer.dm
index 0b1ad624c3..dd6e25f491 100644
--- a/code/game/mecha/equipment/tools/cable_layer.dm
+++ b/code/game/mecha/equipment/tools/cable_layer.dm
@@ -14,7 +14,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/MoveAction()
layCable()
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(var/obj/item/stack/cable_coil/target)
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/action(obj/item/stack/cable_coil/target)
if(!action_checks(target))
return
var/result = load_cable(target)
@@ -53,7 +53,7 @@
return "[output] \[Cable: [cable ? cable.get_amount() : 0] m\][(cable && cable.get_amount()) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]"
return
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(var/obj/item/stack/cable_coil/CC)
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/load_cable(obj/item/stack/cable_coil/CC)
if(istype(CC) && CC.get_amount())
var/cur_amount = cable? cable.get_amount() : 0
var/to_load = max(max_cable - cur_amount,0)
@@ -85,7 +85,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/reset()
last_piece = null
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(var/turf/new_turf)
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/dismantleFloor(turf/new_turf)
new_turf = get_turf(chassis)
if(istype(new_turf, /turf/simulated/floor))
var/turf/simulated/floor/T = new_turf
@@ -93,7 +93,7 @@
T.make_plating(!(T.broken || T.burnt))
return new_turf.is_plating()
-/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(var/turf/new_turf)
+/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/proc/layCable(turf/new_turf)
new_turf = get_turf(chassis)
if(equip_ready || !istype(new_turf, /turf/simulated/floor) || !dismantleFloor(new_turf))
return reset()
diff --git a/code/game/mecha/equipment/tools/energy_relay.dm b/code/game/mecha/equipment/tools/energy_relay.dm
index 6287116990..d98d77b5c2 100644
--- a/code/game/mecha/equipment/tools/energy_relay.dm
+++ b/code/game/mecha/equipment/tools/energy_relay.dm
@@ -67,7 +67,7 @@
return chassis.dyngetcharge()
return charge
-/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(var/area/A)
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(area/A)
var/pow_chan
if(A)
for(var/c in use_channels)
diff --git a/code/game/mecha/equipment/tools/generator.dm b/code/game/mecha/equipment/tools/generator.dm
index 92a03511de..2b31464579 100644
--- a/code/game/mecha/equipment/tools/generator.dm
+++ b/code/game/mecha/equipment/tools/generator.dm
@@ -84,7 +84,7 @@
occupant_message(message)
return
-/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/stack/material/P)
+/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/material/P)
if(P.type == fuel_type && P.get_amount())
var/to_load = max(max_fuel - fuel_amount,0)
if(to_load >= 2000)
diff --git a/code/game/mecha/equipment/tools/orescanner.dm b/code/game/mecha/equipment/tools/orescanner.dm
index 320e789d93..51a4dab1b5 100644
--- a/code/game/mecha/equipment/tools/orescanner.dm
+++ b/code/game/mecha/equipment/tools/orescanner.dm
@@ -20,7 +20,7 @@
QDEL_NULL(my_scanner)
return ..()
-/obj/item/mecha_parts/mecha_equipment/tool/orescanner/action(var/atom/target)
+/obj/item/mecha_parts/mecha_equipment/tool/orescanner/action(atom/target)
if(!action_checks(target) || get_dist(chassis, target) > 5)
return FALSE
diff --git a/code/game/mecha/equipment/tools/passenger.dm b/code/game/mecha/equipment/tools/passenger.dm
index 0b44c194bc..8d44549d38 100644
--- a/code/game/mecha/equipment/tools/passenger.dm
+++ b/code/game/mecha/equipment/tools/passenger.dm
@@ -20,7 +20,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/passenger/Exit(atom/movable/O)
return 0
-/obj/item/mecha_parts/mecha_equipment/tool/passenger/proc/move_inside(var/mob/user)
+/obj/item/mecha_parts/mecha_equipment/tool/passenger/proc/move_inside(mob/user)
if (chassis)
chassis.visible_message(span_notice("[user] starts to climb into [chassis]."))
@@ -35,7 +35,7 @@
else
to_chat(user, span_info("You stop entering the exosuit."))
-/obj/item/mecha_parts/mecha_equipment/tool/passenger/container_resist(var/mob/living)
+/obj/item/mecha_parts/mecha_equipment/tool/passenger/container_resist(mob/living)
if(occupant == living)
eject()
diff --git a/code/game/mecha/equipment/tools/powertool.dm b/code/game/mecha/equipment/tools/powertool.dm
index 1f09615630..0e39932610 100644
--- a/code/game/mecha/equipment/tools/powertool.dm
+++ b/code/game/mecha/equipment/tools/powertool.dm
@@ -23,7 +23,7 @@
QDEL_NULL(my_tool)
return ..()
-/obj/item/mecha_parts/mecha_equipment/tool/powertool/action(var/atom/target)
+/obj/item/mecha_parts/mecha_equipment/tool/powertool/action(atom/target)
if(!action_checks(target))
return FALSE
diff --git a/code/game/mecha/equipment/tools/sleeper.dm b/code/game/mecha/equipment/tools/sleeper.dm
index 0496f51baf..184a1034a0 100644
--- a/code/game/mecha/equipment/tools/sleeper.dm
+++ b/code/game/mecha/equipment/tools/sleeper.dm
@@ -21,7 +21,7 @@
/obj/item/mecha_parts/mecha_equipment/tool/sleeper/Exit(atom/movable/O)
return 0
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper/action(var/mob/living/carbon/human/target)
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper/action(mob/living/carbon/human/target)
if(!action_checks(target))
return
if(!istype(target))
@@ -180,7 +180,7 @@
return output
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper/proc/inject_reagent(var/datum/reagent/R,var/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/SG)
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper/proc/inject_reagent(datum/reagent/R,obj/item/mecha_parts/mecha_equipment/tool/syringe_gun/SG)
if(!R || !occupant || !SG || !(SG in chassis.equipment))
return 0
var/to_inject = min(R.volume, inject_amount)
@@ -203,7 +203,7 @@
return 1
return
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper/container_resist(var/mob/living)
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper/container_resist(mob/living)
if(occupant == living)
eject()
diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm
index 0ea66d617d..d13c142de7 100644
--- a/code/game/mecha/equipment/tools/syringe_gun.dm
+++ b/code/game/mecha/equipment/tools/syringe_gun.dm
@@ -380,7 +380,7 @@
else
shut_down()
-/obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/valid_target(var/mob/living/L)
+/obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/valid_target(mob/living/L)
. = TRUE
if(!L || !istype(L))
@@ -426,10 +426,10 @@
if(MyBeam)
QDEL_NULL(MyBeam)
-/obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/unique_patient_checks(var/mob/living/L) // Anything special for subtypes. Does it only work on Robots? Fleshies? A species?
+/obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/unique_patient_checks(mob/living/L) // Anything special for subtypes. Does it only work on Robots? Fleshies? A species?
. = TRUE
-/obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/heal_target(var/mob/living/L) // We've done all our special checks, just get to fixing damage.
+/obj/item/mecha_parts/mecha_equipment/crisis_drone/proc/heal_target(mob/living/L) // We've done all our special checks, just get to fixing damage.
chassis.use_power(energy_drain)
if(istype(L))
L.adjustBruteLoss(brute_heal * -1)
diff --git a/code/game/mecha/equipment/tools/weldinglaser.dm b/code/game/mecha/equipment/tools/weldinglaser.dm
index 32853d4e46..15ad343de6 100644
--- a/code/game/mecha/equipment/tools/weldinglaser.dm
+++ b/code/game/mecha/equipment/tools/weldinglaser.dm
@@ -11,7 +11,7 @@
tooltype = /obj/item/weldingtool/electric/mounted/exosuit
-/obj/item/mecha_parts/mecha_equipment/tool/powertool/welding/action(var/atom/target)
+/obj/item/mecha_parts/mecha_equipment/tool/powertool/welding/action(atom/target)
..()
var/datum/beam/weld_beam = null
diff --git a/code/game/mecha/equipment/weapons/defense/shocker.dm b/code/game/mecha/equipment/weapons/defense/shocker.dm
index 63721ec86f..483befeba3 100644
--- a/code/game/mecha/equipment/weapons/defense/shocker.dm
+++ b/code/game/mecha/equipment/weapons/defense/shocker.dm
@@ -28,7 +28,7 @@
return
*/
-/obj/item/mecha_parts/mecha_equipment/shocker/handle_melee_contact(var/obj/item/W, var/mob/living/user, var/inc_damage = null)
+/obj/item/mecha_parts/mecha_equipment/shocker/handle_melee_contact(obj/item/W, mob/living/user, inc_damage = null)
if(!action_checks(user) || !active)
return
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 1c15466e7c..11c66adc9f 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -22,7 +22,7 @@
. = ..()
default_apply_parts()
-/obj/machinery/mech_recharger/Crossed(var/atom/movable/M)
+/obj/machinery/mech_recharger/Crossed(atom/movable/M)
. = ..()
if(charging == M)
return
@@ -31,7 +31,7 @@
start_charging(M)
return
-/obj/machinery/mech_recharger/Uncrossed(var/atom/movable/M)
+/obj/machinery/mech_recharger/Uncrossed(atom/movable/M)
. = ..()
if(M == charging)
charging = null
@@ -82,7 +82,7 @@
if(done)
charging = null
-/obj/machinery/mech_recharger/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/mech_recharger/attackby(obj/item/I, mob/user)
if(default_deconstruction_screwdriver(user, I))
return
if(default_deconstruction_crowbar(user, I))
@@ -90,7 +90,7 @@
if(default_part_replacement(user, I))
return
-/obj/machinery/mech_recharger/proc/start_charging(var/atom/movable/M)
+/obj/machinery/mech_recharger/proc/start_charging(atom/movable/M)
var/obj/mecha/mech = M
if(stat & (NOPOWER | BROKEN))
diff --git a/code/game/mecha/mech_sensor.dm b/code/game/mecha/mech_sensor.dm
index 088d102cae..24c2e83103 100644
--- a/code/game/mecha/mech_sensor.dm
+++ b/code/game/mecha/mech_sensor.dm
@@ -63,7 +63,7 @@
if(old_stat != stat)
update_icon()
-/obj/machinery/mech_sensor/update_icon(var/safety = 0)
+/obj/machinery/mech_sensor/update_icon(safety = 0)
if (enabled())
icon_state = "airlock_sensor_standby"
else
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index ea77a5f1cf..b8bf882cb2 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -237,7 +237,7 @@
loc.Entered(src)
GLOB.mechas_list += src //global mech list
-/obj/mecha/drain_power(var/drain_check)
+/obj/mecha/drain_power(drain_check)
if(drain_check)
return 1
@@ -457,7 +457,7 @@
internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
return internal_tank
-/obj/mecha/proc/add_cell(var/obj/item/cell/C=null)
+/obj/mecha/proc/add_cell(obj/item/cell/C=null)
if(C)
C.forceMove(src)
cell = C
@@ -487,7 +487,7 @@
return 1
return 0
-/obj/mecha/proc/enter_after(delay as num, var/mob/user as mob, var/numticks = 5)
+/obj/mecha/proc/enter_after(delay as num, mob/user as mob, numticks = 5)
var/delayfraction = delay/numticks
var/turf/T = user.loc
@@ -555,7 +555,7 @@
if(M == occupant && radio.broadcasting)
radio.talk_into(M, message_pieces)
-/obj/mecha/proc/check_occupant_radial(var/mob/user)
+/obj/mecha/proc/check_occupant_radial(mob/user)
if(!user)
return FALSE
if(user.stat)
@@ -567,7 +567,7 @@
return TRUE
-/obj/mecha/proc/show_radial_occupant(var/mob/user)
+/obj/mecha/proc/show_radial_occupant(mob/user)
var/list/choices = list(
"Toggle Airtank" = radial_image_airtoggle,
"Toggle Light" = radial_image_lighttoggle,
@@ -669,7 +669,7 @@
return 1
return 0
-/obj/mecha/contents_tgui_distance(var/src_object, var/mob/living/user)
+/obj/mecha/contents_tgui_distance(src_object, mob/living/user)
. = user.shared_living_tgui_distance(src_object) //allow them to interact with anything they can interact with normally.
if(. != STATUS_INTERACTIVE)
//Allow interaction with the mecha or anything that is part of the mecha
@@ -918,7 +918,7 @@
handle_equipment_movement()
return result
-/obj/mecha/Bump(var/atom/obstacle)
+/obj/mecha/Bump(atom/obstacle)
// src.inertia_dir = null
if(istype(obstacle, /mob))//First we check if it is a mob. Mechs mostly shouln't go through them, even while phasing.
var/mob/M = obstacle
@@ -961,7 +961,7 @@
///////////////////////////////////
//ATM, the ignore_threshold is literally only used for the pulse rifles beams used mostly by deathsquads.
-/obj/mecha/proc/check_for_internal_damage(var/list/possible_int_damage,var/ignore_threshold=null)
+/obj/mecha/proc/check_for_internal_damage(list/possible_int_damage,ignore_threshold=null)
if(!islist(possible_int_damage) || isemptylist(possible_int_damage)) return
if(prob(30))
if(ignore_threshold || src.health*100/initial(src.health) < src.internal_damage_threshold)
@@ -1021,7 +1021,7 @@
log_append_to_last("Took [damage] points of damage. Damage type: \"[type]\".",1)
return
-/obj/mecha/proc/components_handle_damage(var/damage, var/type = BRUTE)
+/obj/mecha/proc/components_handle_damage(damage, type = BRUTE)
var/obj/item/mecha_parts/component/armor/AC = internal_components[MECH_ARMOR]
if(AC)
@@ -1057,7 +1057,7 @@
/obj/mecha/proc/dynabsorbdamage(damage,damage_type)
return damage*(listgetindex(get_damage_absorption(),damage_type) || 1)
-/obj/mecha/airlock_crush(var/crush_damage)
+/obj/mecha/airlock_crush(crush_damage)
..()
take_damage(crush_damage)
if(prob(50)) //Try to avoid that.
@@ -1189,7 +1189,7 @@
return
-/obj/mecha/bullet_act(var/obj/item/projectile/Proj) //wrapper
+/obj/mecha/bullet_act(obj/item/projectile/Proj) //wrapper
if(istype(Proj, /obj/item/projectile/test))
var/obj/item/projectile/test/Test = Proj
Test.hit |= occupant // Register a hit on the occupant, for things like turrets, or in simple-mob cases stopping friendly fire in firing line mode.
@@ -1200,7 +1200,7 @@
..()
return
-/obj/mecha/proc/dynbulletdamage(var/obj/item/projectile/Proj)
+/obj/mecha/proc/dynbulletdamage(obj/item/projectile/Proj)
var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR]
var/temp_deflect_chance = deflect_chance
@@ -1637,7 +1637,7 @@
/*
-/obj/mecha/attack_ai(var/mob/living/silicon/ai/user as mob)
+/obj/mecha/attack_ai(mob/living/silicon/ai/user as mob)
if(!isAI(user))
return
var/output = {"Assume direct control over [src]?
@@ -1651,7 +1651,7 @@
//////// Brain Stuff ////////
///////////////////////////////
-/obj/mecha/proc/mmi_move_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob)
+/obj/mecha/proc/mmi_move_inside(obj/item/mmi/mmi_as_oc as obj,mob/user as mob)
if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client)
to_chat(user, "Consciousness matrix not detected.")
return 0
@@ -1678,7 +1678,7 @@
to_chat(user, "You stop attempting to install the brain.")
return 0
-/obj/mecha/proc/mmi_moved_inside(var/obj/item/mmi/mmi_as_oc as obj,mob/user as mob)
+/obj/mecha/proc/mmi_moved_inside(obj/item/mmi/mmi_as_oc as obj,mob/user as mob)
if(mmi_as_oc && (user in range(1)))
if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client)
to_chat(user, "Consciousness matrix not detected.")
@@ -1926,7 +1926,7 @@
//returns an equipment object if we have one of that type, useful since is_type_in_list won't return the object
//since is_type_in_list uses caching, this is a slower operation, so only use it if needed
-/obj/mecha/proc/get_equipment(var/equip_type)
+/obj/mecha/proc/get_equipment(equip_type)
for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment)
if(istype(ME,equip_type))
return ME
@@ -1990,7 +1990,7 @@
to_chat(user, "You stop entering the exosuit.")
return
-/obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H)
+/obj/mecha/proc/moved_inside(mob/living/carbon/human/H)
if(H && H.client && (H in range(1)))
H.stop_pulling()
H.forceMove(src)
@@ -2034,7 +2034,7 @@
else
return 0
-/obj/mecha/proc/play_entered_noise(var/mob/who)
+/obj/mecha/proc/play_entered_noise(mob/who)
if(!hasInternalDamage()) //Otherwise it's not nominal!
switch(mech_faction)
if(MECH_FACTION_NT)//The good guys category
@@ -2779,7 +2779,7 @@
return 0
//This is for mobs mostly.
-/obj/mecha/attack_generic(var/mob/user, var/damage, var/attack_message)
+/obj/mecha/attack_generic(mob/user, damage, attack_message)
var/obj/item/mecha_parts/component/armor/ArmC = internal_components[MECH_ARMOR]
@@ -2910,7 +2910,7 @@
else
occupant.clear_alert("mech damage")
-/obj/mecha/blob_act(var/obj/structure/blob/B)
+/obj/mecha/blob_act(obj/structure/blob/B)
var/datum/blob_type/blob = B?.overmind?.blob_type
if(!istype(blob))
return FALSE
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index e0768fa71f..4679a31674 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -21,7 +21,7 @@
qdel(src)
return
-/obj/effect/decal/mecha_wreckage/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/decal/mecha_wreckage/bullet_act(obj/item/projectile/Proj)
return
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index 7b288ae53c..2de8ffdcfe 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -24,7 +24,7 @@
. = ..()
hud = new /obj/item/clothing/glasses/hud/health/mech(src)
-/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H as mob)
+/obj/mecha/medical/odysseus/moved_inside(mob/living/carbon/human/H as mob)
if(..())
if(H.glasses)
occupant_message(span_red("[H.glasses] prevent you from using [src] [hud]!"))
diff --git a/code/game/mecha/micro/security.dm b/code/game/mecha/micro/security.dm
index 777ae8912b..2faeab1a54 100644
--- a/code/game/mecha/micro/security.dm
+++ b/code/game/mecha/micro/security.dm
@@ -1,4 +1,4 @@
-/obj/mecha/micro/sec/moved_inside(var/mob/living/carbon/human/H as mob)
+/obj/mecha/micro/sec/moved_inside(mob/living/carbon/human/H as mob)
if(..())
if(H.client)
H.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi")
diff --git a/code/game/mecha/space/hoverpod.dm b/code/game/mecha/space/hoverpod.dm
index 10190d4e84..7a6bb449fc 100644
--- a/code/game/mecha/space/hoverpod.dm
+++ b/code/game/mecha/space/hoverpod.dm
@@ -35,7 +35,7 @@
QDEL_NULL(ion_trail)
. = ..()
-/obj/mecha/working/hoverpod/moved_inside(var/mob/living/carbon/human/H as mob)
+/obj/mecha/working/hoverpod/moved_inside(mob/living/carbon/human/H as mob)
. = ..(H)
if(.)
ion_trail.start()
diff --git a/code/game/memory_profiler_ch.dm b/code/game/memory_profiler_ch.dm
index 00131992ce..62b4078e9e 100644
--- a/code/game/memory_profiler_ch.dm
+++ b/code/game/memory_profiler_ch.dm
@@ -108,12 +108,12 @@
world.log << "Finished in [total_time/1000] seconds"
-/proc/prune_list(var/list/list_of_lists)
+/proc/prune_list(list/list_of_lists)
if(!list_of_lists.len) return
for(var/list/L in list_of_lists)
if(list_of_lists[L] == 1 && refcount(L) < 10) list_of_lists.Remove(list(L))
-/proc/mem_and_lists(var/datum/thing,var/list/list_of_lists,var/list/list_count,var/list/exclude_vars,var/list/mem_count,var/list/by_variable)
+/proc/mem_and_lists(datum/thing,list/list_of_lists,list/list_count,list/exclude_vars,list/mem_count,list/by_variable)
mem_count[thing.type] += 24
for(var/variable in thing.vars)
if(variable == "vars") continue
@@ -169,14 +169,14 @@
catch
return FALSE
-/proc/add_types(var/datum/thing, var/list/L)
+/proc/add_types(datum/thing, list/L)
var/type = thing::type
var/p_type = thing::parent_type
if(type in L) L[type]++
else L[type] = 1
if(p_type) add_types(p_type, L)
-/proc/add_types_val(var/datum/thing, var/list/L, var/val)
+/proc/add_types_val(datum/thing, list/L, val)
var/type = thing::type
var/p_type = thing::parent_type
L[type] += val
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 22d72c5d0d..274112eb61 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -116,7 +116,7 @@
return
//Wrapper procs that handle sanity and user feedback
-/atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = FALSE)
+/atom/movable/proc/user_buckle_mob(mob/living/M, mob/user, forced = FALSE, silent = FALSE)
if(!SSticker)
to_chat(user, span_warning("You can't buckle anyone in before the game starts."))
return FALSE // Is this really needed?
diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm
index c6b37b4795..18c83e5fe2 100644
--- a/code/game/objects/effects/alien/aliens.dm
+++ b/code/game/objects/effects/alien/aliens.dm
@@ -39,7 +39,7 @@
var/obj/effect/alien/weeds/node/linked_node = null
var/static/list/weedImageCache
-/obj/effect/alien/weeds/Initialize(mapload, var/node, var/newcolor)
+/obj/effect/alien/weeds/Initialize(mapload, node, newcolor)
. = ..()
if(isspace(loc) || delete_me)
return INITIALIZE_HINT_QDEL
@@ -76,7 +76,7 @@
var/node_range = NODERANGE
// var/set_color = "#321D37" // CHOMPedit: Removing coloration.
-/obj/effect/alien/weeds/node/Initialize(mapload, var/node, var/newcolor)
+/obj/effect/alien/weeds/node/Initialize(mapload, node, newcolor)
. = ..()
for(var/obj/effect/alien/weeds/existing in loc)
@@ -187,7 +187,7 @@
qdel(src)
return
-/obj/effect/alien/weeds/attackby(var/obj/item/W, var/mob/user)
+/obj/effect/alien/weeds/attackby(obj/item/W, mob/user)
user.setClickCooldown(user.get_attack_speed(W))
if(LAZYLEN(W.attack_verb))
visible_message(span_danger("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]"))
@@ -206,14 +206,14 @@
health -= damage
healthcheck()
-/obj/effect/alien/weeds/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/effect/alien/weeds/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
user.do_attack_animation(src)
health -= damage
healthcheck()
return
-/obj/effect/alien/weeds/take_damage(var/damage)
+/obj/effect/alien/weeds/take_damage(damage)
health -= damage
healthcheck()
return
diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
index febda8ef11..81fd565817 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
@@ -60,7 +60,7 @@
var/random_spawn_picked = pick(random_spawns)
new random_spawn_picked(affected_turf)
-/datum/dimension_theme/proc/can_convert(var/turf/affected_turf)
+/datum/dimension_theme/proc/can_convert(turf/affected_turf)
if(istype(affected_turf, /turf/unsimulated))
return FALSE
if(isspace(affected_turf))
diff --git a/code/game/objects/effects/anomalies/anomalies_weather_themes.dm b/code/game/objects/effects/anomalies/anomalies_weather_themes.dm
index aab5787dd7..ac779e969d 100644
--- a/code/game/objects/effects/anomalies/anomalies_weather_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_weather_themes.dm
@@ -109,7 +109,7 @@
affected_mob.wash(CLEAN_ALL)
affected_mob.water_act(2)
-/datum/anomalous_weather/proc/do_special(var/turf/simulated/T)
+/datum/anomalous_weather/proc/do_special(turf/simulated/T)
return
/datum/anomalous_weather/proc/hear_sounds(mob/M, adding)
diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm
index 86001bf0d6..2023bfd343 100644
--- a/code/game/objects/effects/chem/chemsmoke.dm
+++ b/code/game/objects/effects/chem/chemsmoke.dm
@@ -58,7 +58,7 @@
// Calculates the max range smoke can travel, then gets all turfs in that view range.
// Culls the selected turfs to a (roughly) circle shape, then calls smokeFlow() to make
// sure the smoke can actually path to the turfs. This culls any turfs it can't reach.
-/datum/effect/effect/system/smoke_spread/chem/set_up(var/datum/reagents/carry = null, n = 10, c = 0, loca, direct)
+/datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, n = 10, c = 0, loca, direct)
range = n * 0.3
cardinals = c
carry.trans_to_obj(chemholder, carry.total_volume, copy = 1)
@@ -162,7 +162,7 @@
// Randomizes and spawns the smoke effect.
// Also handles deleting the smoke once the effect is finished.
//------------------------------------------
-/datum/effect/effect/system/smoke_spread/chem/proc/spawnSmoke(var/turf/T, var/icon/I, var/dist = 1, var/obj/effect/effect/smoke/chem/passed_smoke)
+/datum/effect/effect/system/smoke_spread/chem/proc/spawnSmoke(turf/T, icon/I, dist = 1, obj/effect/effect/smoke/chem/passed_smoke)
var/obj/effect/effect/smoke/chem/smoke
if(passed_smoke)
@@ -183,12 +183,12 @@
var/lifespan = 150 + rand(0, 20)
addtimer(CALLBACK(src, PROC_REF(fadeOut), smoke), lifespan)
-/datum/effect/effect/system/smoke_spread/chem/spores/spawnSmoke(var/turf/T, var/icon/I, var/dist = 1)
+/datum/effect/effect/system/smoke_spread/chem/spores/spawnSmoke(turf/T, icon/I, dist = 1)
var/obj/effect/effect/smoke/chem/spores = new /obj/effect/effect/smoke/chem(location)
spores.name = "cloud of [seed.seed_name] [seed.seed_noun]"
..(T, I, dist, spores)
-/datum/effect/effect/system/smoke_spread/chem/proc/fadeOut(var/atom/A, var/frames = 16) // Fades out the smoke smoothly using it's alpha variable.
+/datum/effect/effect/system/smoke_spread/chem/proc/fadeOut(atom/A, frames = 16) // Fades out the smoke smoothly using it's alpha variable.
A.set_opacity(0) // lighting and view range updates
if(A.alpha == 0) //Handle already transparent case
qdel(A)
diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm
index ab80979552..d7f2d27855 100644
--- a/code/game/objects/effects/chem/foam.dm
+++ b/code/game/objects/effects/chem/foam.dm
@@ -17,7 +17,7 @@
var/dries = 1 //VOREStation Add
var/slips = 0 //VOREStation Add
-/obj/effect/effect/foam/Initialize(mapload, var/ismetal = 0)
+/obj/effect/effect/foam/Initialize(mapload, ismetal = 0)
. = ..()
//icon_state = "[ismetal? "m" : ""]foam" //VOREStation Removal
metal = ismetal
@@ -80,7 +80,7 @@
spawn(5)
qdel(src)
-/obj/effect/effect/foam/Crossed(var/atom/movable/AM)
+/obj/effect/effect/foam/Crossed(atom/movable/AM)
if(AM.is_incorporeal())
return
if(metal)
@@ -94,7 +94,7 @@
var/list/carried_reagents // the IDs of reagents present when the foam was mixed
var/metal = 0 // 0 = foam, 1 = metalfoam, 2 = ironfoam
-/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, var/datum/reagents/carry = null, var/metalfoam = 0)
+/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null, metalfoam = 0)
amount = round(sqrt(amt / 3), 1)
if(istype(loca, /turf/))
location = loca
@@ -160,13 +160,13 @@
/obj/structure/foamedmetal/ex_act(severity)
qdel(src)
-/obj/structure/foamedmetal/bullet_act(var/obj/item/projectile/P)
+/obj/structure/foamedmetal/bullet_act(obj/item/projectile/P)
if(istype(P, /obj/item/projectile/test))
return
else if(metal == 1 || prob(50))
qdel(src)
-/obj/structure/foamedmetal/attack_hand(var/mob/user)
+/obj/structure/foamedmetal/attack_hand(mob/user)
if ((HULK in user.mutations) || (prob(75 - metal * 25)))
user.visible_message(span_warning("[user] smashes through the foamed metal."), span_notice("You smash through the metal foam wall."))
qdel(src)
@@ -174,7 +174,7 @@
to_chat(user, span_notice("You hit the metal foam but bounce off it."))
return
-/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/foamedmetal/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/grab))
var/obj/item/grab/G = I
G.affecting.loc = src.loc
diff --git a/code/game/objects/effects/chem/water.dm b/code/game/objects/effects/chem/water.dm
index 9212851e9c..1b98df646e 100644
--- a/code/game/objects/effects/chem/water.dm
+++ b/code/game/objects/effects/chem/water.dm
@@ -12,12 +12,12 @@
/obj/effect/effect/water/proc/set_color() // Call it after you move reagents to it
icon += reagents.get_color()
-/obj/effect/effect/water/proc/set_up(var/turf/target, var/step_count = 5, var/delay = 5)
+/obj/effect/effect/water/proc/set_up(turf/target, step_count = 5, delay = 5)
if(!target)
return
step_process(target, step_count, delay)
-/obj/effect/effect/water/proc/step_process(var/turf/target, var/step_count, var/delay, var/iteration)
+/obj/effect/effect/water/proc/step_process(turf/target, step_count, delay, iteration)
step_count--
if(!loc)
qdel(src)
diff --git a/code/game/objects/effects/client_only_image.dm b/code/game/objects/effects/client_only_image.dm
index 303cd74d54..c800ffdaee 100644
--- a/code/game/objects/effects/client_only_image.dm
+++ b/code/game/objects/effects/client_only_image.dm
@@ -5,7 +5,7 @@
/image/client_only
var/list/clients = list()
-/image/client_only/proc/append_client(var/client/C)
+/image/client_only/proc/append_client(client/C)
C.images += src
clients.Add(WEAKREF(C))
@@ -18,6 +18,6 @@
clients.Cut()
// Mostly for motion echos, but someone will probably find another use for it... So parent type gets it instead!
-/image/client_only/proc/place_from_root(var/turf/At)
+/image/client_only/proc/place_from_root(turf/At)
pixel_x = ((At.x - loc.x) * 32)
pixel_y = ((At.y - loc.y) * 32)
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 20ee4de562..fa04ca8226 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -53,7 +53,7 @@
qdel(B)
//VOREstation edit - Moved timer call to Init, and made it not call on mapload
-/obj/effect/decal/cleanable/blood/Initialize(mapload, var/_age)
+/obj/effect/decal/cleanable/blood/Initialize(mapload, _age)
. = ..()
if(!mapload)
addtimer(CALLBACK(src, PROC_REF(dry)), DRYING_TIME * (amount+1))
@@ -233,7 +233,7 @@
random_icon_states = list("gibmid1", "gibmid2", "gibmid3")
-/obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions)
+/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)
spawn (0)
var/direction = pick(directions)
for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index f74736170c..1808f21fbf 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -69,7 +69,7 @@
mouse_opacity = 0
var/delete_me = FALSE
-/obj/effect/decal/cleanable/dirt/Initialize(mapload, var/_age, var/dirt)
+/obj/effect/decal/cleanable/dirt/Initialize(mapload, _age, dirt)
.=..()
if(delete_me)
return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index 26a4fb11af..c5ef76bfdb 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -16,7 +16,7 @@
/obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like
return
-/obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions)
+/obj/effect/decal/cleanable/blood/gibs/robot/streak(list/directions)
spawn (0)
var/direction = pick(directions)
for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm
index 22e7420b6c..678b82c6aa 100644
--- a/code/game/objects/effects/decals/Cleanable/tracks.dm
+++ b/code/game/objects/effects/decals/Cleanable/tracks.dm
@@ -59,7 +59,7 @@
* @param goingdir Direction tracks are going to (or 0).
* @param bloodcolor Color of the blood when wet.
*/
-/obj/effect/decal/cleanable/blood/tracks/proc/AddTracks(var/list/DNA, var/comingdir, var/goingdir, var/bloodcolor="#A10808")
+/obj/effect/decal/cleanable/blood/tracks/proc/AddTracks(list/DNA, comingdir, goingdir, bloodcolor="#A10808")
var/updated=0
// Shift our goingdir 4 spaces to the left so it's in the GOING bitblock.
var/realgoing=goingdir<<4
diff --git a/code/game/objects/effects/decals/Cleanable/vore.dm b/code/game/objects/effects/decals/Cleanable/vore.dm
index 936adec6d9..4f83cd915f 100644
--- a/code/game/objects/effects/decals/Cleanable/vore.dm
+++ b/code/game/objects/effects/decals/Cleanable/vore.dm
@@ -11,7 +11,7 @@
var/custombasedesc = null
var/custombasecolor = null
-/obj/effect/decal/cleanable/blood/reagent/Initialize(mapload, var/spill_name, var/spill_color, var/spill_reagentid, var/new_amount, var/ckey_user, var/ckey_spawn)
+/obj/effect/decal/cleanable/blood/reagent/Initialize(mapload, spill_name, spill_color, spill_reagentid, new_amount, ckey_user, ckey_spawn)
. = ..()
switch(spill_reagentid) //To ensure that if people spill some liquids, it wont cause issues with spawning, like spilling blood. Also allow for spilling of certain things to
if("blood")
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index c9804e54d1..22b55306bc 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -16,7 +16,7 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for
///The type of cleaning required to clean the decal, CLEAN_TYPE_LIGHT_DECAL can be cleaned with mops and soap, CLEAN_TYPE_HARD_DECAL can be cleaned by soap, see __DEFINES/cleaning.dm for the others
var/clean_type = CLEAN_TYPE_LIGHT_DECAL
-/obj/effect/decal/cleanable/Initialize(mapload, var/_age)
+/obj/effect/decal/cleanable/Initialize(mapload, _age)
if(!isnull(_age))
age = _age
if(random_icon_states && length(src.random_icon_states) > 0)
diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 3f4a6b2eeb..e50f10c293 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -18,7 +18,7 @@
var/poster_type = /obj/structure/sign/poster
-/obj/item/contraband/poster/Initialize(mapload, var/given_serial = 0)
+/obj/item/contraband/poster/Initialize(mapload, given_serial = 0)
if(!serial_number)
if(given_serial == 0)
serial_number = rand(1, poster_designs.len)
@@ -28,7 +28,7 @@
. = ..()
//Places the poster on a wall
-/obj/item/contraband/poster/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
+/obj/item/contraband/poster/afterattack(atom/A, mob/user, adjacent, clickparams)
if (!adjacent)
return
@@ -83,7 +83,7 @@
icon_state = "rolled_poster_nt"
poster_type = /obj/structure/sign/poster/nanotrasen
-/obj/item/contraband/poster/nanotrasen/Initialize(mapload, var/given_serial = 0)
+/obj/item/contraband/poster/nanotrasen/Initialize(mapload, given_serial = 0)
if(given_serial == 0)
serial_number = rand(1, NT_poster_designs.len)
else
@@ -96,7 +96,7 @@
desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. This one is made from some kind of e-paper, and could display almost anything!"
poster_type = /obj/structure/sign/poster/custom
-/obj/item/contraband/poster/custom/Initialize(mapload, var/given_serial = 0)
+/obj/item/contraband/poster/custom/Initialize(mapload, given_serial = 0)
if(given_serial == 0)
serial_number = 1 //Decidedly unrandom
else
@@ -137,7 +137,7 @@
var/roll_type
var/poster_set = FALSE
-/obj/structure/sign/poster/Initialize(mapload, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster)
+/obj/structure/sign/poster/Initialize(mapload, placement_dir=null, serial=null, itemtype = /obj/item/contraband/poster)
. = ..()
if(!serial)
@@ -172,7 +172,7 @@
var/datum/poster/design = new path
set_poster(design)
-/obj/structure/sign/poster/proc/set_poster(var/datum/poster/design)
+/obj/structure/sign/poster/proc/set_poster(datum/poster/design)
name = "[initial(name)] - [design.name]"
desc = "[initial(desc)] [design.desc]"
icon_state = design.icon_state // poster[serial_number]
@@ -226,7 +226,7 @@
/obj/structure/sign/poster/nanotrasen
roll_type = /obj/item/contraband/poster/nanotrasen
-/obj/structure/sign/poster/nanotrasen/Initialize(mapload, var/placement_dir=null, var/serial=null, var/itemtype = /obj/item/contraband/poster/nanotrasen)
+/obj/structure/sign/poster/nanotrasen/Initialize(mapload, placement_dir=null, serial=null, itemtype = /obj/item/contraband/poster/nanotrasen)
if(!serial)
serial = rand(1, NT_poster_designs.len)
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 7499bc46a0..9520219bde 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -9,7 +9,7 @@
var/art_color
var/art_shade
-/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF",shade = "#000000",var/type = "rune", new_age = 0)
+/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF",shade = "#000000",type = "rune", new_age = 0)
name = type
desc = "A [type] drawn in crayon."
diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm
index 5ea6e5ee68..8864adf064 100644
--- a/code/game/objects/effects/decals/posters/posters.dm
+++ b/code/game/objects/effects/decals/posters/posters.dm
@@ -1,5 +1,5 @@
/// Returns a randomly picked poster decl of the subtype specified by the path argument. If the exact argument is true, it will return the decl from the decls_repository of the exact path specified.
-/proc/get_poster_decl(var/path = null, var/exact = TRUE, var/forbid_types)
+/proc/get_poster_decl(path = null, exact = TRUE, forbid_types)
if(ispath(path))
if(exact)
return GLOB.decls_repository.get_decl(path)
@@ -43,7 +43,7 @@
return poster_decl
//Places the poster on a wall
-/obj/item/poster/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
+/obj/item/poster/afterattack(atom/A, mob/user, adjacent, clickparams)
if(!adjacent)
return FALSE
@@ -99,7 +99,7 @@
VAR_PROTECTED/roll_type = /obj/item/poster
VAR_PRIVATE/ruined = FALSE
-/obj/structure/sign/poster/Initialize(mapload, var/placement_dir = null, var/obj/item/poster/P = null)
+/obj/structure/sign/poster/Initialize(mapload, placement_dir = null, obj/item/poster/P = null)
. = ..()
if(ispath(poster_decl))
diff --git a/code/game/objects/effects/decals/posters/postersubtypes.dm b/code/game/objects/effects/decals/posters/postersubtypes.dm
index d533ea486b..84819c51a6 100644
--- a/code/game/objects/effects/decals/posters/postersubtypes.dm
+++ b/code/game/objects/effects/decals/posters/postersubtypes.dm
@@ -5,7 +5,7 @@
icon_state = "rolled_poster_nt"
poster_type = /obj/structure/sign/poster/nanotrasen
-/obj/item/poster/nanotrasen/Initialize(mapload, var/datum/decl/poster/P = null)
+/obj/item/poster/nanotrasen/Initialize(mapload, datum/decl/poster/P = null)
if(!ispath(poster_decl) && !ispath(P) && !istype(P))
poster_decl = get_poster_decl(/datum/decl/poster/nanotrasen, FALSE, null)
return ..()
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 0298b503fd..8a73de6ce4 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -192,7 +192,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
if(istype(M))
affect(M)
-/obj/effect/effect/smoke/proc/affect(var/mob/living/carbon/M)
+/obj/effect/effect/smoke/proc/affect(mob/living/carbon/M)
if (!istype(M))
return 0
if(M.wear_mask && (M.wear_mask.item_flags & AIRTIGHT))
@@ -215,7 +215,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
icon = 'icons/effects/effects.dmi'
icon_state = "sparks"
-/obj/effect/effect/smoke/illumination/Initialize(mapload, var/lifetime=10, var/range=null, var/power=null, var/color=null)
+/obj/effect/effect/smoke/illumination/Initialize(mapload, lifetime=10, range=null, power=null, color=null)
time_to_live=lifetime
. = ..()
set_light(range, power, color)
@@ -233,7 +233,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/mob/living/L in get_turf(src))
affect(L)
-/obj/effect/effect/smoke/bad/affect(var/mob/living/L)
+/obj/effect/effect/smoke/bad/affect(mob/living/L)
if (!..())
return 0
if(L.needs_to_breathe())
@@ -244,7 +244,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/effect/smoke/bad/noxious
opacity = 0
-/obj/effect/effect/smoke/bad/noxious/affect(var/mob/living/L)
+/obj/effect/effect/smoke/bad/noxious/affect(mob/living/L)
if (!..())
return 0
if(L.needs_to_breathe())
@@ -275,7 +275,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/mob/living/L in get_turf(src))
affect(L)
-/obj/effect/effect/smoke/bad/burntfood/affect(var/mob/living/L) // This stuff is extra-vile.
+/obj/effect/effect/smoke/bad/burntfood/affect(mob/living/L) // This stuff is extra-vile.
if (!..())
return 0
if(L.needs_to_breathe())
@@ -371,7 +371,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
if(direct)
direction = direct
-/datum/effect/effect/system/smoke_spread/start(var/I)
+/datum/effect/effect/system/smoke_spread/start(I)
var/i = 0
for(i=0, i 20)
diff --git a/code/game/objects/effects/effect_system_ch.dm b/code/game/objects/effects/effect_system_ch.dm
index 4fa2328163..619dbe6442 100644
--- a/code/game/objects/effects/effect_system_ch.dm
+++ b/code/game/objects/effects/effect_system_ch.dm
@@ -37,7 +37,7 @@
if(direct)
direction = direct
-/datum/effect/effect/system/confetti_spread/start(var/I)
+/datum/effect/effect/system/confetti_spread/start(I)
var/i = 0
for(i=0, i 20)
diff --git a/code/game/objects/effects/electrify_notice.dm b/code/game/objects/effects/electrify_notice.dm
index 66cbaf855f..c905c01c56 100644
--- a/code/game/objects/effects/electrify_notice.dm
+++ b/code/game/objects/effects/electrify_notice.dm
@@ -7,7 +7,7 @@
. = ..()
QDEL_IN(src, 1 SECOND)
-/image/client_only/electrify_notice/place_from_root(var/turf/At)
+/image/client_only/electrify_notice/place_from_root(turf/At)
. = ..()
pixel_y += 8
animate(src, pixel_y = 32, alpha = 0, time = 1 SECOND)
diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm
index 9d138f851b..526feb7e81 100644
--- a/code/game/objects/effects/gibs.dm
+++ b/code/game/objects/effects/gibs.dm
@@ -1,4 +1,4 @@
-/proc/gibs(atom/location, var/datum/dna/MobDNA, gibber_type = /obj/effect/gibspawner/generic, var/fleshcolor, var/bloodcolor)
+/proc/gibs(atom/location, datum/dna/MobDNA, gibber_type = /obj/effect/gibspawner/generic, fleshcolor, bloodcolor)
new gibber_type(location,MobDNA,fleshcolor,bloodcolor)
/obj/effect/gibspawner
@@ -12,7 +12,7 @@
icon = 'icons/effects/map_effects.dmi'
icon_state = "gibspawn"
-/obj/effect/gibspawner/Initialize(mapload, var/datum/dna/MobDNA, var/fleshcolor, var/bloodcolor)
+/obj/effect/gibspawner/Initialize(mapload, datum/dna/MobDNA, fleshcolor, bloodcolor)
. = ..()
if(fleshcolor) src.fleshcolor = fleshcolor
@@ -20,7 +20,7 @@
Gib(loc,MobDNA)
return INITIALIZE_HINT_QDEL
-/obj/effect/gibspawner/proc/Gib(atom/location, var/datum/dna/MobDNA = null)
+/obj/effect/gibspawner/proc/Gib(atom/location, datum/dna/MobDNA = null)
if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
to_chat(world, span_filter_system(span_warning("Gib list length mismatch!")))
log_world("Gib list length mismatch!")
diff --git a/code/game/objects/effects/item_pickup_ghost.dm b/code/game/objects/effects/item_pickup_ghost.dm
index f23b8c8d8e..56e3beaf32 100644
--- a/code/game/objects/effects/item_pickup_ghost.dm
+++ b/code/game/objects/effects/item_pickup_ghost.dm
@@ -6,14 +6,14 @@
time_to_die = 0.5 SECONDS
var/lifetime = 0.25 SECONDS //so it doesn't die before animation ends
-/obj/effect/temporary_effect/item_pickup_ghost/proc/assumeform(var/obj/item/picked_up)
+/obj/effect/temporary_effect/item_pickup_ghost/proc/assumeform(obj/item/picked_up)
icon = picked_up.icon
icon_state = picked_up.icon_state
pixel_x = picked_up.pixel_x
pixel_y = picked_up.pixel_y
color = picked_up.color
-/obj/effect/temporary_effect/item_pickup_ghost/proc/animate_towards(var/atom/target)
+/obj/effect/temporary_effect/item_pickup_ghost/proc/animate_towards(atom/target)
var/new_pixel_x = pixel_x + (target.x - src.x) * 32
var/new_pixel_y = pixel_y + (target.y - src.y) * 32
animate(src, pixel_x = new_pixel_x, pixel_y = new_pixel_y, transform = matrix()*0, time = lifetime)
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 1a6f53ac82..5229463596 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -91,7 +91,7 @@
else
GLOB.landmarks_list += src
-/obj/effect/landmark/Destroy(var/force = FALSE)
+/obj/effect/landmark/Destroy(force = FALSE)
if(delete_me || force)
GLOB.landmarks_list -= src
return ..()
diff --git a/code/game/objects/effects/landmarks_events.dm b/code/game/objects/effects/landmarks_events.dm
index 4acfc6f2d3..56ef6928ed 100644
--- a/code/game/objects/effects/landmarks_events.dm
+++ b/code/game/objects/effects/landmarks_events.dm
@@ -45,7 +45,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
GLOB.event_triggers[creator_ckey] -= src
. = ..()
-/obj/effect/landmark/event_trigger/Crossed(var/atom/movable/AM)
+/obj/effect/landmark/event_trigger/Crossed(atom/movable/AM)
if(!isliving(AM))
return FALSE
var/mob/living/L = AM
@@ -109,7 +109,7 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
-/obj/effect/landmark/event_trigger/auto_narrate/Crossed(var/atom/movable/AM)
+/obj/effect/landmark/event_trigger/auto_narrate/Crossed(atom/movable/AM)
. = ..() //Checks if AM is mob/living and notifies admin(s)
if(!.)
return
diff --git a/code/game/objects/effects/map_effects/beam_point.dm b/code/game/objects/effects/map_effects/beam_point.dm
index 37e43011f7..5b5f8c6733 100644
--- a/code/game/objects/effects/map_effects/beam_point.dm
+++ b/code/game/objects/effects/map_effects/beam_point.dm
@@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(all_beam_points)
// Checks if the two points have an active beam between them.
// Used to make sure two points don't have more than one beam.
-/obj/effect/map_effect/beam_point/proc/has_active_beam(var/obj/effect/map_effect/beam_point/them)
+/obj/effect/map_effect/beam_point/proc/has_active_beam(obj/effect/map_effect/beam_point/them)
// First, check our beams.
for(var/datum/beam/B in my_beams)
if(B.target == them)
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(all_beam_points)
return FALSE
-/obj/effect/map_effect/beam_point/proc/build_beam(var/atom/beam_target)
+/obj/effect/map_effect/beam_point/proc/build_beam(atom/beam_target)
if(!beam_target)
log_mapping("[src] ([src.type] \[[x],[y],[z]\]) failed to build its beam due to not having a target.")
return FALSE
@@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(all_beam_points)
return TRUE
-/obj/effect/map_effect/beam_point/proc/destroy_beam(var/datum/beam/B)
+/obj/effect/map_effect/beam_point/proc/destroy_beam(datum/beam/B)
if(!B)
log_mapping("[src] ([src.type] \[[x],[y],[z]\]) was asked to destroy a beam that does not exist.")
return FALSE
diff --git a/code/game/objects/effects/map_effects/map_effects.dm b/code/game/objects/effects/map_effects/map_effects.dm
index 3b66c1f4f5..4b42075510 100644
--- a/code/game/objects/effects/map_effects/map_effects.dm
+++ b/code/game/objects/effects/map_effects/map_effects.dm
@@ -54,7 +54,7 @@
trigger()
// Helper proc to optimize the use of effects by making sure they do not run if nobody is around to perceive it.
-/proc/check_for_player_proximity(var/atom/proximity_to, var/radius = 12, var/ignore_ghosts = FALSE, var/ignore_afk = TRUE)
+/proc/check_for_player_proximity(atom/proximity_to, radius = 12, ignore_ghosts = FALSE, ignore_afk = TRUE)
if(!proximity_to)
return FALSE
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 499f64682c..6a6c9e8188 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -40,7 +40,7 @@
old_turf.unregister_dangerous_object(src)
new_turf.register_dangerous_object(src)
-/obj/effect/mine/proc/explode(var/mob/living/M)
+/obj/effect/mine/proc/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
@@ -59,7 +59,7 @@
qdel(s)
qdel(src)
-/obj/effect/mine/proc/trigger_trap(var/mob/living/victim)
+/obj/effect/mine/proc/trigger_trap(mob/living/victim)
if(istype(trap, /obj/item/grenade))
var/obj/item/grenade/G = trap
trap = null
@@ -130,7 +130,7 @@
/obj/effect/mine/dnascramble
mineitemtype = /obj/item/mine/dnascramble
-/obj/effect/mine/dnascramble/explode(var/mob/living/M)
+/obj/effect/mine/dnascramble/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
@@ -149,7 +149,7 @@
/obj/effect/mine/stun
mineitemtype = /obj/item/mine/stun
-/obj/effect/mine/stun/explode(var/mob/living/M)
+/obj/effect/mine/stun/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -165,7 +165,7 @@
/obj/effect/mine/n2o
mineitemtype = /obj/item/mine/n2o
-/obj/effect/mine/n2o/explode(var/mob/living/M)
+/obj/effect/mine/n2o/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -179,7 +179,7 @@
/obj/effect/mine/phoron
mineitemtype = /obj/item/mine/phoron
-/obj/effect/mine/phoron/explode(var/mob/living/M)
+/obj/effect/mine/phoron/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -194,7 +194,7 @@
/obj/effect/mine/kick
mineitemtype = /obj/item/mine/kick
-/obj/effect/mine/kick/explode(var/mob/living/M)
+/obj/effect/mine/kick/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
@@ -215,7 +215,7 @@
//The radius of the circle used to launch projectiles. Lower values mean less projectiles are used but if set too low gaps may appear in the spread pattern
var/spread_range = 7
-/obj/effect/mine/frag/explode(var/mob/living/M)
+/obj/effect/mine/frag/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
@@ -235,7 +235,7 @@
// desc = "A mine with its payload removed, for EOD training and demonstrations."
mineitemtype = /obj/item/mine/training
-/obj/effect/mine/training/explode(var/mob/living/M)
+/obj/effect/mine/training/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -248,7 +248,7 @@
/obj/effect/mine/emp
mineitemtype = /obj/item/mine/emp
-/obj/effect/mine/emp/explode(var/mob/living/M)
+/obj/effect/mine/emp/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -266,7 +266,7 @@
/obj/effect/mine/incendiary
mineitemtype = /obj/item/mine/incendiary
-/obj/effect/mine/incendiary/explode(var/mob/living/M)
+/obj/effect/mine/incendiary/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -283,7 +283,7 @@
/obj/effect/mine/stripping
mineitemtype = /obj/item/mine/stripping
-/obj/effect/mine/stripping/explode(var/mob/living/M)
+/obj/effect/mine/stripping/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
triggered = TRUE
@@ -300,7 +300,7 @@
/obj/effect/mine/gadget
mineitemtype = /obj/item/mine/gadget
-/obj/effect/mine/gadget/explode(var/mob/living/M)
+/obj/effect/mine/gadget/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
@@ -374,7 +374,7 @@
..()
-/obj/item/mine/proc/prime(mob/user as mob, var/explode_now = FALSE)
+/obj/item/mine/proc/prime(mob/user as mob, explode_now = FALSE)
visible_message("\The [src.name] beeps as the priming sequence completes.")
var/obj/effect/mine/R = new minetype(get_turf(src))
src.transfer_fingerprints_to(R)
@@ -456,7 +456,7 @@
var/beam_types = list(/obj/item/projectile/bullet/foam_dart_riot) // you fool, you baffoon, you used these, you absolute ignoramous, why did you not read this!
var/spread_range = 3
-/obj/effect/mine/lasertag/explode(var/mob/living/M)
+/obj/effect/mine/lasertag/explode(mob/living/M)
if(triggered) // Prevents circular mine explosions from two mines detonating eachother
return
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread()
diff --git a/code/game/objects/effects/motion_echo.dm b/code/game/objects/effects/motion_echo.dm
index b175267aa3..0e73c1c27d 100644
--- a/code/game/objects/effects/motion_echo.dm
+++ b/code/game/objects/effects/motion_echo.dm
@@ -7,7 +7,7 @@
. = ..()
QDEL_IN(src, 2 SECONDS)
-/image/client_only/motion_echo/place_from_root(var/turf/At)
+/image/client_only/motion_echo/place_from_root(turf/At)
. = ..()
var/rand_limit = 12
pixel_x += rand(-rand_limit,rand_limit)
diff --git a/code/game/objects/effects/prop/columnblast.dm b/code/game/objects/effects/prop/columnblast.dm
index b254669a41..339bde5031 100644
--- a/code/game/objects/effects/prop/columnblast.dm
+++ b/code/game/objects/effects/prop/columnblast.dm
@@ -8,7 +8,7 @@
pixel_x = -16
-/obj/effect/temporary_effect/eruption/Initialize(mapload, var/ttd = 10 SECONDS, var/newcolor)
+/obj/effect/temporary_effect/eruption/Initialize(mapload, ttd = 10 SECONDS, newcolor)
if(ttd)
time_to_die += ttd
addtimer(CALLBACK(src, PROC_REF(on_eruption), get_turf(src)), time_to_die - 0.2 SECONDS, TIMER_DELETE_ME)
@@ -19,11 +19,11 @@
. = ..()
flick("[icon_state]_create",src)
-/obj/effect/temporary_effect/eruption/proc/on_eruption(var/turf/Target) // Override for specific functions, as below.
+/obj/effect/temporary_effect/eruption/proc/on_eruption(turf/Target) // Override for specific functions, as below.
flick("[icon_state]_erupt",src)
return TRUE
-/obj/effect/temporary_effect/eruption/test/on_eruption(var/turf/Target)
+/obj/effect/temporary_effect/eruption/test/on_eruption(turf/Target)
flick("[icon_state]_erupt",src)
if(Target)
new /obj/effect/explosion(Target)
@@ -36,7 +36,7 @@
/obj/effect/temporary_effect/eruption/flamestrike
desc = "A bubbling pool of fire!"
-/obj/effect/temporary_effect/eruption/flamestrike/on_eruption(var/turf/Target)
+/obj/effect/temporary_effect/eruption/flamestrike/on_eruption(turf/Target)
flick("[icon_state]_erupt",src)
if(Target)
Target.hotspot_expose(1000, 50, 1)
diff --git a/code/game/objects/effects/prop/snake.dm b/code/game/objects/effects/prop/snake.dm
index 670b573c2e..86fc713d3d 100644
--- a/code/game/objects/effects/prop/snake.dm
+++ b/code/game/objects/effects/prop/snake.dm
@@ -22,7 +22,7 @@
// Is the snake hunting a specific atom? (Will always try to meander toward this target.)
var/atom/hunting
-/obj/effect/temporary_effect/pulse/snake/Initialize(mapload, var/atom/hunt_target, var/atom/Creator)
+/obj/effect/temporary_effect/pulse/snake/Initialize(mapload, atom/hunt_target, atom/Creator)
. = ..()
if(hunt_target)
hunting = hunt_target
@@ -89,15 +89,15 @@
on_leave_turf(get_turf(src))
return FALSE
-/obj/effect/temporary_effect/pulse/snake/proc/on_leave_turf(var/turf/T)
+/obj/effect/temporary_effect/pulse/snake/proc/on_leave_turf(turf/T)
-/obj/effect/temporary_effect/pulse/snake/proc/on_enter_turf(var/turf/T)
+/obj/effect/temporary_effect/pulse/snake/proc/on_enter_turf(turf/T)
-/obj/effect/temporary_effect/pulse/snake/test/on_leave_turf(var/turf/T)
+/obj/effect/temporary_effect/pulse/snake/test/on_leave_turf(turf/T)
if(T)
new /obj/effect/temporary_effect/eruption/test(T, 3 SECONDS, "#ff0000")
-/obj/effect/temporary_effect/pulse/snake/test/on_enter_turf(var/turf/T)
+/obj/effect/temporary_effect/pulse/snake/test/on_enter_turf(turf/T)
if(T)
T.color = "#00ff00"
@@ -119,6 +119,6 @@
pulses_remaining = 8
pulse_delay = 0.2 SECONDS
-/obj/effect/temporary_effect/pulse/snake/flamestrike/on_leave_turf(var/turf/T)
+/obj/effect/temporary_effect/pulse/snake/flamestrike/on_leave_turf(turf/T)
if(T)
new /obj/effect/temporary_effect/eruption/flamestrike(T, 1.2 SECONDS, "#f75000")
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 13a9cb5ba4..5edcf14418 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -20,7 +20,7 @@
qdel(src)
return
-/obj/effect/spider/attackby(var/obj/item/W, var/mob/user)
+/obj/effect/spider/attackby(obj/item/W, mob/user)
user.setClickCooldown(user.get_attack_speed(W))
if(LAZYLEN(W.attack_verb))
@@ -52,7 +52,7 @@
visible_message(span_warning("\The [user] stomps \the [src] dead!"))
die()
-/obj/effect/spider/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/spider/bullet_act(obj/item/projectile/Proj)
..()
health -= Proj.get_structure_damage()
healthcheck()
@@ -104,7 +104,7 @@
START_PROCESSING(SSobj, src)
return ..()
-/obj/effect/spider/eggcluster/Initialize(mapload, var/atom/parent)
+/obj/effect/spider/eggcluster/Initialize(mapload, atom/parent)
. = ..()
get_light_and_color(parent)
@@ -169,7 +169,7 @@
/mob/living/simple_mob/animal/giant_spider/webslinger, /mob/living/simple_mob/animal/giant_spider/phorogenic, /mob/living/simple_mob/animal/giant_spider/carrier,
/mob/living/simple_mob/animal/giant_spider/ion)
-/obj/effect/spider/spiderling/Initialize(mapload, var/atom/parent)
+/obj/effect/spider/spiderling/Initialize(mapload, atom/parent)
. = ..()
pixel_x = rand(6,-6)
pixel_y = rand(6,-6)
@@ -297,7 +297,7 @@
desc = "There's a special aura about this one."
grow_as = list(/mob/living/simple_mob/animal/giant_spider/nurse/queen)
-/obj/effect/spider/spiderling/princess/Initialize(mapload, var/atom/parent)
+/obj/effect/spider/spiderling/princess/Initialize(mapload, atom/parent)
. = ..()
amount_grown = 50
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 009b4189d9..62629ca1f6 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -11,7 +11,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
icon = 'icons/mob/screen1.dmi' //VS Edit
icon_state = "centermarker" //VS Edit
-/obj/effect/step_trigger/proc/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/proc/Trigger(atom/movable/A)
return 0
/obj/effect/step_trigger/Crossed(atom/movable/H as mob|obj)
@@ -35,7 +35,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
var/nostop = 0 // if 1: will only be stopped by teleporters
var/list/affecting = list()
-/obj/effect/step_trigger/thrower/Trigger(var/atom/A)
+/obj/effect/step_trigger/thrower/Trigger(atom/A)
if(!A || !istype(A, /atom/movable))
return
var/atom/movable/AM = A
@@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
var/teleport_y_offset = 0
var/teleport_z_offset = 0
-/obj/effect/step_trigger/teleporter/random/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/teleporter/random/Trigger(atom/movable/A)
if(teleport_x && teleport_y && teleport_z)
if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
@@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
the_landmark = mark
return
-/obj/effect/step_trigger/teleporter/landmark/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/teleporter/landmark/Trigger(atom/movable/A)
if(the_landmark)
A.forceMove(get_turf(the_landmark))
@@ -210,7 +210,7 @@ GLOBAL_LIST_EMPTY(tele_landmarks)
/obj/effect/step_trigger/teleporter/planetary_fall/proc/find_planet()
return
-/obj/effect/step_trigger/teleporter/planetary_fall/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/teleporter/planetary_fall/Trigger(atom/movable/A)
var/turf/T = get_turf(A)
if(!T)
return
@@ -222,7 +222,7 @@ GLOBAL_LIST_EMPTY(tele_landmarks)
var/deathmessage = "You die a horrible, brutal and very sudden death."
var/deathalert = "has stepped on a death trigger."
-/obj/effect/step_trigger/death/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/death/Trigger(atom/movable/A)
if(isliving(A))
to_chat(A, span_danger("[deathmessage]"))
log_and_message_admins("[deathalert]", A)
@@ -246,7 +246,7 @@ GLOBAL_LIST_EMPTY(tele_landmarks)
var/warningmessage = "Warning!"
icon_state = "warnmarker"
-/obj/effect/step_trigger/warning/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/warning/Trigger(atom/movable/A)
if(isliving(A))
to_chat(A, span_warning("[warningmessage]"))
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index ee0c2bce53..b09c3b2818 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -2,7 +2,7 @@
desc = "It's a decoy!"
duration = 15
-/obj/effect/temp_visual/decoy/Initialize(mapload, atom/mimiced_atom, var/customappearance)
+/obj/effect/temp_visual/decoy/Initialize(mapload, atom/mimiced_atom, customappearance)
. = ..()
alpha = initial(alpha)
if(mimiced_atom)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 60067684fb..2d20c781aa 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -482,7 +482,7 @@
// slot uses the slot_X defines found in setup.dm
// for items that can be placed in multiple slots
// note this isn't called during the initial dressing of a player
-/obj/item/proc/equipped(var/mob/user, var/slot)
+/obj/item/proc/equipped(mob/user, slot)
// Give out actions our item has to people who equip it.
for(var/datum/action/action as anything in actions)
give_item_action(action, user, slot)
@@ -524,7 +524,7 @@
return TRUE
// As above but for items being equipped to an active module on a robot.
-/obj/item/proc/equipped_robot(var/mob/user)
+/obj/item/proc/equipped_robot(mob/user)
return
//Defines which slots correspond to which slot flags
@@ -698,7 +698,7 @@ GLOBAL_LIST_INIT(slot_flags_enumeration, list(
//If a negative value is returned, it should be treated as a special return value for bullet_act() and handled appropriately.
//For non-projectile attacks this usually means the attack is blocked.
//Otherwise should return 0 to indicate that the attack is not affected in any way.
-/obj/item/proc/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/proc/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
return 0
/obj/item/proc/get_loc_turf()
@@ -843,7 +843,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
I.showoff(src)
/// For zooming with scope or binoculars. Uses remote_view/item component for disabling when you move or drop the item
-/obj/item/proc/zoom(var/mob/living/M, var/tileoffset = 14,var/viewsize = 9) //tileoffset is client view offset in the direction the user is facing. viewsize is how far out this thing zooms. 7 is normal view
+/obj/item/proc/zoom(mob/living/M, tileoffset = 14,viewsize = 9) //tileoffset is client view offset in the direction the user is facing. viewsize is how far out this thing zooms. 7 is normal view
SIGNAL_HANDLER
if(isliving(usr)) //Always prefer usr if set
M = usr
@@ -884,7 +884,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
// Used for non-adjacent melee attacks with specific weapons capable of reaching more than one tile.
// This uses changeling range string A* but for this purpose its also applicable.
-/obj/item/proc/attack_can_reach(var/atom/us, var/atom/them, var/range)
+/obj/item/proc/attack_can_reach(atom/us, atom/them, range)
if(us.Adjacent(them))
return TRUE // Already adjacent.
if(AStar(get_turf(us), get_turf(them), /turf/proc/AdjacentTurfsRangedSting, /turf/proc/Distance, max_nodes=25, max_node_depth=range))
@@ -909,7 +909,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
return FALSE
//Worn icon generation for on-mob sprites
-/obj/item/proc/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
+/obj/item/proc/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer,icon/clip_mask = null)
//Get the required information about the base icon
var/icon/icon2use = get_worn_icon_file(body_type = body_type, slot_name = slot_name, default_icon = default_icon, inhands = inhands)
var/state2use = get_worn_icon_state(slot_name = slot_name)
@@ -958,7 +958,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
return standing
//Returns the icon object that should be used for the worn icon
-/obj/item/proc/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
+/obj/item/proc/get_worn_icon_file(body_type,slot_name,default_icon,inhands)
//1: icon_override var
if(icon_override)
@@ -1005,7 +1005,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
return
//Returns the state that should be used for the worn icon
-/obj/item/proc/get_worn_icon_state(var/slot_name)
+/obj/item/proc/get_worn_icon_state(slot_name)
//1: slot-specific sprite sheets
if(LAZYLEN(item_state_slots))
@@ -1022,7 +1022,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
return icon_state
//Returns the layer that should be used for the worn icon (as a FLOAT_LAYER layer, so negative)
-/obj/item/proc/get_worn_layer(var/default_layer = 0)
+/obj/item/proc/get_worn_layer(default_layer = 0)
//1: worn_layer variable
if(!isnull(worn_layer)) //Can be zero, so...
@@ -1032,7 +1032,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
return BODY_LAYER+default_layer
//Apply the addblend blends onto the icon
-/obj/item/proc/apply_addblends(var/source_icon, var/icon/standing_icon)
+/obj/item/proc/apply_addblends(source_icon, icon/standing_icon)
//If we have addblends, blend them onto the provided icon
if(addblends && standing_icon && source_icon)
@@ -1040,18 +1040,18 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
standing_icon.Blend(addblend_icon, ICON_ADD)
//STUB
-/obj/item/proc/apply_custom(var/icon/standing_icon)
+/obj/item/proc/apply_custom(icon/standing_icon)
return standing_icon
//STUB
-/obj/item/proc/apply_blood(var/image/standing)
+/obj/item/proc/apply_blood(image/standing)
return standing
//STUB
-/obj/item/proc/apply_accessories(var/image/standing)
+/obj/item/proc/apply_accessories(image/standing)
return standing
-/obj/item/proc/apply_overlays(var/image/standing)
+/obj/item/proc/apply_overlays(image/standing)
if(!blocks_emissive)
return standing
@@ -1108,7 +1108,7 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
/obj/item/var/center_of_mass_x = 16
/obj/item/var/center_of_mass_y = 16
-/proc/auto_align(obj/item/W, click_parameters, var/animate = FALSE)
+/proc/auto_align(obj/item/W, click_parameters, animate = FALSE)
if(!W.center_of_mass_x && !W.center_of_mass_y)
W.randpixel_xy()
return
@@ -1140,10 +1140,10 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
#undef CELLSIZE
// this gets called when the item gets chucked by the vending machine
-/obj/item/proc/vendor_action(var/obj/machinery/vending/V)
+/obj/item/proc/vendor_action(obj/machinery/vending/V)
return
-/obj/item/proc/on_holder_escape(var/obj/item/holder/H)
+/obj/item/proc/on_holder_escape(obj/item/holder/H)
return
/obj/item/proc/get_welder()
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 06a13856f6..8a533b7a0c 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -118,7 +118,7 @@
var/area/A = T.loc
return A
-/obj/item/blueprints/proc/get_area_type(var/area/A = get_area())
+/obj/item/blueprints/proc/get_area_type(area/A = get_area())
for(var/type in SPACE_OUTSIDE_TYPES) //YWEDIT Start.
if(istype(A, type))
return AREA_SPACE //YWEDIT End.
@@ -199,7 +199,7 @@
interact()
return
-/obj/item/blueprints/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A)
+/obj/item/blueprints/proc/move_turfs_to_area(list/turf/turfs, area/A)
for(var/T in turfs)
ChangeArea(T, A)
@@ -220,7 +220,7 @@
-/obj/item/blueprints/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle)
+/obj/item/blueprints/proc/set_area_machinery_title(area/A,title,oldtitle)
if (!oldtitle) // or replacetext goes to infinite loop
return
@@ -246,7 +246,7 @@
* Note: The first turf is always allowed, and turfs in its area.
* @return On success, a list of turfs included in the room. On failure will return a ROOM_ERR_* constant.
*/
-/obj/item/blueprints/proc/detect_room_ex(var/turf/first, var/allowedAreas = AREA_SPACE)
+/obj/item/blueprints/proc/detect_room_ex(turf/first, allowedAreas = AREA_SPACE)
if(!istype(first))
return ROOM_ERR_LOLWAT
var/list/turf/found = list()
diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm
index b3ac2ea0eb..1c5790b302 100644
--- a/code/game/objects/items/blueprints_vr.dm
+++ b/code/game/objects/items/blueprints_vr.dm
@@ -472,7 +472,7 @@
found_turfs += origin //If this isn't done, it just adds the 8 tiles around the user.
return found_turfs
-/proc/create_area(mob/creator, var/obj/item/areaeditor/AO)
+/proc/create_area(mob/creator, obj/item/areaeditor/AO)
if(AO && istype(AO,/obj/item/areaeditor))
if(AO.uses_charges && AO.charges < 1)
to_chat(creator, span_warning("You need more paper before you can even think of editing this area!"))
@@ -552,7 +552,7 @@
// OLD CODE. DON'T TOUCH OR 100 RABID SQUIRRELS WILL DEVOUR YOU.
// I say old code, but it truly isn't. It's a bastardization of the new create_area code and the old create_area code.
// In essence, it does a few things: Ensure no blacklisted areas are nearby, get the nearby areas (to allow merging), and allow you to make a whole near area.
-/obj/item/areaeditor/proc/create_area_whole(mob/creator, var/override = 0) //Gets the entire enclosed space and makes a new area out of it. Can overwrite old areas.
+/obj/item/areaeditor/proc/create_area_whole(mob/creator, override = 0) //Gets the entire enclosed space and makes a new area out of it. Can overwrite old areas.
if(uses_charges && charges < 5)
to_chat(creator, span_warning("You need more paper before you can even think of editing this area!"))
return
@@ -666,12 +666,12 @@
interact()
return
-/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A)
+/proc/move_turfs_to_area(list/turf/turfs, area/A)
for(var/T in turfs)
ChangeArea(T, A)
-/obj/item/areaeditor/proc/detect_room_ex(var/turf/first, var/allowedAreas = AREA_SPACE, var/list/forbiddenAreas = list(), var/visual)
+/obj/item/areaeditor/proc/detect_room_ex(turf/first, allowedAreas = AREA_SPACE, list/forbiddenAreas = list(), visual)
if(!istype(first))
return ROOM_ERR_LOLWAT
if(!visual && forbiddenAreas[first.loc.type] || forbiddenAreas[first.type]) //Is the area of the starting turf a banned area? Is the turf a banned area?
@@ -818,7 +818,7 @@
return 0 //If it's not a buildable area, don't let them build in it.
-/proc/detect_new_area(var/turf/first, var/user) //Heavily simplified version for creating an area yourself.
+/proc/detect_new_area(turf/first, user) //Heavily simplified version for creating an area yourself.
if(!istype(first)) //Not on a turf.
to_chat(usr, span_warning("You can not create a room here."))
return
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 69bcc944ef..783b71414b 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -85,7 +85,7 @@
item_path = /obj/item/bodybag/large
//End of Yawn add
-/obj/structure/closet/body_bag/attackby(var/obj/item/W as obj, mob/user as mob)
+/obj/structure/closet/body_bag/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/pen))
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null, MAX_NAME_LEN )
if (user.get_active_hand() != W)
@@ -109,7 +109,7 @@
cut_overlays()
return
-/obj/structure/closet/body_bag/store_mobs(var/stored_units)
+/obj/structure/closet/body_bag/store_mobs(stored_units)
contains_body = ..()
return contains_body
@@ -143,7 +143,7 @@
occupants += H
return occupants
-/obj/structure/closet/body_bag/proc/update(var/broadcast=0)
+/obj/structure/closet/body_bag/proc/update(broadcast=0)
if(istype(loc, /obj/structure/morgue))
var/obj/structure/morgue/M = loc
M.update(broadcast)
@@ -253,7 +253,7 @@
return tank.air_contents
..()
-/obj/structure/closet/body_bag/cryobag/proc/inject_occupant(var/mob/living/carbon/human/H)
+/obj/structure/closet/body_bag/cryobag/proc/inject_occupant(mob/living/carbon/human/H)
if(!syringe)
return
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index 941594fd1e..03a8224856 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -77,7 +77,7 @@
/// Snorting.
-/obj/item/reagent_containers/powder/attackby(var/obj/item/W, var/mob/living/user)
+/obj/item/reagent_containers/powder/attackby(obj/item/W, mob/living/user)
if(!ishuman(user)) /// You gotta be fleshy to snort the naughty drugs.
return ..()
diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm
index d762374d94..35e449f3aa 100644
--- a/code/game/objects/items/devices/advnifrepair.dm
+++ b/code/game/objects/items/devices/advnifrepair.dm
@@ -38,7 +38,7 @@
else
icon_state = initial(icon_state)
-/obj/item/nifrepairer/afterattack(var/atom/target, var/mob/user, var/proximity)
+/obj/item/nifrepairer/afterattack(atom/target, mob/user, proximity)
if(!target.is_open_container() || !target.reagents)
return 0
diff --git a/code/game/objects/items/devices/ai_detector.dm b/code/game/objects/items/devices/ai_detector.dm
index 2220f3d2cd..ddcba8a248 100644
--- a/code/game/objects/items/devices/ai_detector.dm
+++ b/code/game/objects/items/devices/ai_detector.dm
@@ -80,7 +80,7 @@
/obj/item/multitool/ai_detector/update_icon()
icon_state = "[initial(icon_state)][detect_state]"
-/obj/item/multitool/ai_detector/proc/update_warning(var/old_state, var/new_state)
+/obj/item/multitool/ai_detector/proc/update_warning(old_state, new_state)
var/mob/living/carrier = isliving(loc) ? loc : null
// Now to warn our holder, if the state changes.
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index a254d7cec9..404e64be41 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -101,7 +101,7 @@
else
icon_state = "aicard"
-/obj/item/aicard/proc/grab_ai(var/mob/living/silicon/ai/ai, var/mob/living/user)
+/obj/item/aicard/proc/grab_ai(mob/living/silicon/ai/ai, mob/living/user)
if(!ai.client && !ai.deployed_shell)
to_chat(user, span_danger("ERROR:") + " AI [ai.name] is offline. Unable to transfer.")
return 0
@@ -166,7 +166,7 @@
carded_ai.show_message(rendered, type)
..()
-/obj/item/aicard/relaymove(var/mob/user, var/direction)
+/obj/item/aicard/relaymove(mob/user, direction)
if(user.stat || user.stunned)
return
var/obj/item/rig/rig = src.get_rig()
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 24c9769bcc..cd922c0e27 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -73,7 +73,7 @@
flick("emppulse",T)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), T), 0.8 SECONDS, TIMER_DELETE_ME)
-/obj/item/chameleon/proc/disrupt(var/delete_dummy = 1)
+/obj/item/chameleon/proc/disrupt(delete_dummy = 1)
if(active_dummy)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
@@ -102,7 +102,7 @@
var/can_move = 1
var/obj/item/chameleon/master = null
-/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, var/obj/item/chameleon/C)
+/obj/effect/dummy/chameleon/proc/activate(obj/O, mob/M, new_icon, new_iconstate, new_overlays, obj/item/chameleon/C)
name = O.name
desc = O.desc
icon = new_icon
@@ -137,7 +137,7 @@
/obj/effect/dummy/chameleon/proc/allow_move()
can_move = 1
-/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction)
+/obj/effect/dummy/chameleon/relaymove(mob/user, direction)
if(istype(loc, /turf/space)) return //No magical space movement!
if(can_move)
diff --git a/code/game/objects/items/devices/communicator/cartridge.dm b/code/game/objects/items/devices/communicator/cartridge.dm
index 990ced7c2a..eda1074f55 100644
--- a/code/game/objects/items/devices/communicator/cartridge.dm
+++ b/code/game/objects/items/devices/communicator/cartridge.dm
@@ -322,7 +322,7 @@
// Updates status displays with a new message
// Copied from /obj/item/cartridge/proc/post_status(),
// code/game/objects/items/PDA/cart.dm, line 251
-/obj/item/commcard/proc/post_status(var/command, var/data1, var/data2)
+/obj/item/commcard/proc/post_status(command, data1, data2)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency)
return
@@ -350,7 +350,7 @@
frequency.post_signal(src, status_signal)
// Receives updates by external devices to the status displays
-/obj/item/commcard/receive_signal(var/datum/signal/signal, var/receive_method, var/receive_param)
+/obj/item/commcard/receive_signal(datum/signal/signal, receive_method, receive_param)
internal_data["stat_display_special"] = signal.data["command"]
switch(signal.data["command"])
if("message")
diff --git a/code/game/objects/items/devices/communicator/communicator.dm b/code/game/objects/items/devices/communicator/communicator.dm
index fd793989f8..a6ec97c401 100644
--- a/code/game/objects/items/devices/communicator/communicator.dm
+++ b/code/game/objects/items/devices/communicator/communicator.dm
@@ -242,7 +242,7 @@
// Proc: add_to_EPv2()
// Parameters: 1 (hex - a single hexadecimal character)
// Description: Called when someone is manually dialing with nanoUI. Adds colons when appropiate.
-/obj/item/communicator/proc/add_to_EPv2(var/hex)
+/obj/item/communicator/proc/add_to_EPv2(hex)
var/length = length(target_address)
if(length >= 24)
return
diff --git a/code/game/objects/items/devices/communicator/helper.dm b/code/game/objects/items/devices/communicator/helper.dm
index bc27b7acb2..fa58d66068 100644
--- a/code/game/objects/items/devices/communicator/helper.dm
+++ b/code/game/objects/items/devices/communicator/helper.dm
@@ -218,7 +218,7 @@
return sensors
// Information about the targeted powernet
-/obj/item/commcard/proc/get_powernet_target(var/target_sensor)
+/obj/item/commcard/proc/get_powernet_target(target_sensor)
if(!target_sensor)
return
diff --git a/code/game/objects/items/devices/communicator/messaging.dm b/code/game/objects/items/devices/communicator/messaging.dm
index 51e0fdb1de..df289b0191 100644
--- a/code/game/objects/items/devices/communicator/messaging.dm
+++ b/code/game/objects/items/devices/communicator/messaging.dm
@@ -2,7 +2,7 @@
// Parameters: 4 (origin atom - the source of the message's holder, origin_address - where the message came from, message - the message received,
// text - message text to send if message is of type "text")
// Description: Handles voice requests and invite messages originating from both real communicators and ghosts. Also includes a ping response and IM function.
-/obj/item/communicator/receive_exonet_message(var/atom/origin_atom, origin_address, message, text)
+/obj/item/communicator/receive_exonet_message(atom/origin_atom, origin_address, message, text)
if(message == "voice")
if(isobserver(origin_atom) || istype(origin_atom, /obj/item/communicator))
if(origin_atom in voice_invites)
@@ -53,7 +53,7 @@
// Parameters: 3 (candidate - the communicator wanting to message the device, origin_address - the address of the sender, text - the message)
// Description: Response to a communicator trying to message the device.
// Adds them to the list of people that have messaged this device and adds the message to the message list.
-/obj/item/communicator/proc/request_im(var/atom/candidate, var/origin_address, var/text)
+/obj/item/communicator/proc/request_im(atom/candidate, origin_address, text)
var/who = null
if(isobserver(candidate))
var/mob/observer/dead/ghost = candidate
diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm
index b53ddc407a..bec65f21af 100644
--- a/code/game/objects/items/devices/communicator/phone.dm
+++ b/code/game/objects/items/devices/communicator/phone.dm
@@ -20,7 +20,7 @@
// Proc: open_connection()
// Parameters: 2 (user - the person who initiated the connecting being opened, candidate - the communicator or observer that will connect to the device)
// Description: Typechecks the candidate, then calls the correct proc for further connecting.
-/obj/item/communicator/proc/open_connection(mob/user, var/atom/candidate)
+/obj/item/communicator/proc/open_connection(mob/user, atom/candidate)
if(isobserver(candidate))
voice_invites.Remove(candidate)
open_connection_to_ghost(user, candidate)
@@ -31,7 +31,7 @@
// Proc: open_connection_to_communicator()
// Parameters: 2 (user - the person who initiated this and will be receiving feedback information, candidate - someone else's communicator)
// Description: Adds the candidate and src to each other's communicating lists, allowing messages seen by the devices to be relayed.
-/obj/item/communicator/proc/open_connection_to_communicator(mob/user, var/atom/candidate)
+/obj/item/communicator/proc/open_connection_to_communicator(mob/user, atom/candidate)
if(!istype(candidate, /obj/item/communicator))
return
var/obj/item/communicator/comm = candidate
@@ -56,7 +56,7 @@
// Proc: open_connection_to_ghost()
// Parameters: 2 (user - the person who initiated this, candidate - the ghost that will be turned into a voice mob)
// Description: Pulls the candidate ghost from deadchat, makes a new voice mob, transfers their identity, then their client.
-/obj/item/communicator/proc/open_connection_to_ghost(mob/user, var/mob/candidate)
+/obj/item/communicator/proc/open_connection_to_ghost(mob/user, mob/candidate)
if(!isobserver(candidate))
return
//Handle moving the ghost into the new shell.
@@ -113,7 +113,7 @@
// Parameters: 3 (user - the user who initiated the disconnect, target - the mob or device being disconnected, reason - string shown when disconnected)
// Description: Deletes specific voice_mobs or disconnects communicators, and shows a message to everyone when doing so. If target is null, all communicators
// and voice mobs are removed.
-/obj/item/communicator/proc/close_connection(mob/user, var/atom/target, var/reason)
+/obj/item/communicator/proc/close_connection(mob/user, atom/target, reason)
if(voice_mobs.len == 0 && communicating.len == 0)
return
@@ -144,7 +144,7 @@
// Proc: request()
// Parameters: 1 (candidate - the ghost or communicator wanting to call the device)
// Description: Response to a communicator or observer trying to call the device. Adds them to the list of requesters
-/obj/item/communicator/proc/request(var/atom/candidate)
+/obj/item/communicator/proc/request(atom/candidate)
if(candidate in voice_requests)
return
var/who = null
@@ -179,7 +179,7 @@
// Proc: del_request()
// Parameters: 1 (candidate - the ghost or communicator to be declined)
// Description: Declines a request and cleans up both ends
-/obj/item/communicator/proc/del_request(var/atom/candidate)
+/obj/item/communicator/proc/del_request(atom/candidate)
if(!(candidate in voice_requests))
return
diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm
index 1959510bdb..05e88ce6d0 100644
--- a/code/game/objects/items/devices/defib.dm
+++ b/code/game/objects/items/devices/defib.dm
@@ -101,7 +101,7 @@
else
return ..()
-/obj/item/defib_kit/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/defib_kit/emag_act(remaining_charges, mob/user)
var/obj/item/shockpaddles/linked/paddles = get_paddles()
if(paddles)
. = paddles.emag_act(user)
@@ -181,7 +181,7 @@
var/cooldown = 0
var/busy = 0
-/obj/item/shockpaddles/proc/set_cooldown(var/delay)
+/obj/item/shockpaddles/proc/set_cooldown(delay)
cooldown = 1
update_icon()
@@ -306,10 +306,10 @@
blood_volume *= 0.9 //chompedit, 90% instead of 80%
return blood_volume < H.species.blood_volume*H.species.blood_level_fatal
-/obj/item/shockpaddles/proc/check_charge(var/charge_amt)
+/obj/item/shockpaddles/proc/check_charge(charge_amt)
return 0
-/obj/item/shockpaddles/proc/checked_use(var/charge_amt)
+/obj/item/shockpaddles/proc/checked_use(charge_amt)
return 0
/obj/item/shockpaddles/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
@@ -329,7 +329,7 @@
return ITEM_INTERACT_SUCCESS
//Since harm-intent now skips the delay for deliberate placement, you have to be able to hit them in combat in order to shock people.
-/obj/item/shockpaddles/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/shockpaddles/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(ishuman(target) && can_use(user, target))
busy = 1
update_icon()
@@ -410,7 +410,7 @@
log_and_message_admins("used \a [src] to revive [key_name(H)].")
-/obj/item/shockpaddles/proc/do_electrocute(mob/living/carbon/human/H, mob/user, var/target_zone)
+/obj/item/shockpaddles/proc/do_electrocute(mob/living/carbon/human/H, mob/user, target_zone)
var/obj/item/organ/external/affecting = H.get_organ(target_zone)
if(!affecting)
to_chat(user, span_warning("They are missing that body part!"))
@@ -498,7 +498,7 @@
H.setBrainLoss(brain_damage)
-/obj/item/shockpaddles/proc/make_announcement(var/message, var/msg_class)
+/obj/item/shockpaddles/proc/make_announcement(message, msg_class)
audible_message(span_bold(span_info("\The [src]") + " [message]"), span_info("\The [src] vibrates slightly."), runemessage = "buzz")
/obj/item/shockpaddles/emag_act(mob/user)
@@ -537,12 +537,12 @@
item_state = "defibpaddles0"
cooldowntime = (3 SECONDS)
-/obj/item/shockpaddles/robot/check_charge(var/charge_amt)
+/obj/item/shockpaddles/robot/check_charge(charge_amt)
if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
return (R.cell && R.cell.check_charge(charge_amt))
-/obj/item/shockpaddles/robot/checked_use(var/charge_amt)
+/obj/item/shockpaddles/robot/checked_use(charge_amt)
if(isrobot(src.loc))
var/mob/living/silicon/robot/R = src.loc
return (R.cell && R.cell.checked_use(charge_amt))
@@ -557,15 +557,15 @@
/*
Shockpaddles that are linked to a base unit
*/
-/obj/item/shockpaddles/linked/check_charge(var/charge_amt)
+/obj/item/shockpaddles/linked/check_charge(charge_amt)
var/obj/item/defib_kit/base_unit = tethered_host_item
return (base_unit.bcell && base_unit.bcell.check_charge(charge_amt))
-/obj/item/shockpaddles/linked/checked_use(var/charge_amt)
+/obj/item/shockpaddles/linked/checked_use(charge_amt)
var/obj/item/defib_kit/base_unit = tethered_host_item
return (base_unit.bcell && base_unit.bcell.checked_use(charge_amt))
-/obj/item/shockpaddles/linked/make_announcement(var/message, var/msg_class)
+/obj/item/shockpaddles/linked/make_announcement(message, msg_class)
var/obj/item/defib_kit/base_unit = tethered_host_item
base_unit.audible_message(span_infoplain(span_bold("\The [base_unit]") + " [message]"), span_info("\The [base_unit] vibrates slightly."))
@@ -585,10 +585,10 @@
if(fail_counter)
STOP_PROCESSING(SSobj, src)
-/obj/item/shockpaddles/standalone/check_charge(var/charge_amt)
+/obj/item/shockpaddles/standalone/check_charge(charge_amt)
return 1
-/obj/item/shockpaddles/standalone/checked_use(var/charge_amt)
+/obj/item/shockpaddles/standalone/checked_use(charge_amt)
radiation_pulse(
src,
max_range = 5,
diff --git a/code/game/objects/items/devices/denecrotizer_vr.dm b/code/game/objects/items/devices/denecrotizer_vr.dm
index d878fdb46e..4abc872344 100644
--- a/code/game/objects/items/devices/denecrotizer_vr.dm
+++ b/code/game/objects/items/devices/denecrotizer_vr.dm
@@ -119,7 +119,7 @@
var/revive_time = 30 SECONDS //Don't do this in combat
var/advanced = 1 //allows for ghosts to join mobs who get revived by this, and updates their faction to yours
-/obj/item/denecrotizer/examine(var/mob/user)
+/obj/item/denecrotizer/examine(mob/user)
. = ..()
var/cooldowntime = round((cooldown - (world.time - last_used)) * 0.1)
if(Adjacent(user))
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 1de2008a4e..7d1e28aef3 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -49,7 +49,7 @@
. = ..()
power_supply = new cell_type(src)
-/obj/item/flash/attackby(var/obj/item/W, var/mob/user)
+/obj/item/flash/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_SCREWDRIVER) && broken)
user.visible_message(span_infoplain(span_bold("\The [user]") + " starts trying to repair \the [src]'s bulb."))
if(do_after(user, (40 SECONDS + rand(0, 20 SECONDS)) * W.toolspeed, target = src) && can_repair)
@@ -92,7 +92,7 @@
return suit.cell
return null
-/obj/item/flash/proc/clown_check(var/mob/user)
+/obj/item/flash/proc/clown_check(mob/user)
if(user && CLUMSY_FAIL_CHANCE(user))
to_chat(user, span_warning("\The [src] slips out of your hand."))
user.drop_item()
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 33179f7439..d9fd72e56d 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -252,7 +252,7 @@
var/turf/T = get_turf(target)
OL.place_directional_light(T)
-/obj/item/flashlight/proc/flicker(var/amount = rand(10, 20), var/flicker_color, var/forced)
+/obj/item/flashlight/proc/flicker(amount = rand(10, 20), flicker_color, forced)
if(flickering)
return
if(!flicker_color)
@@ -276,7 +276,7 @@
/// original_on is if we were originally on or not.
/// OL is our overlay for lighting.
/// ticker is how many times we have flickered so far.
-/obj/item/flashlight/proc/do_flicker(var/amount = rand(10, 20), var/flicker_color, var/original_color, var/original_on, var/datum/component/overlay_lighting/OL, var/ticker)
+/obj/item/flashlight/proc/do_flicker(amount = rand(10, 20), flicker_color, original_color, original_on, datum/component/overlay_lighting/OL, ticker)
if(ticker >= amount) //We have flickered enough times. Terminate the cycle.
finish_flicker(original_color, original_on, OL)
return
@@ -286,7 +286,7 @@
playsound(src, 'sound/effects/light_flicker.ogg', 50, 1)
addtimer(CALLBACK(src, PROC_REF(do_flicker), amount, flicker_color, original_color, original_on, OL, ++ticker), rand(5,15), TIMER_DELETE_ME)
-/obj/item/flashlight/proc/finish_flicker(var/original_color, var/original_on, var/datum/component/overlay_lighting/OL)
+/obj/item/flashlight/proc/finish_flicker(original_color, original_on, datum/component/overlay_lighting/OL)
set_light_color(original_color)
OL.directional_atom?.color = original_color
on = original_on
diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm
index 5604ce210e..c0927ef198 100644
--- a/code/game/objects/items/devices/floor_painter.dm
+++ b/code/game/objects/items/devices/floor_painter.dm
@@ -41,7 +41,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
-/obj/item/floor_painter/afterattack(var/atom/A, var/mob/user, proximity, params)
+/obj/item/floor_painter/afterattack(atom/A, mob/user, proximity, params)
if(!proximity)
return
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 02600ab067..aa18db0204 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -101,7 +101,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
QDEL_NULL(compass)
. = ..()
-/obj/item/gps/proc/can_track(var/obj/item/gps/other, var/reachable_z_levels)
+/obj/item/gps/proc/can_track(obj/item/gps/other, reachable_z_levels)
if(!other.tracking || other.emped || other.hide_signal || is_vore_jammed(other))
return FALSE
var/turf/origin = get_turf(src)
@@ -115,7 +115,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
reachable_z_levels = reachable_z_levels || using_map.get_map_levels(origin.z, long_range)
return (target.z in reachable_z_levels)
-/obj/item/gps/proc/update_compass(atom/movable/source, var/update_compass_icon)
+/obj/item/gps/proc/update_compass(atom/movable/source, update_compass_icon)
SIGNAL_HANDLER
compass.hide_waypoints(FALSE)
var/turf/my_turf = get_turf(src)
diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm
index 2cd96d8506..25a49d8bb6 100644
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -32,7 +32,7 @@
hack_state = null
return ..()
-/obj/item/multitool/hacktool/attackby(var/obj/item/W, var/mob/user)
+/obj/item/multitool/hacktool/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_SCREWDRIVER))
in_hack_mode = !in_hack_mode
playsound(src, W.usesound, 50, 1)
@@ -68,7 +68,7 @@
D.close()
return 1
-/obj/item/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target)
+/obj/item/multitool/hacktool/proc/attempt_hack(mob/user, atom/target)
if(is_hacking)
to_chat(user, span_warning("You are already hacking!"))
return 0
@@ -137,13 +137,13 @@
A.unregister(OBSERVER_EVENT_DESTROY, src)
known_targets.Cut(max_known_targets + 1)
-/obj/item/multitool/hacktool/proc/on_target_destroy(var/target)
+/obj/item/multitool/hacktool/proc/on_target_destroy(target)
known_targets -= target
/datum/tgui_state/default/must_hack
var/obj/item/multitool/hacktool/hacktool
-/datum/tgui_state/default/must_hack/New(var/hacktool)
+/datum/tgui_state/default/must_hack/New(hacktool)
src.hacktool = hacktool
..()
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 7109cff49a..566b028581 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -30,7 +30,7 @@
/obj/item/laser_pointer/purple
pointer_icon_state = "purple_laser"
-/obj/item/laser_pointer/Initialize(mapload, var/laser_path)
+/obj/item/laser_pointer/Initialize(mapload, laser_path)
. = ..()
if(ispath(laser_path))
diode = new laser_path
@@ -68,12 +68,12 @@
..()
return
-/obj/item/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params)
+/obj/item/laser_pointer/afterattack(atom/target, mob/living/user, flag, params)
if(flag) //we're placing the object on a table or in backpack
return
laser_act(target, user)
-/obj/item/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user)
+/obj/item/laser_pointer/proc/laser_act(atom/target, mob/living/user)
if(!(user in (viewers(world.view,target))))
return
if(!(target in view(user, world.view)))
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 66c07bdd74..b0e894eadb 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -154,14 +154,14 @@
icon_state = "lightreplacer[emagged]"
-/obj/item/lightreplacer/proc/Use(var/mob/user)
+/obj/item/lightreplacer/proc/Use(mob/user)
playsound(src, 'sound/machines/click.ogg', 50, 1)
add_uses(-1)
return 1
// Negative numbers will subtract
-/obj/item/lightreplacer/proc/add_uses(var/amount = 1)
+/obj/item/lightreplacer/proc/add_uses(amount = 1)
uses = min(max(uses + amount, 0), max_uses)
@@ -173,13 +173,13 @@
bulb_shards = bulb_shards % shards_required
return new_bulbs
-/obj/item/lightreplacer/proc/Charge(var/mob/user, var/amount = 1)
+/obj/item/lightreplacer/proc/Charge(mob/user, amount = 1)
charge += amount
if(charge > 6)
add_uses(1)
charge = 0
-/obj/item/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U)
+/obj/item/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U)
if(target.status != LIGHT_OK)
if(CanUse(U))
@@ -211,7 +211,7 @@
to_chat(U, "There is a working [target.get_fitting_name()] already inserted.")
return
-/obj/item/lightreplacer/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/lightreplacer/emag_act(remaining_charges, mob/user)
emagged = !emagged
playsound(src, "sparks", 100, 1)
update_icon()
@@ -219,7 +219,7 @@
//Can you use it?
-/obj/item/lightreplacer/proc/CanUse(var/mob/living/user)
+/obj/item/lightreplacer/proc/CanUse(mob/living/user)
src.add_fingerprint(user)
//Not sure what else to check for. Maybe if clumsy?
if(uses > 0)
@@ -277,7 +277,7 @@
to_chat(user, span_infoplain("Painter color set."))
-/obj/item/lightpainter/proc/ColorLight(var/obj/machinery/light/target, var/mob/living/U)
+/obj/item/lightpainter/proc/ColorLight(obj/machinery/light/target, mob/living/U)
src.add_fingerprint(U)
diff --git a/code/game/objects/items/devices/locker_painter.dm b/code/game/objects/items/devices/locker_painter.dm
index a69eba55dd..d23954207b 100644
--- a/code/game/objects/items/devices/locker_painter.dm
+++ b/code/game/objects/items/devices/locker_painter.dm
@@ -72,7 +72,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
-/obj/item/closet_painter/afterattack(atom/A, var/mob/user, proximity)
+/obj/item/closet_painter/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 658c61f62d..7d3211b642 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -12,7 +12,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
-/obj/item/megaphone/proc/can_broadcast(var/mob/living/user)
+/obj/item/megaphone/proc/can_broadcast(mob/living/user)
if(user.client)
if(user.client.prefs.muted & MUTE_IC)
to_chat(user, span_warning("You cannot speak in IC (muted)."))
@@ -31,7 +31,7 @@
return FALSE
return TRUE
-/obj/item/megaphone/proc/do_broadcast(var/mob/living/user, var/message)
+/obj/item/megaphone/proc/do_broadcast(mob/living/user, message)
if(emagged)
if(insults)
var/insult = pick(insultmsg)
@@ -57,7 +57,7 @@
spamcheck = world.time + 20
do_broadcast(user, message)
-/obj/item/megaphone/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/megaphone/emag_act(remaining_charges, mob/user)
if(!emagged)
to_chat(user, span_warning("You overload [src]'s voice synthesizer."))
emagged = TRUE
@@ -78,7 +78,7 @@
insultmsg = list("HONK?!", "HONK!", "HOOOOOOOONK!", "...!", "HUNK.", "Honk?")
-/obj/item/megaphone/super/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/megaphone/super/emag_act(remaining_charges, mob/user)
..()
if(emagged)
if(!(11 in volume_options))
@@ -103,7 +103,7 @@
adjust_volume(usr)
-/obj/item/megaphone/super/proc/adjust_volume(var/mob/living/user)
+/obj/item/megaphone/super/proc/adjust_volume(mob/living/user)
var/new_volume = tgui_input_list(user, "Set Volume", "Set Volume", volume_options)
if(new_volume && Adjacent(user))
@@ -116,7 +116,7 @@
adjust_font(usr)
-/obj/item/megaphone/super/proc/adjust_font(var/mob/living/user)
+/obj/item/megaphone/super/proc/adjust_font(mob/living/user)
var/new_font = tgui_input_list(user, "Set Volume", "Set Volume", font_options)
if(new_font && Adjacent(user))
@@ -129,13 +129,13 @@
adjust_color(usr)
-/obj/item/megaphone/super/proc/adjust_color(var/mob/living/user)
+/obj/item/megaphone/super/proc/adjust_color(mob/living/user)
var/new_color = tgui_input_list(user, "Set Volume", "Set Volume", color_options)
if(new_color && Adjacent(user))
broadcast_color = new_color
-/obj/item/megaphone/super/do_broadcast(var/mob/living/user, var/message)
+/obj/item/megaphone/super/do_broadcast(mob/living/user, message)
if(emagged)
if(insults)
var/insult = pick(insultmsg)
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index cd50f21aa1..ed30c8ced1 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -404,7 +404,7 @@
return
setEmotion(16)
-/obj/item/paicard/attackby(var/obj/item/I as obj, mob/user as mob)
+/obj/item/paicard/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I,/obj/item/tool/screwdriver))
if(panel_open)
panel_open = FALSE
@@ -882,6 +882,6 @@
/obj/random/paicard/item_to_spawn()
return pick(/obj/item/paicard ,/obj/item/paicard/typeb)
-/obj/item/paicard/digest_act(var/atom/movable/item_storage = null)
+/obj/item/paicard/digest_act(atom/movable/item_storage = null)
if(pai.digestable)
return ..()
diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm
index 6409103672..c5ac714dea 100644
--- a/code/game/objects/items/devices/personal_shield_generator_vr.dm
+++ b/code/game/objects/items/devices/personal_shield_generator_vr.dm
@@ -226,7 +226,7 @@
// Making it so emagging the weapon it comes with would also be a good idea. Different modes, perhaps?
/*
-/obj/item/personal_shield_generator/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/personal_shield_generator/emag_act(remaining_charges, mob/user)
if(active_weapon)
. = active_weapon.emag_act(user)
update_icon()
@@ -440,16 +440,16 @@
if(shield_generator)
shield_generator.reattach_gun(user)
-/obj/item/gun/energy/proc/check_charge(var/charge_amt) //In case using any other guns.
+/obj/item/gun/energy/proc/check_charge(charge_amt) //In case using any other guns.
return 0
-/obj/item/gun/energy/proc/checked_use(var/charge_amt) //In case using any other guns.
+/obj/item/gun/energy/proc/checked_use(charge_amt) //In case using any other guns.
return 0
-/obj/item/gun/energy/gun/generator/check_charge(var/charge_amt)
+/obj/item/gun/energy/gun/generator/check_charge(charge_amt)
return (shield_generator.bcell && shield_generator.bcell.check_charge(charge_amt))
-/obj/item/gun/energy/gun/generator/checked_use(var/charge_amt)
+/obj/item/gun/energy/gun/generator/checked_use(charge_amt)
return (shield_generator.bcell && shield_generator.bcell.checked_use(charge_amt))
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index bd62025e1e..cb2cbf8cb4 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -31,7 +31,7 @@
STOP_PROCESSING_POWER_OBJECT(src)
. = ..()
-/obj/item/powersink/attackby(var/obj/item/I, var/mob/user)
+/obj/item/powersink/attackby(obj/item/I, mob/user)
if(I.has_tool_quality(TOOL_SCREWDRIVER))
if(mode == 0)
var/turf/T = loc
@@ -67,7 +67,7 @@
/obj/item/powersink/attack_ai()
return
-/obj/item/powersink/attack_hand(var/mob/user)
+/obj/item/powersink/attack_hand(mob/user)
switch(mode)
if(0)
..()
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index ee55ae1230..3e7a4c78cb 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -38,7 +38,7 @@
keyslot2 = null
return ..()
-/obj/item/radio/headset/list_channels(var/mob/user)
+/obj/item/radio/headset/list_channels(mob/user)
return list_secure_channels()
/obj/item/radio/headset/examine(mob/user)
@@ -75,7 +75,7 @@
return ..(freq, level)
return -1
-/obj/item/radio/headset/get_worn_icon_state(var/slot_name)
+/obj/item/radio/headset/get_worn_icon_state(slot_name)
var/append = ""
if(icon_override)
switch(slot_name)
@@ -144,7 +144,7 @@
return
-/obj/item/radio/headset/recalculateChannels(var/setDescription = FALSE)
+/obj/item/radio/headset/recalculateChannels(setDescription = FALSE)
src.channels = list()
src.translate_binary = FALSE
src.translate_hive = FALSE
@@ -184,7 +184,7 @@
handle_finalize_recalculatechannels(setDescription, TRUE)
-/obj/item/radio/headset/proc/handle_finalize_recalculatechannels(var/setDescription = FALSE, var/initial_run = FALSE)
+/obj/item/radio/headset/proc/handle_finalize_recalculatechannels(setDescription = FALSE, initial_run = FALSE)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!SSradio && initial_run)
@@ -216,7 +216,7 @@
return ..(freq, level, 1)
return -1
-/obj/item/radio/headset/mob_headset/afterattack(var/atom/movable/target, mob/living/user, proximity)
+/obj/item/radio/headset/mob_headset/afterattack(atom/movable/target, mob/living/user, proximity)
if(!proximity)
return
if(isanimal(target))
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index e0f92dfaad..50a50070c6 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -213,11 +213,11 @@
set_light_on(TRUE)
//VOREStation Add Start
-/obj/item/radio/intercom/ctrl_click_ai(var/mob/user)
+/obj/item/radio/intercom/ctrl_click_ai(mob/user)
ToggleBroadcast()
to_chat(user, span_notice("\The [src]'s microphone is now [broadcasting ? "enabled" : "disabled"]."))
-/obj/item/radio/intercom/AIAltClick(var/mob/user)
+/obj/item/radio/intercom/AIAltClick(mob/user)
if(frequency == AI_FREQ)
set_frequency(initial(frequency))
to_chat(user, span_notice("\The [src]'s frequency is now set to [span_green(span_bold("Default"))]."))
@@ -228,7 +228,7 @@
/obj/item/radio/intercom/locked
var/locked_frequency
-/obj/item/radio/intercom/locked/set_frequency(var/frequency)
+/obj/item/radio/intercom/locked/set_frequency(frequency)
if(frequency == locked_frequency)
..(locked_frequency)
diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm
index e65574cac8..e3973092f1 100644
--- a/code/game/objects/items/devices/radio/jammer.dm
+++ b/code/game/objects/items/devices/radio/jammer.dm
@@ -1,6 +1,6 @@
GLOBAL_LIST_EMPTY(active_radio_jammers)
-/proc/is_jammed(var/obj/radio)
+/proc/is_jammed(obj/radio)
var/turf/Tr = get_turf(radio)
if(!Tr) return 0 //Nullspace radios don't get jammed.
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index cdfe071341..abd0d65c68 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -179,10 +179,10 @@
return data
-/obj/item/radio/proc/list_channels(var/mob/user)
+/obj/item/radio/proc/list_channels(mob/user)
return list_internal_channels(user)
-/obj/item/radio/proc/list_secure_channels(var/mob/user)
+/obj/item/radio/proc/list_secure_channels(mob/user)
var/dat[0]
for(var/ch_name in channels)
@@ -193,7 +193,7 @@
return dat
-/obj/item/radio/proc/list_internal_channels(var/mob/user)
+/obj/item/radio/proc/list_internal_channels(mob/user)
var/dat[0]
for(var/internal_chan in internal_channels)
if(has_channel_access(user, internal_chan))
@@ -201,7 +201,7 @@
return dat
-/obj/item/radio/proc/has_channel_access(var/mob/user, var/freq)
+/obj/item/radio/proc/has_channel_access(mob/user, freq)
if(!user)
return FALSE
@@ -210,14 +210,14 @@
return user.has_internal_radio_channel_access(internal_channels[freq])
-/mob/proc/has_internal_radio_channel_access(var/list/req_one_accesses)
+/mob/proc/has_internal_radio_channel_access(list/req_one_accesses)
var/obj/item/card/id/I = GetIdCard()
return has_access(list(), req_one_accesses, I ? I.GetAccess() : list())
-/mob/observer/dead/has_internal_radio_channel_access(var/list/req_one_accesses)
+/mob/observer/dead/has_internal_radio_channel_access(list/req_one_accesses)
return can_admin_interact()
-/obj/item/radio/proc/text_sec_channel(var/chan_name, var/chan_stat)
+/obj/item/radio/proc/text_sec_channel(chan_name, chan_stat)
var/list = !!(chan_stat&FREQ_LISTENING)!=0
return {"
[chan_name]
@@ -293,7 +293,7 @@
GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
-/obj/item/radio/proc/autosay(var/message, var/from, var/channel, var/list/zlevels, var/states)
+/obj/item/radio/proc/autosay(message, from, channel, list/zlevels, states)
if(!GLOB.autospeaker)
return
@@ -335,7 +335,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
// If we were to send to a channel we don't have, drop it.
return RADIO_CONNECTION_FAIL
-/obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, var/verb = "says")
+/obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, verb = "says")
if(!on)
return FALSE // the device has to be on
// Fix for permacell radios, but kinda eh about actually fixing them.
@@ -547,7 +547,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
filter_type, signal.data["compression"], using_map.get_map_levels(pos_z), connection.frequency, verb)
-/obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, var/verb = "says")
+/obj/item/radio/hear_talk(mob/M as mob, list/message_pieces, verb = "says")
if(broadcasting)
if(get_dist(src, M) <= canhear_range)
talk_into(M, message_pieces, null, verb)
@@ -649,7 +649,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
myborg = null
return ..()
-/obj/item/radio/borg/list_channels(var/mob/user)
+/obj/item/radio/borg/list_channels(mob/user)
return list_secure_channels(user)
/obj/item/radio/borg/talk_into()
@@ -724,7 +724,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
controller_check(TRUE)
return
-/obj/item/radio/borg/proc/controller_check(var/initial_run = FALSE)
+/obj/item/radio/borg/proc/controller_check(initial_run = FALSE)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!SSradio && initial_run)
diff --git a/code/game/objects/items/devices/radio/radiopack.dm b/code/game/objects/items/devices/radio/radiopack.dm
index 693cadacdb..2a0084865c 100644
--- a/code/game/objects/items/devices/radio/radiopack.dm
+++ b/code/game/objects/items/devices/radio/radiopack.dm
@@ -44,7 +44,7 @@
canhear_range = 1
item_flags = NOSTRIP
-/obj/item/radio/bluespacehandset/linked/receive_range(var/freq, var/list/level)
+/obj/item/radio/bluespacehandset/linked/receive_range(freq, list/level)
//Only care about megabroadcasts or things that are targeted at us
if(!(0 in level))
return -1
diff --git a/code/game/objects/items/devices/scanners/gas.dm b/code/game/objects/items/devices/scanners/gas.dm
index 09fb47a61b..f1921974f3 100644
--- a/code/game/objects/items/devices/scanners/gas.dm
+++ b/code/game/objects/items/devices/scanners/gas.dm
@@ -19,7 +19,7 @@
///Var for attack_self chain
var/special_handling = FALSE
-/obj/item/analyzer/atmosanalyze(var/mob/user)
+/obj/item/analyzer/atmosanalyze(mob/user)
var/air = user.return_air()
if (!air)
return
@@ -41,7 +41,7 @@
analyze_gases(src, user)
return
-/obj/item/analyzer/afterattack(var/obj/O, var/mob/user, var/proximity)
+/obj/item/analyzer/afterattack(obj/O, mob/user, proximity)
if(proximity)
analyze_gases(O, user)
return
diff --git a/code/game/objects/items/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm
index 3800a2c70d..f82117c288 100644
--- a/code/game/objects/items/devices/scanners/guide.dm
+++ b/code/game/objects/items/devices/scanners/guide.dm
@@ -12,7 +12,7 @@
guide = TRUE
icon_state = "health-g"
-/obj/item/healthanalyzer/proc/guide(var/mob/living/carbon/human/M, mob/living/user)
+/obj/item/healthanalyzer/proc/guide(mob/living/carbon/human/M, mob/living/user)
/* Enable this if you want non-medical users to be blocked from the guide. Kind of pointless, since the only ones that would really NEED the guide are non-medical users.
var/obj/item/card/id/ourid = user?.GetIdCard()
diff --git a/code/game/objects/items/devices/scanners/motion_tracker.dm b/code/game/objects/items/devices/scanners/motion_tracker.dm
index 747f0f8ada..e2fb6e1359 100644
--- a/code/game/objects/items/devices/scanners/motion_tracker.dm
+++ b/code/game/objects/items/devices/scanners/motion_tracker.dm
@@ -29,7 +29,7 @@
UnregisterSignal(SSmotiontracker, COMSIG_MOVABLE_MOTIONTRACKER)
. = ..()
-/obj/item/motiontracker/proc/handle_motion_tracking(mob/source, var/datum/weakref/RW, var/turf/T)
+/obj/item/motiontracker/proc/handle_motion_tracking(mob/source, datum/weakref/RW, turf/T)
SIGNAL_HANDLER
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
diff --git a/code/game/objects/items/devices/scanners/sleevemate.dm b/code/game/objects/items/devices/scanners/sleevemate.dm
index 6e634dc708..86d061f161 100644
--- a/code/game/objects/items/devices/scanners/sleevemate.dm
+++ b/code/game/objects/items/devices/scanners/sleevemate.dm
@@ -355,7 +355,7 @@ GLOBAL_DATUM(sleevemate_mob, /mob/living/carbon/human/dummy/mannequin)
else
icon_state = initial(icon_state)
-/obj/item/sleevemate/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/sleevemate/emag_act(remaining_charges, mob/user)
//CHOMPEdit Start
var/list/choices = list("Body Snatcher","Mind Binder")
var/choice = tgui_input_list(user, "How would you like to modify the [src]?", "", choices)
diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm
index 8e7287bdee..2a216c24b4 100644
--- a/code/game/objects/items/devices/spy_bug.dm
+++ b/code/game/objects/items/devices/spy_bug.dm
@@ -178,11 +178,11 @@
return
. = ..()
-/obj/item/bug_monitor/proc/unpair(var/obj/item/camerabug/SB)
+/obj/item/bug_monitor/proc/unpair(obj/item/camerabug/SB)
if(SB.camera in cameras)
cameras -= SB.camera
-/obj/item/bug_monitor/proc/pair(var/obj/item/camerabug/SB)
+/obj/item/bug_monitor/proc/pair(obj/item/camerabug/SB)
cameras += SB.camera
/obj/item/bug_monitor/proc/view_cameras(mob/user)
diff --git a/code/game/objects/items/devices/starcaster_ch.dm b/code/game/objects/items/devices/starcaster_ch.dm
index 7616319072..3a89fbdd98 100644
--- a/code/game/objects/items/devices/starcaster_ch.dm
+++ b/code/game/objects/items/devices/starcaster_ch.dm
@@ -99,7 +99,7 @@
if(.)
SSnanoui.update_uis(src)
-/obj/item/starcaster_news/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) //Also ripped from news_browser.dm. Fuck nanoUI
+/obj/item/starcaster_news/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) //Also ripped from news_browser.dm. Fuck nanoUI
var/obj/item/starcaster_news/PRG = src //If you're trying to understand this shit go to nano/templates/starcaster_ch.tmpl
var/list/data = list()
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index 23acdef434..b51e1012b1 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -116,7 +116,7 @@
START_PROCESSING(SSobj, src)
update_icon()
-/obj/item/suit_cooling_unit/proc/turn_off(var/failed)
+/obj/item/suit_cooling_unit/proc/turn_off(failed)
if(failed) visible_message("\The [src] clicks and whines as it powers down.")
on = 0
STOP_PROCESSING(SSobj, src)
@@ -142,7 +142,7 @@
toggle(user)
-/obj/item/suit_cooling_unit/proc/toggle(var/mob/user)
+/obj/item/suit_cooling_unit/proc/toggle(mob/user)
if(on)
turn_off()
else
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 28969a0196..5803894588 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -29,7 +29,7 @@
return TRUE
set_active(!on)
-/obj/item/t_scanner/proc/set_active(var/active)
+/obj/item/t_scanner/proc/set_active(active)
on = active
if(on)
START_PROCESSING(SSobj, src)
@@ -102,7 +102,7 @@
if(GLOB.overlay_cache.len > overlay_cache_LEN)
GLOB.overlay_cache.Cut(1, GLOB.overlay_cache.len-overlay_cache_LEN-1)
-/obj/item/t_scanner/proc/get_scanned_objects(var/scan_dist)
+/obj/item/t_scanner/proc/get_scanned_objects(scan_dist)
. = list()
var/turf/center = get_turf(src.loc)
@@ -119,7 +119,7 @@
continue //if it's already visible don't need an overlay for it
. += O
-/obj/item/t_scanner/proc/set_user_client(var/client/new_client)
+/obj/item/t_scanner/proc/set_user_client(client/new_client)
if(new_client == user_client)
return
if(user_client)
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index f0f665e4c4..25dcbdfba3 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -105,7 +105,7 @@
mytape.record_speech("[voice] [verb], \"[msg]\"")
-/obj/item/taperecorder/see_emote(mob/M as mob, text, var/emote_type)
+/obj/item/taperecorder/see_emote(mob/M as mob, text, emote_type)
if(emote_type != 2) //only hearable emotes
return
if(mytape && recording)
@@ -123,7 +123,7 @@
if(mytape && recording)
mytape.record_noise("[strip_html_properly(recordedtext)]")
-/obj/item/taperecorder/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/taperecorder/emag_act(remaining_charges, mob/user)
if(emagged == 0)
emagged = 1
recording = 0
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index c12587e493..cedb9ea68d 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -119,7 +119,7 @@
update_icon()
add_fingerprint(ui.user)
-/obj/item/transfer_valve/proc/process_activation(var/obj/item/D)
+/obj/item/transfer_valve/proc/process_activation(obj/item/D)
if(toggle)
toggle = FALSE
toggle_valve()
diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm
index fa199c788a..da2ce36405 100644
--- a/code/game/objects/items/devices/translocator_vr.dm
+++ b/code/game/objects/items/devices/translocator_vr.dm
@@ -100,7 +100,7 @@
/obj/item/perfect_tele/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
afterattack(M, user)
-/obj/item/perfect_tele/proc/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0)
+/obj/item/perfect_tele/proc/unload_ammo(mob/user, ignore_inactive_hand_check = 0)
if(battery_lock)
to_chat(user,span_notice("[src] does not have a battery port."))
return
@@ -112,14 +112,14 @@
else
to_chat(user,span_notice("[src] does not have a power cell."))
-/obj/item/perfect_tele/proc/check_menu(var/mob/living/user)
+/obj/item/perfect_tele/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
if(user.incapacitated() || !user.Adjacent(src))
return FALSE
return TRUE
-/obj/item/perfect_tele/attack_self(mob/user, list/modifiers, var/radial_menu_anchor = src)
+/obj/item/perfect_tele/attack_self(mob/user, list/modifiers, radial_menu_anchor = src)
. = ..(user)
if(.)
return TRUE
@@ -353,7 +353,7 @@ This device records all warnings given and teleport events for admin review in c
logged_events["[world.time]"] = "[user] teleported [target] to [real_dest] [televored ? "(Belly: [lowertext(real_dest.name)])" : null]"
-/obj/item/perfect_tele/proc/phase_out(var/mob/M,var/turf/T)
+/obj/item/perfect_tele/proc/phase_out(mob/M,turf/T)
if(!M || !T)
return
@@ -363,7 +363,7 @@ This device records all warnings given and teleport events for admin review in c
playsound(T, "sparks", 50, 1)
anim(T,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
-/obj/item/perfect_tele/proc/phase_in(var/mob/M,var/turf/T)
+/obj/item/perfect_tele/proc/phase_in(mob/M,turf/T)
if(!M || !T)
return
@@ -484,7 +484,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/perfect_tele_beacon/stat
var/phase_power = 75
var/recharging = 0
-/obj/item/perfect_tele/frontier/unload_ammo(mob/user, var/ignore_inactive_hand_check = 0)
+/obj/item/perfect_tele/frontier/unload_ammo(mob/user, ignore_inactive_hand_check = 0)
if(recharging)
return
recharging = 1
diff --git a/code/game/objects/items/devices/tvcamera.dm b/code/game/objects/items/devices/tvcamera.dm
index 13f1832e87..4e3d5fa130 100644
--- a/code/game/objects/items/devices/tvcamera.dm
+++ b/code/game/objects/items/devices/tvcamera.dm
@@ -331,7 +331,7 @@
//Assembly by roboticist
-/obj/item/robot_parts/head/attackby(var/obj/item/assembly/S, mob/user as mob)
+/obj/item/robot_parts/head/attackby(obj/item/assembly/S, mob/user as mob)
if(!istype(S, /obj/item/assembly/infra))
..()
return
diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm
index e4e2bfc147..7f8c4a2646 100644
--- a/code/game/objects/items/devices/uplink.dm
+++ b/code/game/objects/items/devices/uplink.dm
@@ -31,7 +31,7 @@
. = ..()
addtimer(CALLBACK(src, PROC_REF(next_offer)), offer_time) //It seems like only the /hidden type actually makes use of this...
-/obj/item/uplink/get_item_cost(var/item_type, var/item_cost)
+/obj/item/uplink/get_item_cost(item_type, item_cost)
return (discount_item && (item_type == discount_item)) ? max(1, round(item_cost*discount_amount)) : item_cost
/obj/item/uplink/proc/next_offer()
@@ -82,7 +82,7 @@
// Checks to see if the value meets the target. Like a frequency being a traitor_frequency, in order to unlock a headset.
// If true, it accesses trigger() and returns 1. If it fails, it returns false. Use this to see if you need to close the
// current item's menu.
-/obj/item/uplink/hidden/proc/check_trigger(mob/user as mob, var/value, var/target)
+/obj/item/uplink/hidden/proc/check_trigger(mob/user as mob, value, target)
if(value == target)
trigger(user)
return TRUE
diff --git a/code/game/objects/items/devices/uplink_random_lists.dm b/code/game/objects/items/devices/uplink_random_lists.dm
index 444eb07bbc..1e2f1ac077 100644
--- a/code/game/objects/items/devices/uplink_random_lists.dm
+++ b/code/game/objects/items/devices/uplink_random_lists.dm
@@ -7,7 +7,7 @@ GLOBAL_DATUM_INIT(all_uplink_selection, /datum/uplink_random_selection/all, new)
var/reselect_probability // Probability that we'll decide to keep this item if previously selected.
// Is done together with the keep_probability check. Being selected more than once does not affect this probability.
-/datum/uplink_random_item/New(var/uplink_item, var/keep_probability = 100, var/reselect_propbability = 33)
+/datum/uplink_random_item/New(uplink_item, keep_probability = 100, reselect_propbability = 33)
..()
src.uplink_item = uplink_item
src.keep_probability = keep_probability
@@ -22,7 +22,7 @@ GLOBAL_DATUM_INIT(all_uplink_selection, /datum/uplink_random_selection/all, new)
items = list()
all_items = list()
-/datum/uplink_random_selection/proc/get_random_item(var/telecrystals, var/obj/item/uplink/U, var/list/bought_items, var/items_override = 0)
+/datum/uplink_random_selection/proc/get_random_item(telecrystals, obj/item/uplink/U, list/bought_items, items_override = 0)
var/const/attempts = 50
for(var/i = 0; i < attempts; i++)
diff --git a/code/game/objects/items/devices/vacpack.dm b/code/game/objects/items/devices/vacpack.dm
index f65e915baa..45fa21c59f 100644
--- a/code/game/objects/items/devices/vacpack.dm
+++ b/code/game/objects/items/devices/vacpack.dm
@@ -335,7 +335,7 @@
return TRUE
return FALSE
-/obj/item/vac_attachment/resolve_attackby(atom/A, mob/user, var/attack_modifier = 1, var/click_parameters)
+/obj/item/vac_attachment/resolve_attackby(atom/A, mob/user, attack_modifier = 1, click_parameters)
if(istype(A,/obj/structure) && vac_power > 0)
afterattack(A.loc, user, click_parameters)
return TRUE
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 02f17762e4..d3d5ae73b6 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -54,7 +54,7 @@
spawn(20)
spamcheck = 0
-/obj/item/hailer/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/hailer/emag_act(remaining_charges, mob/user)
if(isnull(insults))
to_chat(user, span_danger("You overload \the [src]'s voice synthesizer."))
insults = rand(1, 3)//to prevent dickflooding
diff --git a/code/game/objects/items/falling_object_attack_vr.dm b/code/game/objects/items/falling_object_attack_vr.dm
index c9deb01717..197e4e77b8 100644
--- a/code/game/objects/items/falling_object_attack_vr.dm
+++ b/code/game/objects/items/falling_object_attack_vr.dm
@@ -30,7 +30,7 @@
. = ..()
icon_state = "[rand(1,33)]"
-/obj/effect/illusionary_fall/end_fall(var/crushing = FALSE)
+/obj/effect/illusionary_fall/end_fall(crushing = FALSE)
for(var/mob/living/L in loc)
var/target_zone = ran_zone()
var/blocked = L.run_armor_check(target_zone, "melee")
diff --git a/code/game/objects/items/falling_object_vr.dm b/code/game/objects/items/falling_object_vr.dm
index c596bd71cc..5fc680aa55 100644
--- a/code/game/objects/items/falling_object_vr.dm
+++ b/code/game/objects/items/falling_object_vr.dm
@@ -36,7 +36,7 @@
addtimer(CALLBACK(dropped, TYPE_PROC_REF(/atom/movable,end_fall), crushing), 0.7 SECONDS)
qdel(src)
-/atom/movable/proc/end_fall(var/crushing = FALSE)
+/atom/movable/proc/end_fall(crushing = FALSE)
if(isliving(src))
var/mob/living/L = src
for(var/mob/living/P in loc)
diff --git a/code/game/objects/items/glassjar.dm b/code/game/objects/items/glassjar.dm
index 74eb4d02e3..3ea46cdf67 100644
--- a/code/game/objects/items/glassjar.dm
+++ b/code/game/objects/items/glassjar.dm
@@ -26,7 +26,7 @@
. = ..()
update_icon()
-/obj/item/glass_jar/afterattack(var/atom/A, var/mob/user, var/proximity)
+/obj/item/glass_jar/afterattack(atom/A, mob/user, proximity)
if(!proximity || contains)
return
if(can_fill && !filled)
@@ -117,7 +117,7 @@
to_chat(M, span_warning("[user] shakes you out of \the [src]!"))
to_chat(user, span_notice("You shake [M] out of \the [src]!"))
//CHOMPADD END
-/obj/item/glass_jar/attackby(var/obj/item/W, var/mob/user)
+/obj/item/glass_jar/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/spacecash))
if(contains == JAR_NOTHING)
contains = JAR_MONEY
diff --git a/code/game/objects/items/leash.dm b/code/game/objects/items/leash.dm
index 9953de88e2..563c47340a 100644
--- a/code/game/objects/items/leash.dm
+++ b/code/game/objects/items/leash.dm
@@ -266,7 +266,7 @@
to_chat(leash_pet, span_userdanger("You have been released!"))
clear_leash()
-/obj/item/leash/proc/is_wearing_collar(var/mob/living/carbon/human/human)
+/obj/item/leash/proc/is_wearing_collar(mob/living/carbon/human/human)
if (!istype(human))
return FALSE
for (var/obj/item/clothing/worn in human.worn_clothing)
diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm
index abf1bd2350..63131ee4b3 100644
--- a/code/game/objects/items/paintkit.dm
+++ b/code/game/objects/items/paintkit.dm
@@ -14,17 +14,17 @@
. = ..()
. += "It has [uses] use\s left."
-/obj/item/kit/proc/use(var/amt, var/mob/user)
+/obj/item/kit/proc/use(amt, mob/user)
uses -= amt
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
if(uses<1)
user.drop_item()
qdel(src)
-/obj/item/kit/proc/can_customize(var/obj/item/I)
+/obj/item/kit/proc/can_customize(obj/item/I)
return is_type_in_list(I, allowed_types)
-/obj/item/kit/proc/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data)
+/obj/item/kit/proc/set_info(kit_name, kit_desc, kit_icon, kit_icon_file = CUSTOM_ITEM_OBJ, kit_icon_override_file = CUSTOM_ITEM_MOB, additional_data)
new_name = kit_name
new_desc = kit_desc
new_icon = kit_icon
@@ -34,7 +34,7 @@
for(var/path in splittext(additional_data, ", "))
allowed_types |= text2path(path)
-/obj/item/kit/proc/customize(var/obj/item/I, var/mob/user)
+/obj/item/kit/proc/customize(obj/item/I, mob/user)
if(can_customize(I))
I.name = new_name ? new_name : I.name
I.desc = new_desc ? new_desc : I.desc
@@ -65,16 +65,16 @@
uses = 2
var/new_light_overlay
-/obj/item/kit/suit/can_customize(var/obj/item/I)
+/obj/item/kit/suit/can_customize(obj/item/I)
return istype(I, /obj/item/clothing/head/helmet/space/void) || istype(I, /obj/item/clothing/suit/space/void) || istype(I, /obj/item/clothing/suit/storage/hooded)
-/obj/item/kit/suit/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data)
+/obj/item/kit/suit/set_info(kit_name, kit_desc, kit_icon, kit_icon_file = CUSTOM_ITEM_OBJ, kit_icon_override_file = CUSTOM_ITEM_MOB, additional_data)
..()
new_light_overlay = additional_data
-/obj/item/kit/suit/customize(var/obj/item/I, var/mob/user)
+/obj/item/kit/suit/customize(obj/item/I, mob/user)
if(can_customize(I))
if(istype(I, /obj/item/clothing/head/helmet/space/void))
var/obj/item/clothing/head/helmet/space/void/helmet = I
@@ -126,21 +126,21 @@
suit.species_restricted = list(H.species.get_bodytype(H))
use(1,user)
-/obj/item/clothing/head/helmet/space/void/attackby(var/obj/item/O, var/mob/user)
+/obj/item/clothing/head/helmet/space/void/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/kit/suit))
var/obj/item/kit/suit/kit = O
kit.customize(src, user)
return
return ..()
-/obj/item/clothing/suit/space/void/attackby(var/obj/item/O, var/mob/user)
+/obj/item/clothing/suit/space/void/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/kit/suit))
var/obj/item/kit/suit/kit = O
kit.customize(src, user)
return
return ..()
-/obj/item/clothing/suit/storage/hooded/attackby(var/obj/item/O, var/mob/user)
+/obj/item/clothing/suit/storage/hooded/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/kit/suit))
var/obj/item/kit/suit/kit = O
kit.customize(src, user)
@@ -152,7 +152,7 @@
desc = "A kit for modifying a rigsuit."
uses = 1
-/obj/item/kit/suit/rig/customize(var/obj/item/I, var/mob/user)
+/obj/item/kit/suit/rig/customize(obj/item/I, mob/user)
var/obj/item/rig/RIG = I
RIG.suit_state = new_icon
RIG.item_state = new_icon
@@ -185,10 +185,10 @@
H.light_overlay = new_light_overlay
use(1,user)
-/obj/item/kit/suit/rig/can_customize(var/obj/item/I)
+/obj/item/kit/suit/rig/can_customize(obj/item/I)
return istype(I, /obj/item/rig)
-/obj/item/rig/attackby(var/obj/item/O, var/mob/user)
+/obj/item/rig/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/kit/suit))
var/obj/item/kit/suit/rig/kit = O
kit.customize(src, user)
@@ -204,7 +204,7 @@
desc = "A kit containing all the needed tools and parts to repaint a mech."
var/removable = null
-/obj/item/kit/paint/can_customize(var/obj/mecha/M)
+/obj/item/kit/paint/can_customize(obj/mecha/M)
if(!istype(M))
return 0
@@ -212,7 +212,7 @@
if(type == M.initial_icon)
return 1
-/obj/item/kit/paint/set_info(var/kit_name, var/kit_desc, var/kit_icon, var/kit_icon_file = CUSTOM_ITEM_OBJ, var/kit_icon_override_file = CUSTOM_ITEM_MOB, var/additional_data)
+/obj/item/kit/paint/set_info(kit_name, kit_desc, kit_icon, kit_icon_file = CUSTOM_ITEM_OBJ, kit_icon_override_file = CUSTOM_ITEM_MOB, additional_data)
..()
allowed_types = splittext(additional_data, ", ")
@@ -225,7 +225,7 @@
for(var/exotype in allowed_types)
. += "- [capitalize(exotype)]"
-/obj/item/kit/paint/customize(var/obj/mecha/M, var/mob/user)
+/obj/item/kit/paint/customize(obj/mecha/M, mob/user)
if(!can_customize(M))
to_chat(user, "That kit isn't meant for use on this class of exosuit.")
return
@@ -243,7 +243,7 @@
M.update_icon()
use(1, user)
-/obj/mecha/attackby(var/obj/item/W, var/mob/user)
+/obj/mecha/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/kit/paint))
var/obj/item/kit/paint/P = W
P.customize(src, user)
diff --git a/code/game/objects/items/petrifier.dm b/code/game/objects/items/petrifier.dm
index 231302f5aa..e994c9ed6c 100644
--- a/code/game/objects/items/petrifier.dm
+++ b/code/game/objects/items/petrifier.dm
@@ -13,7 +13,7 @@
var/able_to_unpetrify = TRUE
var/obj/machinery/petrification/linked
-/obj/item/petrifier/Initialize(mapload, var/to_link)
+/obj/item/petrifier/Initialize(mapload, to_link)
. = ..()
linked = to_link
diff --git a/code/game/objects/items/pizza_voucher_vr.dm b/code/game/objects/items/pizza_voucher_vr.dm
index fb6fddcb26..605de4ec1b 100644
--- a/code/game/objects/items/pizza_voucher_vr.dm
+++ b/code/game/objects/items/pizza_voucher_vr.dm
@@ -40,7 +40,7 @@
else
to_chat(user, span_warning("The [src] is spent!"))
-/obj/item/pizzavoucher/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/pizzavoucher/emag_act(remaining_charges, mob/user)
if(spent)
to_chat(user, span_warning("The [src] is spent!"))
return
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 5f466af897..511cbc22cf 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -287,7 +287,7 @@
to_chat(user, span_notice("You insert the flash into the eye socket!"))
-/obj/item/robot_parts/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/robot_parts/emag_act(remaining_charges, mob/user)
if(sabotaged)
to_chat(user, span_warning("[src] is already sabotaged!"))
else
diff --git a/code/game/objects/items/sahoc_ch.dm b/code/game/objects/items/sahoc_ch.dm
index e7ce50367a..49aa0f0a30 100644
--- a/code/game/objects/items/sahoc_ch.dm
+++ b/code/game/objects/items/sahoc_ch.dm
@@ -138,7 +138,7 @@
"#0F0F0F",
)
-/obj/item/projectile/beam/sizelaser/chaos/on_hit(var/atom/target)
+/obj/item/projectile/beam/sizelaser/chaos/on_hit(atom/target)
light_color = pick(chaos_colors)
var/chaos = rand(25,200)
var/mob/living/M = target
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index c1cd471791..8f52688994 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -79,7 +79,7 @@
desc = "A shooting target with a threatening silhouette."
hp = 2350 // alium onest too kinda
-/obj/item/target/bullet_act(var/obj/item/projectile/Proj)
+/obj/item/target/bullet_act(obj/item/projectile/Proj)
var/p_x = Proj.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset Proj.p_x!"
var/p_y = Proj.p_y + pick(0,0,0,0,0,-1,1)
var/decaltype = 1 // 1 - scorch, 2 - bullet
@@ -160,7 +160,7 @@
var/b2y1 = 0
var/b2y2 = 0
-/datum/bullethole/New(var/obj/item/target/Target, var/pixel_x = 0, var/pixel_y = 0)
+/datum/bullethole/New(obj/item/target/Target, pixel_x = 0, pixel_y = 0)
if(!Target) return
// Randomize the first box
diff --git a/code/game/objects/items/soap.dm b/code/game/objects/items/soap.dm
index 88cbf8f389..07a9cacbe7 100644
--- a/code/game/objects/items/soap.dm
+++ b/code/game/objects/items/soap.dm
@@ -22,7 +22,7 @@
create_reagents(5)
. = ..()
-/obj/item/soap/proc/wet(var/cleaner = FALSE)
+/obj/item/soap/proc/wet(cleaner = FALSE)
if(cleaner)
reagents.add_reagent(REAGENT_ID_CLEANER, 5)
else
diff --git a/code/game/objects/items/stacks/matter_synth.dm b/code/game/objects/items/stacks/matter_synth.dm
index c35f62bfa7..f4d4bff6e9 100644
--- a/code/game/objects/items/stacks/matter_synth.dm
+++ b/code/game/objects/items/stacks/matter_synth.dm
@@ -4,7 +4,7 @@
var/recharge_rate = 2000
var/energy
-/datum/matter_synth/New(var/store = 0)
+/datum/matter_synth/New(store = 0)
if(store)
max_energy = store
energy = max_energy
@@ -13,13 +13,13 @@
/datum/matter_synth/proc/get_charge()
return energy
-/datum/matter_synth/proc/use_charge(var/amount)
+/datum/matter_synth/proc/use_charge(amount)
if (energy >= amount)
energy -= amount
return 1
return 0
-/datum/matter_synth/proc/add_charge(var/amount)
+/datum/matter_synth/proc/add_charge(amount)
energy = min(energy + amount, max_energy)
/datum/matter_synth/proc/emp_act(severity, recursive)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 247d5858e3..d642d60ab4 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -69,7 +69,7 @@
M.updatehealth()
return ITEM_INTERACT_SUCCESS
-/obj/item/stack/medical/proc/upgrade_stack(var/upgrade_amount)
+/obj/item/stack/medical/proc/upgrade_stack(upgrade_amount)
. = FALSE
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/stacks/sandbags.dm b/code/game/objects/items/stacks/sandbags.dm
index 1ce305ad5b..46d01a6e88 100644
--- a/code/game/objects/items/stacks/sandbags.dm
+++ b/code/game/objects/items/stacks/sandbags.dm
@@ -32,7 +32,7 @@
bag_material = MAT_SYNCLOTH
-/obj/item/stack/sandbags/Initialize(mapload, var/amt, var/bag_mat)
+/obj/item/stack/sandbags/Initialize(mapload, amt, bag_mat)
. = ..(mapload, amt)
recipes = GLOB.sandbag_recipes
update_icon()
@@ -48,7 +48,7 @@
slowdown = round(amount / 10, 0.1)
-/obj/item/stack/sandbags/produce_recipe(datum/stack_recipe/recipe, var/quantity, mob/user)
+/obj/item/stack/sandbags/produce_recipe(datum/stack_recipe/recipe, quantity, mob/user)
var/required = quantity*recipe.req_amount
var/produced = min(quantity*recipe.res_amount, recipe.max_res_amount)
@@ -130,7 +130,7 @@
var/bag_material = MAT_CLOTH
custom_handling = TRUE
-/obj/item/stack/emptysandbag/Initialize(mapload, var/amt, var/bag_mat)
+/obj/item/stack/emptysandbag/Initialize(mapload, amt, bag_mat)
. = ..(mapload, amt)
if(bag_mat)
bag_material = bag_mat
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 4a7d9d3628..2dcdadb4f0 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -34,7 +34,7 @@
var/beacons = FALSE
var/sandbags = FALSE
-/obj/item/stack/Initialize(mapload, var/starting_amount)
+/obj/item/stack/Initialize(mapload, starting_amount)
. = ..()
if(!stacktype)
stacktype = type
@@ -167,7 +167,7 @@
return FALSE
-/obj/item/stack/proc/produce_recipe(datum/stack_recipe/recipe, var/quantity, mob/user)
+/obj/item/stack/proc/produce_recipe(datum/stack_recipe/recipe, quantity, mob/user)
var/required = quantity*recipe.req_amount
var/produced = min(quantity*recipe.res_amount, recipe.max_res_amount)
@@ -258,7 +258,7 @@
//Return 1 if an immediate subsequent call to use() would succeed.
//Ensures that code dealing with stacks uses the same logic
-/obj/item/stack/proc/can_use(var/used)
+/obj/item/stack/proc/can_use(used)
if(used < 0 || (used != round(used)))
stack_trace("Tried to use a bad stack amount: [used]. Location: [src.loc] ([src.x],[src.y],[src.z])") //CHOMPEdit
return 0
@@ -266,7 +266,7 @@
return 0
return 1
-/obj/item/stack/proc/use(var/used)
+/obj/item/stack/proc/use(used)
if(!can_use(used))
return 0
if(!uses_charge)
@@ -287,7 +287,7 @@
S.use_charge(charge_costs[i] * used) // Doesn't need to be deleted
return 1
-/obj/item/stack/proc/add(var/extra)
+/obj/item/stack/proc/add(extra)
if(extra < 0 || (extra != round(extra)))
stack_trace("Tried to add a bad stack amount: [extra]. Location: [src.loc] ([src.x],[src.y],[src.z])") //CHOMPEdit
return 0
@@ -305,7 +305,7 @@
var/datum/matter_synth/S = synths[i]
S.add_charge(charge_costs[i] * extra)
-/obj/item/stack/proc/set_amount(var/new_amount, var/no_limits = FALSE)
+/obj/item/stack/proc/set_amount(new_amount, no_limits = FALSE)
if(new_amount < 0 || (new_amount != round(new_amount)))
stack_trace("Tried to set a bad stack amount: [new_amount]. Location: [src.loc] ([src.x],[src.y],[src.z])") //CHOMPEdit
return 0
@@ -333,7 +333,7 @@
*/
//attempts to transfer amount to S, and returns the amount actually transferred
-/obj/item/stack/proc/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)
+/obj/item/stack/proc/transfer_to(obj/item/stack/S, tamount=null, type_verified)
if (!get_amount())
return 0
if ((stacktype != S.stacktype) && !type_verified)
@@ -360,7 +360,7 @@
return 0
//creates a new stack with the specified amount
-/obj/item/stack/proc/split(var/tamount)
+/obj/item/stack/proc/split(tamount)
if (!amount)
return null
if(uses_charge)
diff --git a/code/game/objects/items/stacks/stack_vr.dm b/code/game/objects/items/stacks/stack_vr.dm
index 4539464819..74cdc79882 100644
--- a/code/game/objects/items/stacks/stack_vr.dm
+++ b/code/game/objects/items/stacks/stack_vr.dm
@@ -29,7 +29,7 @@
return FALSE
return TRUE
-/obj/item/stack/Crossed(var/atom/movable/AM)
+/obj/item/stack/Crossed(atom/movable/AM)
if(istype(AM, src.type)) // Sanity so we don't try to merge non-stacks.
if(can_merge(AM))
merge(AM)
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index 5ba3791995..f8381a1e52 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -10,7 +10,7 @@
force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things
custom_handling = TRUE
-/obj/item/stack/telecrystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/stack/telecrystal/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(amount >= 5)
target.visible_message(span_warning("\The [target] has been transported with \the [src] by \the [user]."))
safe_blink(target, 14)
diff --git a/code/game/objects/items/surplus_voucher_ch.dm b/code/game/objects/items/surplus_voucher_ch.dm
index 4177d6ab93..8a7bc91128 100644
--- a/code/game/objects/items/surplus_voucher_ch.dm
+++ b/code/game/objects/items/surplus_voucher_ch.dm
@@ -16,7 +16,7 @@
return TRUE
spawn_item(get_turf(src))
-/obj/item/surplus_voucher/com/proc/spawn_item(var/turf/T)
+/obj/item/surplus_voucher/com/proc/spawn_item(turf/T)
var/path = pick(prob(6);/obj/item/reagent_containers/food/drinks/bottle/whiskey,
prob(3);/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey,
prob(3);/obj/item/reagent_containers/food/drinks/bottle/vodka,
@@ -57,7 +57,7 @@
return TRUE
spawn_item(get_turf(src))
-/obj/item/surplus_voucher/eng/proc/spawn_item(var/turf/T)
+/obj/item/surplus_voucher/eng/proc/spawn_item(turf/T)
var/path = pick(prob(2);/obj/item/storage/briefcase/inflatable,
prob(2);/obj/item/clamp,
prob(3);/obj/item/extinguisher,
@@ -84,7 +84,7 @@
return TRUE
spawn_item(get_turf(src))
-/obj/item/surplus_voucher/med/proc/spawn_item(var/turf/T)
+/obj/item/surplus_voucher/med/proc/spawn_item(turf/T)
var/path = pick(prob(6);/obj/item/storage/firstaid/regular,
prob(6);/obj/item/storage/firstaid/fire,
prob(6);/obj/item/storage/firstaid/toxin,
@@ -117,7 +117,7 @@
return TRUE
spawn_item(get_turf(src))
-/obj/item/surplus_voucher/sci/proc/spawn_item(var/turf/T)
+/obj/item/surplus_voucher/sci/proc/spawn_item(turf/T)
var/path = pick(prob(1);/obj/item/kit/paint/ripley,
prob(1);/obj/item/kit/paint/ripley/death,
prob(1);/obj/item/kit/paint/ripley/flames_red,
@@ -150,7 +150,7 @@
return TRUE
spawn_item(get_turf(src))
-/obj/item/surplus_voucher/sec/proc/spawn_item(var/turf/T)
+/obj/item/surplus_voucher/sec/proc/spawn_item(turf/T)
var/path = pick(prob(2);/obj/item/storage/box/flashbangs,
prob(4);/obj/item/storage/box/flare,
prob(5);/obj/item/storage/box/donut,
@@ -176,7 +176,7 @@
return TRUE
spawn_item(get_turf(src))
-/obj/item/surplus_voucher/ser/proc/spawn_item(var/turf/T)
+/obj/item/surplus_voucher/ser/proc/spawn_item(turf/T)
var/path = pick(prob(4);/obj/item/reagent_containers/food/drinks/milk,
prob(4);/obj/item/reagent_containers/food/condiment/carton/flour,
prob(4);/obj/item/reagent_containers/food/drinks/soymilk,
diff --git a/code/game/objects/items/toys/mech_toys.dm b/code/game/objects/items/toys/mech_toys.dm
index 63c322927a..13a69b1445 100644
--- a/code/game/objects/items/toys/mech_toys.dm
+++ b/code/game/objects/items/toys/mech_toys.dm
@@ -71,7 +71,7 @@
* * opponent - (optional) the defender controller in the battle, for PvP
*/
-/obj/item/toy/mecha/proc/combat_sleep(var/delay, obj/item/toy/mecha/attacker, mob/living/carbon/attacker_controller, mob/living/carbon/opponent)
+/obj/item/toy/mecha/proc/combat_sleep(delay, obj/item/toy/mecha/attacker, mob/living/carbon/attacker_controller, mob/living/carbon/opponent)
if(!attacker_controller) // If the attacker for whatever reason is null, don't continue.
return FALSE
diff --git a/code/game/objects/items/toys/toys_ch.dm b/code/game/objects/items/toys/toys_ch.dm
index 54068d9a70..13ec2bfd35 100644
--- a/code/game/objects/items/toys/toys_ch.dm
+++ b/code/game/objects/items/toys/toys_ch.dm
@@ -56,13 +56,13 @@
icon_state = "seal-signet"
drop_sound = 'sound/items/drop/ring.ogg'
-/obj/item/clothing/gloves/ring/buzzer/toy/Touch(var/atom/A, var/proximity)
+/obj/item/clothing/gloves/ring/buzzer/toy/Touch(atom/A, proximity)
if(proximity && istype(usr, /mob/living/carbon/human))
return zap(usr, A, proximity)
return 0
-/obj/item/clothing/gloves/ring/buzzer/toy/zap(var/mob/living/carbon/human/user, var/atom/movable/target, var/proximity)
+/obj/item/clothing/gloves/ring/buzzer/toy/zap(mob/living/carbon/human/user, atom/movable/target, proximity)
. = FALSE
if(user.a_intent == I_HELP && battery.percent() >= 50)
if(isliving(target))
diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm
index a4d2780a6f..ec776822a6 100644
--- a/code/game/objects/items/toys/toys_vr.dm
+++ b/code/game/objects/items/toys/toys_vr.dm
@@ -1140,7 +1140,7 @@
icon_state = "monster_bait"
w_class = ITEMSIZE_SMALL
-/obj/item/toy/monster_bait/afterattack(var/atom/A, var/mob/user)
+/obj/item/toy/monster_bait/afterattack(atom/A, mob/user)
var/mob/living/simple_mob/M = A
if(M.z != user.z || get_dist(user,M) > 1)
to_chat(user, span_notice("You need to stand right next to \the [M] to bait it."))
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 372b7b77bd..405de40ed5 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -11,7 +11,7 @@
matter = list(MAT_STEEL = 30)
var/age = 0
-/obj/item/trash/Initialize(mapload, var/_age)
+/obj/item/trash/Initialize(mapload, _age)
. = ..()
if(!isnull(_age))
age = _age
diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm
index 89b5efc7cc..d10a165321 100644
--- a/code/game/objects/items/uav.dm
+++ b/code/game/objects/items/uav.dm
@@ -75,7 +75,7 @@
else if(health <= (initial(health)/2))
. += span_warning("It looks pretty beaten up...")
-/obj/item/uav/attack_hand(var/mob/user)
+/obj/item/uav/attack_hand(mob/user)
//Has to be on the ground to work with it properly
if(!isturf(loc))
return ..()
@@ -110,7 +110,7 @@
if(can_transition_to(state == UAV_PAIRING ? UAV_OFF : UAV_PAIRING, user))
return toggle_pairing(user)
-/obj/item/uav/attackby(var/obj/item/I, var/mob/user)
+/obj/item/uav/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/modular_computer) && state == UAV_PAIRING)
var/obj/item/modular_computer/MC = I
LAZYDISTINCTADD(MC.paired_uavs, WEAKREF(src))
@@ -146,7 +146,7 @@
else
return ..()
-/obj/item/uav/proc/can_transition_to(var/new_state, var/mob/user)
+/obj/item/uav/proc/can_transition_to(new_state, mob/user)
switch(state) //Current one
if(UAV_ON)
if(new_state == UAV_OFF || new_state == UAV_PACKED)
@@ -264,7 +264,7 @@
/obj/item/uav/get_cell()
return cell
-/obj/item/uav/relaymove(var/mob/user, direction, signal = 1)
+/obj/item/uav/relaymove(mob/user, direction, signal = 1)
if(signal && state == UAV_ON && (WEAKREF(user) in masters))
if(next_move <= world.time)
next_move = world.time + (1 SECOND/signal)
@@ -275,10 +275,10 @@
/obj/item/uav/proc/get_status_string()
return "[nickname] - [get_x(src)],[get_y(src)],[get_z(src)] - I:[health]/[initial(health)] - C:[cell ? "[cell.charge]/[cell.maxcharge]" : "Not Installed"]"
-/obj/item/uav/proc/add_master(var/mob/living/M)
+/obj/item/uav/proc/add_master(mob/living/M)
LAZYDISTINCTADD(masters, WEAKREF(M))
-/obj/item/uav/proc/remove_master(var/mob/living/M)
+/obj/item/uav/proc/remove_master(mob/living/M)
LAZYREMOVE(masters, WEAKREF(M))
/obj/item/uav/proc/start_hover()
@@ -301,7 +301,7 @@
ion_trail.stop()
animate(src, pixel_y = old_y, time = 5, easing = SINE_EASING | EASE_IN) //halt animation
-/obj/item/uav/hear_talk(var/mob/M, list/message_pieces, verb)
+/obj/item/uav/hear_talk(mob/M, list/message_pieces, verb)
var/name_used = M.GetVoice()
for(var/wr_master in masters)
var/datum/weakref/wr = wr_master
@@ -311,7 +311,7 @@
var/rendered = span_game(span_say(span_italics("UAV received: " + span_name("[name_used]") + " [message]")))
master.show_message(rendered, 2)
-/obj/item/uav/see_emote(var/mob/living/M, text)
+/obj/item/uav/see_emote(mob/living/M, text)
for(var/wr_master in masters)
var/datum/weakref/wr = wr_master
var/mob/master = wr.resolve()
@@ -325,12 +325,12 @@
var/rendered = span_game(span_say(span_italics("UAV received, " + span_message("[msg]"))))
master.show_message(rendered, type)
-/obj/item/uav/take_damage(var/damage)
+/obj/item/uav/take_damage(damage)
health -= damage
CheckHealth()
return
-/obj/item/uav/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/item/uav/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
playsound(src, 'sound/weapons/smash.ogg', 50, 1)
user.do_attack_animation(src)
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index a1a07945a9..b13ee81ff0 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -33,7 +33,7 @@ AI MODULES
else
. += span_infoplain("[law.get_index()]. [law.law]")
-/obj/item/aiModule/proc/install(var/atom/movable/AM, var/mob/living/user)
+/obj/item/aiModule/proc/install(atom/movable/AM, mob/living/user)
if(!user.IsAdvancedToolUser() && isanimal(user))
var/mob/living/simple_mob/S = user
if(!S.IsHumanoidToolUser(src))
@@ -114,7 +114,7 @@ AI MODULES
to_chat(R, span_notice("Law upload aborted."))
-/obj/item/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/proc/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
log_law_changes(target, sender)
if(laws)
@@ -125,12 +125,12 @@ AI MODULES
to_chat(target, "\The [sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ")
target.show_laws()
-/obj/item/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/proc/log_law_changes(mob/living/silicon/ai/target, mob/sender)
var/time = time2text(world.realtime,"hh:mm:ss")
GLOB.lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
log_and_message_admins("used [src.name] on [target.name]([target.key])")
-/obj/item/aiModule/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/proc/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
/******************** Modules ********************/
@@ -150,13 +150,13 @@ AI MODULES
targetName = targName
desc = text("A 'safeguard' AI module: 'Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.'", targetName, targetName)
-/obj/item/aiModule/safeguard/install(var/obj/machinery/computer/C, var/mob/living/user)
+/obj/item/aiModule/safeguard/install(obj/machinery/computer/C, mob/living/user)
if(!targetName)
to_chat(user, "No name detected on module, please enter one.")
return 0
..()
-/obj/item/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/safeguard/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = text("Safeguard []. Anyone threatening or attempting to harm [] is no longer to be considered a crew member, and is a threat which must be neutralized.", targetName, targetName)
target.add_supplied_law(9, law)
GLOB.lawchanges.Add("The law specified [targetName]")
@@ -177,13 +177,13 @@ AI MODULES
targetName = targName
desc = text("A 'one crew member' AI module: 'Only [] is a crew member.'", targetName)
-/obj/item/aiModule/oneHuman/install(var/obj/machinery/computer/C, var/mob/living/user)
+/obj/item/aiModule/oneHuman/install(obj/machinery/computer/C, mob/living/user)
if(!targetName)
to_chat(user, "No name detected on module, please enter one.")
return 0
return ..()
-/obj/item/aiModule/oneHuman/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/oneHuman/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "Only [targetName] is an crew member."
to_chat(target, law)
target.add_supplied_law(16, law)
@@ -194,7 +194,7 @@ AI MODULES
name = "\improper 'ProtectStation' AI module"
desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized.'" //made of gold
-/obj/item/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/protectStation/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "Protect the space station against damage. Anyone you see harming the station is no longer to be considered a crew member, and is a threat which must be neutralized."
target.add_supplied_law(10, law)
@@ -204,7 +204,7 @@ AI MODULES
name = "'PrototypeEngineOffline' AI Module"
desc = "A 'prototype engine offline' AI module: 'Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary.'"
-/obj/item/aiModule/prototypeEngineOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/prototypeEngineOffline/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "Keep the prototype engine offline at all costs. This overrides all inherent laws if necessary."
target.add_supplied_law(11, law)
@@ -214,7 +214,7 @@ AI MODULES
name = "'TeleporterOffline' AI Module"
desc = "A 'teleporter offline' AI module: 'Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member.'"
-/obj/item/aiModule/teleporterOffline/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/teleporterOffline/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is no longer to be considered a crew member."
target.add_supplied_law(12, law)
@@ -224,7 +224,7 @@ AI MODULES
name = "\improper 'Quarantine' AI module"
desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving.'"
-/obj/item/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/quarantine/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm crew members while preventing them from leaving."
target.add_supplied_law(13, law)
@@ -234,7 +234,7 @@ AI MODULES
name = "\improper 'OxygenIsToxicToCrewMembers' AI module"
desc = "A 'OxygenIsToxicToCrewMembers' AI module: 'Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member.'"
-/obj/item/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/oxygen/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member."
target.add_supplied_law(14, law)
@@ -258,14 +258,14 @@ AI MODULES
newFreeFormLaw = targName
desc = "A 'freeform' AI module: ([lawpos]) '[newFreeFormLaw]'"
-/obj/item/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/freeform/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "[newFreeFormLaw]"
if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER)
lawpos = MIN_SUPPLIED_LAW_NUMBER
target.add_supplied_law(lawpos, law)
GLOB.lawchanges.Add("The law was '[newFreeFormLaw]'")
-/obj/item/aiModule/freeform/install(var/obj/machinery/computer/C, var/mob/living/user)
+/obj/item/aiModule/freeform/install(obj/machinery/computer/C, mob/living/user)
if(!newFreeFormLaw)
to_chat(user, "No law detected on module, please create one.")
return 0
@@ -283,7 +283,7 @@ AI MODULES
. = ..()
laws = new using_map.default_law_type // Pull from loaded map
-/obj/item/aiModule/reset/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/reset/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
log_law_changes(target, sender)
if (!target.is_malf_or_traitor())
@@ -300,7 +300,7 @@ AI MODULES
name = "\improper 'Purge' AI module"
desc = "A 'purge' AI Module: 'Purges all laws.'"
-/obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/purge/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
log_law_changes(target, sender)
if (!target.is_malf_or_traitor())
@@ -369,12 +369,12 @@ AI MODULES
newFreeFormLaw = targName
desc = "A 'freeform' Core AI module: '[newFreeFormLaw]'"
-/obj/item/aiModule/freeformcore/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/freeformcore/addAdditionalLaws(mob/living/silicon/ai/target, mob/sender)
var/law = "[newFreeFormLaw]"
target.add_inherent_law(law)
GLOB.lawchanges.Add("The law is '[newFreeFormLaw]'")
-/obj/item/aiModule/freeformcore/install(var/obj/machinery/computer/C, var/mob/living/user)
+/obj/item/aiModule/freeformcore/install(obj/machinery/computer/C, mob/living/user)
if(!newFreeFormLaw)
to_chat(user, "No law detected on module, please create one.")
return 0
@@ -394,7 +394,7 @@ AI MODULES
newFreeFormLaw = targName
desc = "A hacked AI law module: '[newFreeFormLaw]'"
-/obj/item/aiModule/syndicate/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
+/obj/item/aiModule/syndicate/transmitInstructions(mob/living/silicon/ai/target, mob/sender)
// ..() //We don't want this module reporting to the AI who dun it. --NEO
log_law_changes(target, sender)
@@ -404,7 +404,7 @@ AI MODULES
target.add_ion_law(law)
target.show_laws()
-/obj/item/aiModule/syndicate/install(var/obj/machinery/computer/C, var/mob/living/user)
+/obj/item/aiModule/syndicate/install(obj/machinery/computer/C, mob/living/user)
if(!newFreeFormLaw)
to_chat(user, "No law detected on module, please create one.")
return 0
diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm
index 20392bf27f..ffe5a748e7 100644
--- a/code/game/objects/items/weapons/RCD_vr.dm
+++ b/code/game/objects/items/weapons/RCD_vr.dm
@@ -52,14 +52,14 @@
add_overlay("[initial(icon_state)]_charge[nearest_ten]")
-/obj/item/rcd/proc/perform_effect(var/atom/A, var/time_taken)
+/obj/item/rcd/proc/perform_effect(atom/A, time_taken)
effects[A] = new /obj/effect/constructing_effect(get_turf(A), time_taken, modes[mode_index])
/obj/item/rcd/use_rcd(atom/A, mob/living/user)
. = ..()
cleanup_effect(A)
-/obj/item/rcd/proc/cleanup_effect(var/atom/A)
+/obj/item/rcd/proc/cleanup_effect(atom/A)
if(A in effects)
qdel(effects[A])
effects -= A
@@ -210,7 +210,7 @@
. = ..()
update_icon(rcd_delay, rcd_status)
-/obj/effect/constructing_effect/update_icon(var/delay = 30, var/status)
+/obj/effect/constructing_effect/update_icon(delay = 30, status)
icon_state = "rcd"
if (delay < 10)
icon_state += "_shortest"
diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm
index 4df3681ea8..6ef1a5f014 100644
--- a/code/game/objects/items/weapons/RPD_vr.dm
+++ b/code/game/objects/items/weapons/RPD_vr.dm
@@ -267,7 +267,7 @@
else
return ..()
-/obj/item/pipe_dispenser/proc/build_effect(var/obj/P, var/time = 1.5)
+/obj/item/pipe_dispenser/proc/build_effect(obj/P, time = 1.5)
set waitfor = FALSE
P.filters += filter(type = "angular_blur", size = 30)
animate(P.filters[P.filters.len], size = 0, time = time)
@@ -277,7 +277,7 @@
P.filters -= outline
P.filters -= filter(type = "angular_blur", size = 0)
-/obj/item/pipe_dispenser/proc/animate_deletion(var/obj/P, var/time = 1.5)
+/obj/item/pipe_dispenser/proc/animate_deletion(obj/P, time = 1.5)
set waitfor = FALSE
P.filters += filter(type = "angular_blur", size = 0)
animate(P.filters[P.filters.len], size = 30, time = time)
@@ -289,7 +289,7 @@
/obj/item/pipe_dispenser/proc/activate()
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
-/obj/item/pipe_dispenser/proc/do_wrench(var/atom/target, mob/user)
+/obj/item/pipe_dispenser/proc/do_wrench(atom/target, mob/user)
var/resolved = target.attackby(tool,user)
if(!resolved && tool && target)
tool.afterattack(target,user,1)
diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm
index 8e75efb1fd..3eb0fcaeac 100644
--- a/code/game/objects/items/weapons/autopsy.dm
+++ b/code/game/objects/items/weapons/autopsy.dm
@@ -38,7 +38,7 @@
W.time_inflicted = time_inflicted
return W
-/obj/item/autopsy_scanner/proc/add_data(var/obj/item/organ/external/O)
+/obj/item/autopsy_scanner/proc/add_data(obj/item/organ/external/O)
if(!O.autopsy_data.len && !O.trace_chemicals.len) return
for(var/V in O.autopsy_data)
diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index ca755eb5cb..94867d7b3f 100644
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -44,7 +44,7 @@
light()
-/obj/item/flame/candle/proc/light(var/flavor_text = span_notice("\The [usr] lights the [src]."))
+/obj/item/flame/candle/proc/light(flavor_text = span_notice("\The [usr] lights the [src]."))
if(!lit)
lit = TRUE
visible_message(flavor_text)
diff --git a/code/game/objects/items/weapons/canes.dm b/code/game/objects/items/weapons/canes.dm
index e6c9b172ee..c3faf2e41c 100644
--- a/code/game/objects/items/weapons/canes.dm
+++ b/code/game/objects/items/weapons/canes.dm
@@ -42,7 +42,7 @@
concealed_blade = null
update_icon()
-/obj/item/cane/concealed/attackby(var/obj/item/material/butterfly/W, var/mob/user)
+/obj/item/cane/concealed/attackby(obj/item/material/butterfly/W, mob/user)
if(!src.concealed_blade && istype(W))
user.visible_message(span_warning("[user] has sheathed \a [W] into [user.p_their()] [src]!"), "You sheathe \the [W] into \the [src].")
playsound(src, 'sound/weapons/holster/sheathin.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm
index 756c9bf031..439e1084ec 100644
--- a/code/game/objects/items/weapons/capture_crystal.dm
+++ b/code/game/objects/items/weapons/capture_crystal.dm
@@ -490,14 +490,14 @@
thing.overlays += coolanimation
addtimer(CALLBACK(src, PROC_REF(animate_action_finished),thing,coolanimation), 1.1 SECOND, TIMER_DELETE_ME)
-/obj/item/capture_crystal/proc/animate_action_finished(atom/thing,var/image/coolanimation)
+/obj/item/capture_crystal/proc/animate_action_finished(atom/thing,image/coolanimation)
SHOULD_NOT_OVERRIDE(TRUE)
PROTECTED_PROC(TRUE)
thing.overlays -= coolanimation
qdel(coolanimation)
//IF the crystal somehow ends up in a tummy and digesting with a bound mob who doesn't want to be eaten, let's move them to the ground
-/obj/item/capture_crystal/digest_act(var/atom/movable/item_storage = null)
+/obj/item/capture_crystal/digest_act(atom/movable/item_storage = null)
if(bound_mob)
if((bound_mob in contents) && !bound_mob.devourable)
bound_mob.forceMove(src.drop_location())
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index 7f6f6dc1cf..a4dd20461c 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -37,7 +37,7 @@
if(wrapped)
slot_flags = null
-/obj/item/clothing/mask/chewable/equipped(var/mob/living/user, var/slot)
+/obj/item/clothing/mask/chewable/equipped(mob/living/user, slot)
..()
if(slot == slot_wear_mask)
var/mob/living/carbon/human/C = user
@@ -82,7 +82,7 @@
brand = "tobacco"
-/obj/item/clothing/mask/chewable/proc/spitout(var/transfer_color = 1, var/no_message = 0)
+/obj/item/clothing/mask/chewable/proc/spitout(transfer_color = 1, no_message = 0)
if(type_butt)
var/obj/item/butt = new type_butt(src.loc)
transfer_fingerprints_to(butt)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 5bd2ea4ad2..716ae1761a 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -60,7 +60,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
burn_out()
return ..()
-/obj/item/flame/match/proc/light(var/mob/user)
+/obj/item/flame/match/proc/light(mob/user)
playsound(src, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
lit = 1
damtype = "burn"
@@ -165,7 +165,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
else
. += "[src] is nearly burnt out!"
-/obj/item/clothing/mask/smokable/proc/light(var/flavor_text = "[usr] lights the [name].")
+/obj/item/clothing/mask/smokable/proc/light(flavor_text = "[usr] lights the [name].")
if(!src.lit)
src.lit = 1
playsound(src, 'sound/items/cigs_lighters/cig_light.ogg', 75, 1, -1)
@@ -190,7 +190,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
set_light(2, 0.25, "#E38F46")
START_PROCESSING(SSobj, src)
-/obj/item/clothing/mask/smokable/proc/die(var/nomessage = 0)
+/obj/item/clothing/mask/smokable/proc/die(nomessage = 0)
var/turf/T = get_turf(src)
set_light(0)
playsound(src, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
@@ -264,7 +264,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
text = replacetext(text, "FLAME", "[W.name]")
light(text)
-/obj/item/clothing/mask/smokable/attack(var/mob/living/M, var/mob/living/user, def_zone)
+/obj/item/clothing/mask/smokable/attack(mob/living/M, mob/living/user, def_zone)
if(istype(M) && M.on_fire)
user.do_attack_animation(M)
light(span_notice("[user] coldly lights the [name] with the burning body of [M]."))
diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
index 08cc44e3ed..09c9262450 100644
--- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
@@ -26,20 +26,20 @@
return ..()
//Called when the circuitboard is used to contruct a new machine.
-/obj/item/circuitboard/proc/construct(var/obj/machinery/M)
+/obj/item/circuitboard/proc/construct(obj/machinery/M)
if(istype(M, build_path))
return 1
return 0
//Called when a computer is deconstructed to produce a circuitboard.
//Only used by computers, as other machines store their circuitboard instance.
-/obj/item/circuitboard/atom_deconstruct(disassembled = TRUE, var/obj/machinery/M)
+/obj/item/circuitboard/atom_deconstruct(disassembled = TRUE, obj/machinery/M)
if(istype(M, build_path))
return 1
return 0
//Should be called from the constructor of any machine to automatically populate the default parts
-/obj/item/circuitboard/proc/apply_default_parts(var/obj/machinery/M)
+/obj/item/circuitboard/proc/apply_default_parts(obj/machinery/M)
if(!istype(M))
return
if(!req_components)
diff --git a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm
index d50a6adb55..42ecb35adb 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/air_management.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/air_management.dm
@@ -21,10 +21,10 @@
name = T_BOARD("injector control")
build_path = /obj/machinery/computer/general_air_control/fuel_injection
-/obj/item/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C)
+/obj/item/circuitboard/air_management/construct(obj/machinery/computer/general_air_control/C)
if (..(C))
C.frequency = frequency
-/obj/item/circuitboard/air_management/atom_deconstruct(disassembled = TRUE, var/obj/machinery/computer/general_air_control/C)
+/obj/item/circuitboard/air_management/atom_deconstruct(disassembled = TRUE, obj/machinery/computer/general_air_control/C)
if (..(C))
frequency = C.frequency
diff --git a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
index d3aee7eed7..1f9f538c9f 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
@@ -56,15 +56,15 @@
network = NETWORK_BODYCAM
// CHOMPEdit End
-/obj/item/circuitboard/security/construct(var/obj/machinery/computer/security/C)
+/obj/item/circuitboard/security/construct(obj/machinery/computer/security/C)
if (..(C))
C.set_network(network.Copy())
-/obj/item/circuitboard/security/atom_deconstruct(disassembled = TRUE, var/obj/machinery/computer/security/C)
+/obj/item/circuitboard/security/atom_deconstruct(disassembled = TRUE, obj/machinery/computer/security/C)
if (..(C))
network = C.network.Copy()
-/obj/item/circuitboard/security/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/circuitboard/security/emag_act(remaining_charges, mob/user)
if(emagged)
to_chat(user, "Circuit lock is already removed.")
return
diff --git a/code/game/objects/items/weapons/circuitboards/computer/supply.dm b/code/game/objects/items/weapons/circuitboards/computer/supply.dm
index 370c141c61..1d34fd0f94 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/supply.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/supply.dm
@@ -11,11 +11,11 @@
name = T_BOARD("supply ordering console")
build_path = /obj/machinery/computer/supplycomp/control
-/obj/item/circuitboard/supplycomp/construct(var/obj/machinery/computer/supplycomp/SC)
+/obj/item/circuitboard/supplycomp/construct(obj/machinery/computer/supplycomp/SC)
if (..(SC))
SC.can_order_contraband = contraband_enabled
-/obj/item/circuitboard/supplycomp/atom_deconstruct(disassembled = TRUE, var/obj/machinery/computer/supplycomp/SC)
+/obj/item/circuitboard/supplycomp/atom_deconstruct(disassembled = TRUE, obj/machinery/computer/supplycomp/SC)
if (..(SC))
contraband_enabled = SC.can_order_contraband
diff --git a/code/game/objects/items/weapons/circuitboards/machinery/power.dm b/code/game/objects/items/weapons/circuitboards/machinery/power.dm
index d604d523e8..b57b2464b9 100644
--- a/code/game/objects/items/weapons/circuitboards/machinery/power.dm
+++ b/code/game/objects/items/weapons/circuitboards/machinery/power.dm
@@ -8,7 +8,7 @@
board_type = new /datum/frame/frame_types/machine
req_components = list(/obj/item/smes_coil = 1, /obj/item/stack/cable_coil = 30)
-/obj/item/circuitboard/smes/construct(var/obj/machinery/power/smes/buildable/S)
+/obj/item/circuitboard/smes/construct(obj/machinery/power/smes/buildable/S)
if(..(S))
S.output_attempt = 0 //built SMES default to off
diff --git a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
index 5929006826..00e876a433 100644
--- a/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
+++ b/code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
@@ -5,7 +5,7 @@
/obj/item/circuitboard/unary_atmos
board_type = new /datum/frame/frame_types/machine
-/obj/item/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U)
+/obj/item/circuitboard/unary_atmos/construct(obj/machinery/atmospherics/unary/U)
//TODO: Move this stuff into the relevant constructor when pipe/construction.dm is cleaned up.
U.atmos_init()
U.build_network()
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index c85f1fce9f..0288de5763 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -31,34 +31,34 @@
//testing("[name]: DNA2 SE blocks after SetValue: [english_list(buf.dna.SE)]")
. = ..() // Traitgenes edit - Moved to init
-/obj/item/dnainjector/proc/GetRealBlock(var/selblock)
+/obj/item/dnainjector/proc/GetRealBlock(selblock)
if(selblock==0)
return block
else
return selblock
-/obj/item/dnainjector/proc/GetState(var/selblock=0)
+/obj/item/dnainjector/proc/GetState(selblock=0)
var/real_block=GetRealBlock(selblock)
if(buf.types&DNA2_BUF_SE)
return buf.dna.GetSEState(real_block)
else
return buf.dna.GetUIState(real_block)
-/obj/item/dnainjector/proc/SetState(var/on, var/selblock=0)
+/obj/item/dnainjector/proc/SetState(on, selblock=0)
var/real_block=GetRealBlock(selblock)
if(buf.types&DNA2_BUF_SE)
return buf.dna.SetSEState(real_block,on)
else
return buf.dna.SetUIState(real_block,on)
-/obj/item/dnainjector/proc/GetValue(var/selblock=0)
+/obj/item/dnainjector/proc/GetValue(selblock=0)
var/real_block=GetRealBlock(selblock)
if(buf.types&DNA2_BUF_SE)
return buf.dna.GetSEValue(real_block)
else
return buf.dna.GetUIValue(real_block)
-/obj/item/dnainjector/proc/SetValue(var/val,var/selblock=0)
+/obj/item/dnainjector/proc/SetValue(val,selblock=0)
var/real_block=GetRealBlock(selblock)
if(buf.types&DNA2_BUF_SE)
return buf.dna.SetSEValue(real_block,val)
@@ -148,7 +148,7 @@
// Traitgenes Injectors are randomized now due to no hardcoded genes. Split into good or bad, and then versions that specify what they do on the label.
// Otherwise scroll down further for how to make unique injectors
-/obj/item/dnainjector/proc/pick_block(var/datum/gene/trait/G, var/labeled, var/allow_disable, var/force_disable = FALSE)
+/obj/item/dnainjector/proc/pick_block(datum/gene/trait/G, labeled, allow_disable, force_disable = FALSE)
if(G)
block = G.block
datatype = DNA2_BUF_SE
diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
index da6a66ffbd..8098f39258 100644
--- a/code/game/objects/items/weapons/ecigs.dm
+++ b/code/game/objects/items/weapons/ecigs.dm
@@ -107,7 +107,7 @@
M.update_inv_r_hand(1)
-/obj/item/clothing/mask/smokable/ecig/attackby(var/obj/item/I, var/mob/user as mob)
+/obj/item/clothing/mask/smokable/ecig/attackby(obj/item/I, mob/user as mob)
if(istype(I, /obj/item/reagent_containers/ecig_cartridge))
if (ec_cartridge)//can't add second one
to_chat(user, span_notice("A cartridge has already been installed."))
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 35c37890f3..ff83e5c63d 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -26,7 +26,7 @@
wires = null
return ..()
-/obj/item/plastique/attackby(var/obj/item/I, var/mob/user)
+/obj/item/plastique/attackby(obj/item/I, mob/user)
if(I.has_tool_quality(TOOL_SCREWDRIVER))
open_panel = !open_panel
to_chat(user, span_notice("You [open_panel ? "open" : "close"] the wire panel."))
@@ -71,7 +71,7 @@
spawn(timer*10)
explode(get_turf(target))
-/obj/item/plastique/proc/explode(var/location)
+/obj/item/plastique/proc/explode(location)
if(!target)
target = get_atom_on_turf(src)
if(!target)
@@ -103,7 +103,7 @@
blast_light = 4
blast_flash = 7
-/obj/item/plastique/seismic/attackby(var/obj/item/I, var/mob/user)
+/obj/item/plastique/seismic/attackby(obj/item/I, mob/user)
. = ..()
if(open_panel)
if(istype(I, /obj/item/stock_parts/micro_laser))
diff --git a/code/game/objects/items/weapons/explosives_vr.dm b/code/game/objects/items/weapons/explosives_vr.dm
index b965f21652..9a5f4c866b 100644
--- a/code/game/objects/items/weapons/explosives_vr.dm
+++ b/code/game/objects/items/weapons/explosives_vr.dm
@@ -1,7 +1,7 @@
/obj/item/plastique/seismic/locked
desc = "Used to dig holes in specific areas without too much extra hole. Has extra mechanism that safely implodes the bomb if it is used in close proximity to the facility."
-/obj/item/plastique/seismic/locked/explode(var/location)
+/obj/item/plastique/seismic/locked/explode(location)
if(!target)
target = get_atom_on_turf(src)
if(!target)
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 9d0689b8bf..81df859e47 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -72,7 +72,7 @@
desc = "The safety is [safety ? "on" : "off"]."
to_chat(user, "The safety is [safety ? "on" : "off"].")
-/obj/item/extinguisher/proc/propel_object(var/obj/O, mob/user, movementdirection)
+/obj/item/extinguisher/proc/propel_object(obj/O, mob/user, movementdirection)
if(O.anchored) return
var/obj/structure/bed/chair/C
@@ -90,7 +90,7 @@
O.Move(get_step(user,movementdirection), movementdirection)
sleep(3)
-/obj/item/extinguisher/afterattack(var/atom/target, var/mob/user, var/flag)
+/obj/item/extinguisher/afterattack(atom/target, mob/user, flag)
//TODO; Add support for reagents in water.
if( istype(target, /obj/structure/reagent_dispensers) && flag)
diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
index dc0f577e4a..ee69c0fcfe 100644
--- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
@@ -7,7 +7,7 @@
var/light_sound = 'sound/effects/phasein.ogg'
var/blast_sound = 'sound/effects/bang.ogg'
-/obj/item/grenade/anti_photon/detonate(var/parent_callback = FALSE)
+/obj/item/grenade/anti_photon/detonate(parent_callback = FALSE)
if(parent_callback) // An awful way to do this, but the spawn() setup left me no choice when porting to timers
..()
return
@@ -17,7 +17,7 @@
var/extra_delay = rand(0,90)
addtimer(CALLBACK(src, PROC_REF(grenade_light),extra_delay), 200 + extra_delay, TIMER_DELETE_ME)
-/obj/item/grenade/anti_photon/proc/grenade_light(var/extra_delay)
+/obj/item/grenade/anti_photon/proc/grenade_light(extra_delay)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(prob(10+extra_delay))
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 924c0aafb2..ff85e089da 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -147,7 +147,7 @@
return
-/obj/item/grenade/chem_grenade/proc/primed(var/primed = 1)
+/obj/item/grenade/chem_grenade/proc/primed(primed = 1)
if(active)
icon_state = initial(icon_state) + (primed?"_primed":"_active")
diff --git a/code/game/objects/items/weapons/grenades/concussion.dm b/code/game/objects/items/weapons/grenades/concussion.dm
index 4305dbaedd..b469577f9e 100644
--- a/code/game/objects/items/weapons/grenades/concussion.dm
+++ b/code/game/objects/items/weapons/grenades/concussion.dm
@@ -14,7 +14,7 @@
qdel(src)
return
-/obj/proc/concussion_blast(atom/target, var/radius = 5)
+/obj/proc/concussion_blast(atom/target, radius = 5)
var/turf/T = get_turf(target)
if(is_below_sound_pressure(T))
visible_message(span_notice("Whump."))
diff --git a/code/game/objects/items/weapons/grenades/explosive.dm b/code/game/objects/items/weapons/grenades/explosive.dm
index db0ab41300..c0fc8abe2f 100644
--- a/code/game/objects/items/weapons/grenades/explosive.dm
+++ b/code/game/objects/items/weapons/grenades/explosive.dm
@@ -25,7 +25,7 @@
src.fragmentate(O, num_fragments, spread_range, fragment_types)
qdel(src)
-/obj/item/grenade/explosive/proc/on_explosion(var/turf/O)
+/obj/item/grenade/explosive/proc/on_explosion(turf/O)
if(explosion_size)
explosion(O, -1, -1, explosion_size, round(explosion_size/2), 0)
@@ -41,7 +41,7 @@
-/obj/proc/fragmentate(var/turf/T=get_turf(src), var/fragment_number = 30, var/spreading_range = 5, var/list/fragtypes=list(/obj/item/projectile/bullet/pellet/fragment/))
+/obj/proc/fragmentate(turf/T=get_turf(src), fragment_number = 30, spreading_range = 5, list/fragtypes=list(/obj/item/projectile/bullet/pellet/fragment/))
set waitfor = 0
var/list/target_turfs = getcircle(T, spreading_range)
var/fragments_per_projectile = round(fragment_number/target_turfs.len)
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index d35fd82836..152e9f65ea 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -26,7 +26,7 @@
qdel(src)
-/obj/item/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged.
+/obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/carbon/M) // Added a new proc called 'bang' that takes a location and a person to be banged.
if(M.is_incorporeal())
return
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 62939b8982..d50febbbec 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -22,7 +22,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
-/obj/item/grenade/proc/clown_check(var/mob/living/user)
+/obj/item/grenade/proc/clown_check(mob/living/user)
if(CLUMSY_HARM_CHANCE(user))
to_chat(user, span_warning("Huh? How does this thing work?"))
@@ -122,15 +122,15 @@
..()
return
-/obj/item/grenade/vendor_action(var/obj/machinery/vending/V)
+/obj/item/grenade/vendor_action(obj/machinery/vending/V)
activate(V)
-/obj/item/grenade/proc/start_effect_sprayer(var/datum/effect/effect/system/spraying, duration, sound_play, start_data = null)
+/obj/item/grenade/proc/start_effect_sprayer(datum/effect/effect/system/spraying, duration, sound_play, start_data = null)
playsound(loc, sound_play, 50, 1, -3)
spraying.set_up(10, 0, loc)
effect_spraying(spraying, duration, start_data)
-/obj/item/grenade/proc/effect_spraying(var/datum/effect/effect/system/spraying, duration, start_data)
+/obj/item/grenade/proc/effect_spraying(datum/effect/effect/system/spraying, duration, start_data)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
diff --git a/code/game/objects/items/weapons/grenades/projectile.dm b/code/game/objects/items/weapons/grenades/projectile.dm
index 4eace0436b..cce2377881 100644
--- a/code/game/objects/items/weapons/grenades/projectile.dm
+++ b/code/game/objects/items/weapons/grenades/projectile.dm
@@ -50,7 +50,7 @@
// This is just fragmentate, but less specific. Don't know how to make either of them less awful, at the moment
-/obj/proc/launch_many_projectiles(var/turf/T=get_turf(src), var/spreading_range = 5, var/list/projectiletypes=list(/obj/item/projectile/bullet/pistol/rubber))
+/obj/proc/launch_many_projectiles(turf/T=get_turf(src), spreading_range = 5, list/projectiletypes=list(/obj/item/projectile/bullet/pistol/rubber))
set waitfor = 0
var/list/target_turfs = getcircle(T, spreading_range)
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index e8e6dce125..e3e10c5265 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -100,7 +100,7 @@
else
return ..()
-/obj/item/grenade/spawnergrenade/manhacks/station/locked/emag_act(var/remaining_charges,var/mob/user)
+/obj/item/grenade/spawnergrenade/manhacks/station/locked/emag_act(remaining_charges,mob/user)
..()
locked = !locked
to_chat(user, span_warning("You [locked ? "enable" : "disable"] the safety lock on \the [src]!"))
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 5a6d3b9776..d51c149de1 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -20,7 +20,7 @@
var/use_time = 30
sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/teshari/handcuffs.dmi')
-/obj/item/handcuffs/get_worn_icon_state(var/slot_name)
+/obj/item/handcuffs/get_worn_icon_state(slot_name)
if(slot_name == slot_handcuffed_str)
return "handcuff1" //Simple
@@ -51,7 +51,7 @@
to_chat(user, span_danger("You need to have a firm grip on [C] before you can put \the [src] on!"))
return ITEM_INTERACT_FAILURE
-/obj/item/handcuffs/proc/can_place(var/mob/target, var/mob/user)
+/obj/item/handcuffs/proc/can_place(mob/target, mob/user)
if(user == target)
return 1
if(isrobot(user))
@@ -63,7 +63,7 @@
return 1
return 0
-/obj/item/handcuffs/proc/attempt_to_cuff(var/mob/living/carbon/victim, var/mob/user)
+/obj/item/handcuffs/proc/attempt_to_cuff(mob/living/carbon/victim, mob/user)
if(SEND_SIGNAL(victim, COMSIG_CARBON_CUFF_ATTEMPTED, user) & COMSIG_CARBON_CUFF_PREVENT)
victim.balloon_alert(user, "can't be handcuffed!")
return
@@ -111,14 +111,14 @@
victim.stop_pulling()
return 1
-/obj/item/handcuffs/equipped(var/mob/living/user,var/slot)
+/obj/item/handcuffs/equipped(mob/living/user,slot)
. = ..()
if(slot == slot_handcuffed)
user.drop_r_hand()
user.drop_l_hand()
user.stop_pulling()
-/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
+/mob/living/carbon/human/RestrainedClickOn(atom/A)
if (A != src) return ..()
if (last_chew + 26 > world.time) return
@@ -212,7 +212,7 @@
elastic = 0
cuff_sound = 'sound/weapons/handcuffs.ogg' //This shold work for now.
-/obj/item/handcuffs/legcuffs/get_worn_icon_state(var/slot_name)
+/obj/item/handcuffs/legcuffs/get_worn_icon_state(slot_name)
if(slot_name == slot_legcuffed_str)
return "legcuff1"
@@ -243,7 +243,7 @@
to_chat(user, span_danger("You need to have a firm grip on [C] before you can put \the [src] on!"))
return ITEM_INTERACT_FAILURE
-/obj/item/handcuffs/legcuffs/proc/place_legcuffs(var/mob/living/carbon/target, var/mob/user)
+/obj/item/handcuffs/legcuffs/proc/place_legcuffs(mob/living/carbon/target, mob/user)
playsound(src, cuff_sound, 30, 1, -2)
var/mob/living/carbon/human/H = target
@@ -289,7 +289,7 @@
target.hud_used.move_intent.icon_state = "walking"
return 1
-/obj/item/handcuffs/legcuffs/equipped(var/mob/living/user,var/slot)
+/obj/item/handcuffs/legcuffs/equipped(mob/living/user,slot)
. = ..()
if(slot == slot_legcuffed)
if(user.m_intent != I_WALK)
@@ -307,7 +307,7 @@
cuff_sound = 'sound/weapons/towelwipe.ogg' //Is there anything this sound can't do?
item_flags = DROPDEL
-/obj/item/handcuffs/legcuffs/bola/can_place(var/mob/target, var/mob/user)
+/obj/item/handcuffs/legcuffs/bola/can_place(mob/target, mob/user)
if(user) //A ranged legcuff, until proper implementation as items it remains a projectile-only thing.
return 1
@@ -317,7 +317,7 @@
..()
visible_message(span_infoplain(span_bold("\The [src]") + " falls apart!"))
-/obj/item/handcuffs/legcuffs/bola/place_legcuffs(var/mob/living/carbon/target, var/mob/user)
+/obj/item/handcuffs/legcuffs/bola/place_legcuffs(mob/living/carbon/target, mob/user)
playsound(src, cuff_sound, 30, 1, -2)
var/mob/living/carbon/human/H = target
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 2bd8fa0fc2..725bfb6249 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -32,7 +32,7 @@
if(0)
to_chat(usr, "The bag now picks up one seed pouch at a time.")
-/obj/item/seeds/attackby(var/obj/item/O, var/mob/user)
+/obj/item/seeds/attackby(obj/item/O, mob/user)
..()
if (istype(O, /obj/item/seedbag))
var/obj/item/seedbag/S = O
diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm
index 598b791ccc..957066edce 100644
--- a/code/game/objects/items/weapons/id cards/cards.dm
+++ b/code/game/objects/items/weapons/id cards/cards.dm
@@ -101,7 +101,7 @@
item_state = "card-id"
var/uses = 10
-/obj/item/card/emag/resolve_attackby(atom/A, mob/user, attack_modifier, var/click_parameters)
+/obj/item/card/emag/resolve_attackby(atom/A, mob/user, attack_modifier, click_parameters)
var/used_uses = A.emag_act(uses, user, src)
if(used_uses < 0)
return ..(A, user, click_parameters)
@@ -140,7 +140,7 @@
uses = 12
var/burnt_out = FALSE
-/obj/item/card/emag/borg/afterattack(atom/A, mob/user, proximity, var/click_parameters)
+/obj/item/card/emag/borg/afterattack(atom/A, mob/user, proximity, click_parameters)
if(!proximity || burnt_out) return
var/used_uses = A.emag_act(uses, user, src)
if(used_uses < 0)
diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm
index ac8e7014a8..3d6f1419d2 100644
--- a/code/game/objects/items/weapons/id cards/station_ids.dm
+++ b/code/game/objects/items/weapons/id cards/station_ids.dm
@@ -53,18 +53,18 @@
/obj/item/card/id/proc/update_name()
name = "[src.registered_name]'s ID Card ([src.assignment])"
-/obj/item/card/id/proc/set_id_photo(var/mob/M)
+/obj/item/card/id/proc/set_id_photo(mob/M)
M.ImmediateOverlayUpdate()
var/icon/F = getFlatIcon(M, defdir = SOUTH, no_anim = TRUE)
front = "'data:image/png;base64,[icon2base64(F)]'"
-/obj/item/card/id/proc/adjust_mining_points(var/points)
+/obj/item/card/id/proc/adjust_mining_points(points)
if(mining_points + points < 0)
return FALSE
mining_points += points
return TRUE
-/mob/proc/set_id_info(var/obj/item/card/id/id_card)
+/mob/proc/set_id_info(obj/item/card/id/id_card)
id_card.age = 0
id_card.registered_name = real_name
id_card.sex = capitalize(gender)
@@ -77,7 +77,7 @@
id_card.fingerprint_hash= md5(dna.uni_identity)
id_card.update_name()
-/mob/living/carbon/human/set_id_info(var/obj/item/card/id/id_card)
+/mob/living/carbon/human/set_id_info(obj/item/card/id/id_card)
..()
id_card.age = age
if(species.name == SPECIES_HANNER)
@@ -134,7 +134,7 @@
to_chat(usr, "The fingerprint hash on the card is [fingerprint_hash].")
return
-/obj/item/card/id/get_worn_icon_state(var/slot_name)
+/obj/item/card/id/get_worn_icon_state(slot_name)
if(slot_name == slot_wear_id_str)
return "id" //Legacy, just how it is. There's only one sprite.
@@ -436,7 +436,7 @@
configured = TRUE
to_chat(user, span_notice("Card settings set."))
-/obj/item/card/id/event/attackby(obj/item/I, var/mob/user)
+/obj/item/card/id/event/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/card/id) && !accessset)
var/obj/item/card/id/O = I
access |= O.GetAccess()
@@ -596,7 +596,7 @@
desc = "An ID card typically used by contractors."
polymorphic_type = 1
-/obj/item/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, var/mob/user)
+/obj/item/card/id/event/polymorphic/itg/attackby(obj/item/I as obj, mob/user)
if(istype(I, /obj/item/card/id) && !accessset)
var/obj/item/card/id/O = I
var/list/itgdont = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY, JOB_HEAD_OF_SECURITY, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER, JOB_RESEARCH_DIRECTOR, JOB_CLOWN, JOB_MIME, JOB_TALON_CAPTAIN) //If you're in as one of these you probably aren't representing ITG
diff --git a/code/game/objects/items/weapons/id cards/syndicate_ids.dm b/code/game/objects/items/weapons/id cards/syndicate_ids.dm
index d0f85938be..e3260cd946 100644
--- a/code/game/objects/items/weapons/id cards/syndicate_ids.dm
+++ b/code/game/objects/items/weapons/id cards/syndicate_ids.dm
@@ -24,7 +24,7 @@
/obj/item/card/id/syndicate/prevent_tracking()
return electronic_warfare
-/obj/item/card/id/syndicate/afterattack(var/obj/item/O as obj, mob/user as mob, proximity)
+/obj/item/card/id/syndicate/afterattack(obj/item/O as obj, mob/user as mob, proximity)
if(!proximity) return
if(istype(O, /obj/item/card/id))
var/obj/item/card/id/I = O
@@ -49,7 +49,7 @@
..(user, TRUE)
-/obj/item/card/id/syndicate/proc/register_user(var/mob/user)
+/obj/item/card/id/syndicate/proc/register_user(mob/user)
if(!istype(user) || user == registered_user)
return FALSE
unset_registered_user()
@@ -58,7 +58,7 @@
user.register(OBSERVER_EVENT_DESTROY, src, /obj/item/card/id/syndicate/proc/unset_registered_user)
return TRUE
-/obj/item/card/id/syndicate/proc/unset_registered_user(var/mob/user)
+/obj/item/card/id/syndicate/proc/unset_registered_user(mob/user)
if(!registered_user || (user && user != registered_user))
return
registered_user.unregister(OBSERVER_EVENT_DESTROY, src)
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index a40194c853..d19afa6823 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -23,7 +23,7 @@
return
// Moves the implant where it needs to go, and tells it if there's more to be done in post_implant
-/obj/item/implant/proc/handle_implant(var/mob/source, var/target_zone = BP_TORSO)
+/obj/item/implant/proc/handle_implant(mob/source, target_zone = BP_TORSO)
. = TRUE
imp_in = source
implanted = TRUE
@@ -41,7 +41,7 @@
GLOB.listening_objects |= src
// Takes place after handle_implant, if that returns TRUE
-/obj/item/implant/proc/post_implant(var/mob/source)
+/obj/item/implant/proc/post_implant(mob/source)
/obj/item/implant/proc/get_data()
return "No information available"
@@ -64,7 +64,7 @@
icon_state = "implant_melted"
malfunction = MALFUNCTION_PERMANENT
-/obj/item/implant/proc/implant_loadout(var/mob/living/carbon/human/H)
+/obj/item/implant/proc/implant_loadout(mob/living/carbon/human/H)
. = istype(H) && handle_implant(H, initialize_loc)
if(.)
invisibility = initial(invisibility)
@@ -112,7 +112,7 @@ GLOBAL_LIST_BOILERPLATE(all_tracking_implants, /obj/item/implant/tracking)
. = ..()
id = rand(1, 1000)
-/obj/item/implant/tracking/post_implant(var/mob/source)
+/obj/item/implant/tracking/post_implant(mob/source)
START_PROCESSING(SSobj, src)
/obj/item/implant/tracking/Destroy()
@@ -203,7 +203,7 @@ Implant Specifics:
"}
return
-/obj/item/implant/dexplosive/activate(var/cause)
+/obj/item/implant/dexplosive/activate(cause)
if((!cause) || (!src.imp_in)) return 0
explosion(src, -1, 0, 2, 3, 0)//This might be a bit much, dono will have to see.
if(src.imp_in)
@@ -240,7 +240,7 @@ Implant Specifics:
"}
hear(msg)
return
-/obj/item/implant/explosive/hear(var/msg)
+/obj/item/implant/explosive/hear(msg)
var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
msg = replace_characters(msg, replacechars)
if(findtext(msg,phrase))
@@ -388,7 +388,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
src.activate(src.reagents.total_volume)
return
-/obj/item/implant/chem/activate(var/cause)
+/obj/item/implant/chem/activate(cause)
if((!cause) || (!src.imp_in)) return 0
var/mob/living/carbon/R = src.imp_in
src.reagents.trans_to_mob(R, cause, CHEM_BLOOD)
@@ -531,7 +531,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
else if(M.stat == 2)
activate("death")
-/obj/item/implant/death_alarm/activate(var/cause)
+/obj/item/implant/death_alarm/activate(cause)
var/mob/M = imp_in
var/area/t = get_area(M)
if(!t) // Failsafe
diff --git a/code/game/objects/items/weapons/implants/implant_vr.dm b/code/game/objects/items/weapons/implants/implant_vr.dm
index b5efea9f8e..770418e095 100644
--- a/code/game/objects/items/weapons/implants/implant_vr.dm
+++ b/code/game/objects/items/weapons/implants/implant_vr.dm
@@ -87,7 +87,7 @@
hear(say_in_me.group[2])
-/obj/item/implant/sizecontrol/hear(var/msg)
+/obj/item/implant/sizecontrol/hear(msg)
if (malfunction)
return
diff --git a/code/game/objects/items/weapons/implants/implantaugment.dm b/code/game/objects/items/weapons/implants/implantaugment.dm
index 6be9f571b2..9ccb69959a 100644
--- a/code/game/objects/items/weapons/implants/implantaugment.dm
+++ b/code/game/objects/items/weapons/implants/implantaugment.dm
@@ -22,7 +22,7 @@
Integrity: N/A"}
return dat
-/obj/item/implant/organ/post_implant(var/mob/M)
+/obj/item/implant/organ/post_implant(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -66,7 +66,7 @@
var/list/possible_targets = list(O_AUG_L_FOREARM, O_AUG_R_FOREARM)
-/obj/item/implant/organ/limbaugment/post_implant(var/mob/M)
+/obj/item/implant/organ/limbaugment/post_implant(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -95,7 +95,7 @@
qdel(NewOrgan)
to_chat(H, span_warning("You feel a pinching sensation in your [part]. The implant remains."))
-/obj/item/implant/organ/limbaugment/proc/setup_augment_slots(var/mob/living/carbon/human/H, var/obj/item/organ/internal/augment/armmounted/I)
+/obj/item/implant/organ/limbaugment/proc/setup_augment_slots(mob/living/carbon/human/H, obj/item/organ/internal/augment/armmounted/I)
var/list/Choices = possible_targets.Copy()
for(var/targ in possible_targets)
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 73332b56a5..87828161c9 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -68,7 +68,7 @@
return
-/obj/machinery/implantchair/attackby(var/obj/item/G, var/mob/user)
+/obj/machinery/implantchair/attackby(obj/item/G, mob/user)
if(istype(G, /obj/item/grab))
var/obj/item/grab/grab = G
if(!ismob(grab.affecting))
@@ -83,7 +83,7 @@
return
-/obj/machinery/implantchair/proc/go_out(var/mob/M)
+/obj/machinery/implantchair/proc/go_out(mob/M)
if(!( src.occupant ))
return
if(M == occupant) // so that the guy inside can't eject himself -Agouri
@@ -112,7 +112,7 @@
return 1
-/obj/machinery/implantchair/proc/implant(var/mob/M)
+/obj/machinery/implantchair/proc/implant(mob/M)
if (!istype(M, /mob/living/carbon))
return
if(!implant_list.len) return
diff --git a/code/game/objects/items/weapons/implants/implantcircuits.dm b/code/game/objects/items/weapons/implants/implantcircuits.dm
index 85626270d0..1c0ddcb767 100644
--- a/code/game/objects/items/weapons/implants/implantcircuits.dm
+++ b/code/game/objects/items/weapons/implants/implantcircuits.dm
@@ -42,7 +42,7 @@
. = ..()
. += IC.examine(user)
-/obj/item/implant/integrated_circuit/attackby(var/obj/item/O, var/mob/user)
+/obj/item/implant/integrated_circuit/attackby(obj/item/O, mob/user)
if(O.has_tool_quality(TOOL_CROWBAR) || istype(O, /obj/item/integrated_electronics) || istype(O, /obj/item/integrated_circuit) || O.has_tool_quality(TOOL_SCREWDRIVER) || istype(O, /obj/item/cell/device) )
IC.attackby(O, user)
else
diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm
index 115d23d6c8..453fe187d3 100644
--- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm
+++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm
@@ -55,7 +55,7 @@
else if(reagents.total_volume == reagents.maximum_volume && before_gen < reagents.maximum_volume)
to_chat(imp_in, span_warning("[pick(full_message)]"))
-/obj/item/implant/reagent_generator/proc/do_generation(var/mob/living/L)
+/obj/item/implant/reagent_generator/proc/do_generation(mob/living/L)
L.adjust_nutrition(-gen_cost)
for(var/reagent in generated_reagents)
reagents.add_reagent(reagent, generated_reagents[reagent])
@@ -68,7 +68,7 @@
do_reagent_implant(usr)
-/mob/living/carbon/human/proc/do_reagent_implant(var/mob/living/carbon/human/user = usr)
+/mob/living/carbon/human/proc/do_reagent_implant(mob/living/carbon/human/user = usr)
if(!isliving(user) || !user.checkClickCooldown())
return
diff --git a/code/game/objects/items/weapons/implants/neuralbasic.dm b/code/game/objects/items/weapons/implants/neuralbasic.dm
index 2040c5f3b3..79654f079a 100644
--- a/code/game/objects/items/weapons/implants/neuralbasic.dm
+++ b/code/game/objects/items/weapons/implants/neuralbasic.dm
@@ -6,7 +6,7 @@
var/target_state = null
var/robotic_brain = FALSE
-/obj/item/implant/neural/post_implant(var/mob/source)
+/obj/item/implant/neural/post_implant(mob/source)
if(ishuman(source))
var/mob/living/carbon/human/H = source
if(H.species.has_organ[O_BRAIN])
diff --git a/code/game/objects/items/weapons/inducer_vr.dm b/code/game/objects/items/weapons/inducer_vr.dm
index 08bd5c4274..fb51e3a801 100644
--- a/code/game/objects/items/weapons/inducer_vr.dm
+++ b/code/game/objects/items/weapons/inducer_vr.dm
@@ -28,7 +28,7 @@
if(!cell && cell_type)
cell = new cell_type
-/obj/item/inducer/proc/induce(var/obj/item/cell/target, coefficient)
+/obj/item/inducer/proc/induce(obj/item/cell/target, coefficient)
var/totransfer = min(cell.charge,(powertransfer * coefficient))
var/transferred = target.give(totransfer)
cell.use(transferred)
@@ -256,7 +256,7 @@
var/mob/living/carbon/human/hume
-/obj/item/cell/standin/Initialize(mapload, var/mob/living/carbon/human/H)
+/obj/item/cell/standin/Initialize(mapload, mob/living/carbon/human/H)
. = ..()
if(!istype(H))
return INITIALIZE_HINT_QDEL
@@ -267,7 +267,7 @@
QDEL_IN(src, 20 SECONDS)
-/obj/item/cell/standin/give(var/amount)
+/obj/item/cell/standin/give(amount)
. = ..(amount * NUTRITION_COEFF) //Shrink amount to store
hume.adjust_nutrition(.) //Add the amount we really stored
. /= NUTRITION_COEFF //Inflate amount to take from the giver
diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index cd44d295e5..aede274063 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -43,7 +43,7 @@
I.color = loaded_color
add_overlay(I)
-/obj/item/material/kitchen/utensil/proc/load_food(var/mob/user, var/obj/item/reagent_containers/food/snacks/loading)
+/obj/item/material/kitchen/utensil/proc/load_food(mob/user, obj/item/reagent_containers/food/snacks/loading)
if (reagents.total_volume > 0)
to_chat(user, span_danger("There is already something on \the [src]."))
return
diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm
index 1be1a3c2b8..712e5c58e2 100644
--- a/code/game/objects/items/weapons/material/material_armor.dm
+++ b/code/game/objects/items/weapons/material/material_armor.dm
@@ -35,7 +35,7 @@ Protectiveness | Armor %
var/material_slowdown_modifier = 0
var/material_slowdown_multiplier = 0.5
-/obj/item/clothing/Initialize(mapload, var/material_key)
+/obj/item/clothing/Initialize(mapload, material_key)
. = ..()
if(!material_key)
material_key = default_material
@@ -46,7 +46,7 @@ Protectiveness | Armor %
return material
// Debating if this should be made an /obj/item/ proc.
-/obj/item/clothing/proc/set_material(var/new_material)
+/obj/item/clothing/proc/set_material(new_material)
material = get_material_by_name(new_material)
if(!material)
qdel(src)
@@ -61,11 +61,11 @@ Protectiveness | Armor %
// This is called when someone wearing the object gets hit in some form (melee, bullet_act(), etc).
// Note that this cannot change if someone gets hurt, as it merely reacts to being hit.
-/obj/item/clothing/proc/clothing_impact(var/obj/source, var/damage)
+/obj/item/clothing/proc/clothing_impact(obj/source, damage)
if(material && damage)
material_impact(source, damage)
-/obj/item/clothing/proc/material_impact(var/obj/source, var/damage)
+/obj/item/clothing/proc/material_impact(obj/source, damage)
if(!material || unbreakable)
return
@@ -99,7 +99,7 @@ Protectiveness | Armor %
qdel(src)
// Might be best to make ablative vests a material armor using a new material to cut down on this copypaste.
-/obj/item/clothing/suit/armor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(!material) // No point checking for reflection.
return ..()
@@ -288,7 +288,7 @@ Protectiveness | Armor %
name = "plate insert"
desc = "used to craft armor plates for a plate carrier. Trim with a welder for light armor or add a second for heavy armor"
-/obj/item/material/armor_plating/attackby(var/obj/O, mob/user)
+/obj/item/material/armor_plating/attackby(obj/O, mob/user)
if(istype(O, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/S = O
if(wired)
@@ -320,7 +320,7 @@ Protectiveness | Armor %
..()
//Make plating inserts for modular armour.
-/obj/item/material/armor_plating/insert/attackby(var/obj/item/O, mob/user)
+/obj/item/material/armor_plating/insert/attackby(obj/item/O, mob/user)
. = ..()
@@ -380,7 +380,7 @@ Protectiveness | Armor %
name = "wooden bucket"
icon_state = "woodbucket"
-/obj/item/clothing/head/helmet/bucket/attackby(var/obj/O, mob/user)
+/obj/item/clothing/head/helmet/bucket/attackby(obj/O, mob/user)
if(istype(O, /obj/item/stack/material))
var/obj/item/stack/material/S = O
if(S.use(2))
diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
index f6c50914bd..cf000db8d7 100644
--- a/code/game/objects/items/weapons/material/material_weapons.dm
+++ b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -28,7 +28,7 @@
var/drops_debris = 1
var/named_from_material = 1 //YW EDIT, Does it prepend the material's name to it's name?
-/obj/item/material/Initialize(mapload, var/material_key)
+/obj/item/material/Initialize(mapload, material_key)
. = ..()
if(!material_key)
material_key = default_material
@@ -60,7 +60,7 @@
//spawn(1)
// to_world("[src] has force [force] and throwforce [throwforce] when made from default material [material.name]")
-/obj/item/material/proc/set_material(var/new_material)
+/obj/item/material/proc/set_material(new_material)
material = get_material_by_name(new_material)
if(!material)
qdel(src)
@@ -96,7 +96,7 @@
repair(SK.repair_amount, SK.repair_time, user)
..()
-/obj/item/material/proc/check_health(var/consumed)
+/obj/item/material/proc/check_health(consumed)
if(health<=0)
health = 0
@@ -105,7 +105,7 @@
else if(!dulled && can_dull)
dull()
-/obj/item/material/proc/shatter(var/consumed)
+/obj/item/material/proc/shatter(consumed)
var/turf/T = get_turf(src)
T.visible_message(span_danger("\The [src] [material.destruction_desc]!"))
if(isliving(loc))
@@ -124,7 +124,7 @@
sharp = FALSE
edge = FALSE
-/obj/item/material/proc/repair(var/repair_amount, var/repair_time, mob/living/user)
+/obj/item/material/proc/repair(repair_amount, repair_time, mob/living/user)
if(!fragile)
if(health < initial(health))
user.visible_message("[user] begins repairing \the [src].", "You begin repairing \the [src].")
@@ -140,7 +140,7 @@
to_chat(user, span_warning("You can't repair \the [src]."))
return
-/obj/item/material/proc/sharpen(var/material, var/sharpen_time, var/kit, mob/living/M)
+/obj/item/material/proc/sharpen(material, sharpen_time, kit, mob/living/M)
if(!fragile && src.material.can_sharpen)
if(health < initial(health))
to_chat(M, "You should repair [src] first. Try using [kit] on it.")
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 686a93cc9e..4efe2edce0 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -31,7 +31,7 @@
item_state = "rock"
attack_verb = list("chopped", "torn", "cut")
-/obj/item/material/knife/machete/hatchet/stone/set_material(var/new_material)
+/obj/item/material/knife/machete/hatchet/stone/set_material(new_material)
var/old_name = name
. = ..()
name = old_name
@@ -136,7 +136,7 @@
user.visible_message(span_warning("\The [AM] is snatched by \the [src]!"))
AM.throw_at(user, reach, 0.1, user)
-/obj/item/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/material/whip/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(user.a_intent)
switch(user.a_intent)
if(I_HURT)
@@ -158,7 +158,7 @@
..()
-/obj/item/material/whip/proc/ranged_disarm(var/mob/living/carbon/human/H, var/mob/living/user)
+/obj/item/material/whip/proc/ranged_disarm(mob/living/carbon/human/H, mob/living/user)
if(istype(H))
var/list/holding = list(H.get_active_hand() = 40, H.get_inactive_hand() = 20)
diff --git a/code/game/objects/items/weapons/material/shards.dm b/code/game/objects/items/weapons/material/shards.dm
index d1e89496c3..6cd78591c0 100644
--- a/code/game/objects/items/weapons/material/shards.dm
+++ b/code/game/objects/items/weapons/material/shards.dm
@@ -17,7 +17,7 @@
unbreakable = 1 //It's already broken.
drops_debris = 0
-/obj/item/material/shard/set_material(var/new_material)
+/obj/item/material/shard/set_material(new_material)
..(new_material)
if(!istype(material))
return
@@ -55,7 +55,7 @@
return
return ..()
-/obj/item/material/shard/afterattack(var/atom/target, mob/living/carbon/human/user as mob, proximity)
+/obj/item/material/shard/afterattack(atom/target, mob/living/carbon/human/user as mob, proximity)
if(!proximity)
return
var/active_hand //hand the shard is in
diff --git a/code/game/objects/items/weapons/material/sledgehammer_construction_ch.dm b/code/game/objects/items/weapons/material/sledgehammer_construction_ch.dm
index d0ce02ee18..8af55279b3 100644
--- a/code/game/objects/items/weapons/material/sledgehammer_construction_ch.dm
+++ b/code/game/objects/items/weapons/material/sledgehammer_construction_ch.dm
@@ -7,7 +7,7 @@
var/construction_stage = 1
-/obj/item/hammer_head/attackby(var/obj/item/thing, var/mob/user)
+/obj/item/hammer_head/attackby(obj/item/thing, mob/user)
if(istype(thing, /obj/item/stack/rods) && construction_stage == 1)
var/obj/item/stack/rods = thing
@@ -111,7 +111,7 @@
construction_stage++
icon_state = "hammer_construction_[construction_stage]"
-/obj/item/hammer_head/examine(var/mob/user)
+/obj/item/hammer_head/examine(mob/user)
. = ..(user,2)
if(.)
switch(construction_stage)
diff --git a/code/game/objects/items/weapons/material/swords.dm b/code/game/objects/items/weapons/material/swords.dm
index 0a979d824c..b1426e9ab2 100644
--- a/code/game/objects/items/weapons/material/swords.dm
+++ b/code/game/objects/items/weapons/material/swords.dm
@@ -12,7 +12,7 @@
drop_sound = 'sound/items/drop/sword.ogg'
pickup_sound = 'sound/items/pickup/sword.ogg'
-/obj/item/material/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/sword/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(unique_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
@@ -70,7 +70,7 @@
pickup_sound = 'sound/items/pickup/axe.ogg'
can_cleave = TRUE
-/obj/item/material/sword/battleaxe/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/sword/battleaxe/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(unique_parry_check(user, attacker, damage_source) && prob(10))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index d1b7a5249f..de71111651 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -61,7 +61,7 @@
update_icon()
//Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday
-/obj/item/material/twohanded/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/twohanded/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(wielded && default_parry_check(user, attacker, damage_source) && prob(15))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/material/twohanded_ch.dm b/code/game/objects/items/weapons/material/twohanded_ch.dm
index eb1943a11d..825e086132 100644
--- a/code/game/objects/items/weapons/material/twohanded_ch.dm
+++ b/code/game/objects/items/weapons/material/twohanded_ch.dm
@@ -61,7 +61,7 @@
P.die_off()
// This cannot go into afterattack since some mobs delete themselves upon dying.
-/obj/item/material/twohanded/sledgehammer/pre_attack(var/mob/living/target, var/mob/living/user)
+/obj/item/material/twohanded/sledgehammer/pre_attack(mob/living/target, mob/living/user)
if(istype(target))
cleave(user, target)
diff --git a/code/game/objects/items/weapons/material/twohanded_vr.dm b/code/game/objects/items/weapons/material/twohanded_vr.dm
index 25a074ab8e..7350ca2687 100644
--- a/code/game/objects/items/weapons/material/twohanded_vr.dm
+++ b/code/game/objects/items/weapons/material/twohanded_vr.dm
@@ -26,7 +26,7 @@
edge = TRUE
sharp = TRUE
-/obj/item/material/twohanded/saber/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/twohanded/saber/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if (src.wielded == 1)
if(unique_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
@@ -59,7 +59,7 @@
edge = FALSE
sharp = FALSE
-/obj/item/material/twohanded/staff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/twohanded/staff/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
var/parry_chance
if(istype(damage_source, /obj/item/projectile)) //can't block ranged attacks, only melee!
return 0
@@ -74,7 +74,7 @@
return 1
return 0
-/obj/item/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/material/twohanded/staff/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
if(src.wielded == 1 && user.a_intent == I_DISARM && prob(stun_chance))
target.Weaken(stun_duration)
diff --git a/code/game/objects/items/weapons/medigun/linked_medigun.dm b/code/game/objects/items/weapons/medigun/linked_medigun.dm
index 400dfa3862..d3ba95f1a3 100644
--- a/code/game/objects/items/weapons/medigun/linked_medigun.dm
+++ b/code/game/objects/items/weapons/medigun/linked_medigun.dm
@@ -22,10 +22,10 @@
if(istype(A,/obj/structure/closet ))
break
-/obj/item/bork_medigun/linked/proc/check_charge(var/charge_amt)
+/obj/item/bork_medigun/linked/proc/check_charge(charge_amt)
return (medigun_base_unit.bcell && medigun_base_unit.bcell.check_charge(charge_amt))
-/obj/item/bork_medigun/linked/proc/checked_use(var/charge_amt)
+/obj/item/bork_medigun/linked/proc/checked_use(charge_amt)
return (medigun_base_unit.bcell && medigun_base_unit.bcell.checked_use(charge_amt))
/obj/item/bork_medigun/linked/attack_self(mob/living/user)
@@ -37,7 +37,7 @@
if(busy)
busy = MEDIGUN_CANCELLED
-/obj/item/bork_medigun/linked/proc/should_stop(var/mob/living/target, var/mob/living/user, var/active_hand)
+/obj/item/bork_medigun/linked/proc/should_stop(mob/living/target, mob/living/user, active_hand)
if(!target || !user || (!active_hand && medigun_base_unit.is_twohanded()) || !istype(target) || !istype(user) || busy < MEDIGUN_BUSY)
return TRUE
diff --git a/code/game/objects/items/weapons/medigun/medigun_backpack.dm b/code/game/objects/items/weapons/medigun/medigun_backpack.dm
index 935914a8fe..eaeb570fe3 100644
--- a/code/game/objects/items/weapons/medigun/medigun_backpack.dm
+++ b/code/game/objects/items/weapons/medigun/medigun_backpack.dm
@@ -453,7 +453,7 @@
return ..()
-/obj/item/medigun_backpack/proc/refill_reagent(var/obj/item/container, mob/user)
+/obj/item/medigun_backpack/proc/refill_reagent(obj/item/container, mob/user)
. = FALSE
if(!maintenance && (istype(container, /obj/item/reagent_containers/glass/beaker) || istype(container, /obj/item/reagent_containers/glass/bottle)))
@@ -566,5 +566,5 @@
..()
replace_icon()
-/obj/item/medigun_backpack/proc/checked_use(var/charge_amt)
+/obj/item/medigun_backpack/proc/checked_use(charge_amt)
return (bcell && bcell.checked_use(charge_amt))
diff --git a/code/game/objects/items/weapons/melee/deflect.dm b/code/game/objects/items/weapons/melee/deflect.dm
index 3c1ba4c823..9b21f1530e 100644
--- a/code/game/objects/items/weapons/melee/deflect.dm
+++ b/code/game/objects/items/weapons/melee/deflect.dm
@@ -6,7 +6,7 @@
var/defend_chance = 5 // The base chance for the weapon to parry.
var/projectile_parry_chance = 0 // The base chance for a projectile to be deflected.
-/obj/item/melee/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/melee/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(.)
return .
if(default_parry_check(user, attacker, damage_source) && prob(defend_chance))
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index b69d1487a5..d001f3a1ed 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -81,7 +81,7 @@
update_icon()
set_light(0,0)
-/obj/item/melee/energy/proc/use_charge(var/cost)
+/obj/item/melee/energy/proc/use_charge(cost)
if(active)
if(bcell)
if(bcell.checked_use(cost))
@@ -305,7 +305,7 @@
..()
attack_verb = list()
-/obj/item/melee/energy/sword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/melee/energy/sword/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(60))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
@@ -368,7 +368,7 @@
lcolor = "#0000FF"
projectile_parry_chance = 30 // It's not specifically designed for cutting and slashing, but it can still, maybe, save your life.
-/obj/item/melee/energy/sword/ionic_rapier/afterattack(var/atom/movable/AM, var/mob/living/user, var/proximity)
+/obj/item/melee/energy/sword/ionic_rapier/afterattack(atom/movable/AM, mob/living/user, proximity)
if(istype(AM, /obj) && proximity && active)
// EMP stuff.
var/obj/O = AM
@@ -377,7 +377,7 @@
user.setClickCooldown(user.get_attack_speed(src)) // A lot of objects don't set click delay.
return ..()
-/obj/item/melee/energy/sword/ionic_rapier/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/energy/sword/ionic_rapier/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
if(target.isSynthetic() && active)
// Do some extra damage. Not a whole lot more since emp_act() is pretty nasty on FBPs already.
@@ -478,7 +478,7 @@
host.drop_from_inventory(src)
QDEL_IN(src, 1)
-/obj/item/melee/energy/blade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/melee/energy/blade/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(60))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
@@ -546,7 +546,7 @@
..()
attack_verb = list("whacked", "beat", "slapped", "thonked")
-/obj/item/melee/energy/spear/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/melee/energy/spear/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index f8a57637c7..0a914c5639 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -77,14 +77,14 @@
var/list/voice_mobs = list() //The curse of the sword is that it has someone trapped inside.
-/obj/item/melee/cursedblade/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/melee/cursedblade/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
return 1
return 0
-/obj/item/melee/cursedblade/proc/ghost_inhabit(var/mob/candidate)
+/obj/item/melee/cursedblade/proc/ghost_inhabit(mob/candidate)
if(!isobserver(candidate))
return
//Handle moving the ghost into the new shell.
diff --git a/code/game/objects/items/weapons/melee/misc_vr.dm b/code/game/objects/items/weapons/melee/misc_vr.dm
index 702ad5ef1d..fb9b291e8b 100644
--- a/code/game/objects/items/weapons/melee/misc_vr.dm
+++ b/code/game/objects/items/weapons/melee/misc_vr.dm
@@ -26,7 +26,7 @@
attack_verb = list("smashed", "swung at", "pummelled", "nailed", "crushed", "bonked", "hammered", "cracked")
defend_chance = 0
-/obj/item/melee/hammer/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone, var/attack_modifier)
+/obj/item/melee/hammer/apply_hit_effect(mob/living/target, mob/living/user, hit_zone, attack_modifier)
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(prob(50))
diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm
index a34253dad9..8c60386d2c 100644
--- a/code/game/objects/items/weapons/melee/shock_maul.dm
+++ b/code/game/objects/items/weapons/melee/shock_maul.dm
@@ -249,7 +249,7 @@
powercheck(hitcost)
//CHOMPEdit end
-/obj/item/melee/shock_maul/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/shock_maul/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
if(user.a_intent == I_DISARM)
launch_force *= launch_force_disarm
diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
index 8fca168fc7..a1c3ff7bfe 100644
--- a/code/game/objects/items/weapons/policetape.dm
+++ b/code/game/objects/items/weapons/policetape.dm
@@ -283,7 +283,7 @@ GLOBAL_LIST_EMPTY(tape_roll_applications)
to_chat(user, span_notice("You finish placing \the [src]."))
return
-/obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity)
+/obj/item/taperoll/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity)
return
diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm
index f771b4b5ee..06020b3d18 100644
--- a/code/game/objects/items/weapons/scrolls.dm
+++ b/code/game/objects/items/weapons/scrolls.dm
@@ -48,7 +48,7 @@
attack_self(H)
return
-/obj/item/teleportation_scroll/proc/teleportscroll(var/mob/user)
+/obj/item/teleportation_scroll/proc/teleportscroll(mob/user)
var/A = tgui_input_list(user, "Area to jump to:", "Teleportation Scroll", GLOB.teleportlocs)
if(!A)
return
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 0484a59b98..f36688400e 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -2,7 +2,7 @@
//These are shared by various items that have shield-like behaviour
//bad_arc is the ABSOLUTE arc of directions from which we cannot block. If you want to fix it to e.g. the user's facing you will need to rotate the dirs yourself.
-/proc/check_shield_arc(mob/user, var/bad_arc, atom/damage_source = null, mob/attacker = null)
+/proc/check_shield_arc(mob/user, bad_arc, atom/damage_source = null, mob/attacker = null)
//check attack direction
var/attack_dir = 0 //direction from the user to the source of the attack
if(istype(damage_source, /obj/item/projectile))
@@ -41,7 +41,7 @@
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
)
-/obj/item/shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/shield/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(user.incapacitated())
return 0
@@ -53,7 +53,7 @@
return 1
return 0
-/obj/item/shield/proc/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
+/obj/item/shield/proc/get_block_chance(mob/user, damage, atom/damage_source = null, mob/attacker = null)
return base_block_chance
/obj/item/shield/riot
@@ -71,7 +71,7 @@
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
-/obj/item/shield/riot/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/shield/riot/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(user.incapacitated())
return 0
@@ -144,7 +144,7 @@
spark_system.start()
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
-/obj/item/shield/energy/get_block_chance(mob/user, var/damage, atom/damage_source = null, mob/attacker = null)
+/obj/item/shield/energy/get_block_chance(mob/user, damage, atom/damage_source = null, mob/attacker = null)
if(istype(damage_source, /obj/item/projectile))
var/obj/item/projectile/P = damage_source
if((is_sharp(P) && damage > 10) || istype(P, /obj/item/projectile/beam))
diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm
index 962259f516..c86e8a4c24 100644
--- a/code/game/objects/items/weapons/shields_vr.dm
+++ b/code/game/objects/items/weapons/shields_vr.dm
@@ -57,7 +57,7 @@
H.update_inv_l_hand()
H.update_inv_r_hand()
-/obj/item/shield/riot/explorer/proc/update_flashlight(var/mob/user = null)
+/obj/item/shield/riot/explorer/proc/update_flashlight(mob/user = null)
if(on && !light_applied)
set_light(brightness_on)
light_applied = 1
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index b9a6b14724..14014726d5 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -21,7 +21,7 @@
pickup_sound = 'sound/items/pickup/backpack.ogg'
-/obj/item/storage/backpack/equipped(var/mob/user, var/slot)
+/obj/item/storage/backpack/equipped(mob/user, slot)
if (slot == slot_back && src.use_sound)
// Chomp edit
if(isbelly(user.loc))
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 2553afafdb..e4f3e074f4 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -29,7 +29,7 @@
update_icon()
//Some belts have sprites to show icons
-/obj/item/storage/belt/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null)
+/obj/item/storage/belt/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer = 0,icon/clip_mask = null)
var/image/standing = ..()
if(!inhands && contents.len)
for(var/obj/item/i in contents)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index eeb6e5f8bd..eb2473c46f 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -433,7 +433,7 @@
drop_sound = 'sound/items/drop/matchbox.ogg'
pickup_sound = 'sound/items/pickup/matchbox.ogg'
-/obj/item/storage/box/matches/attackby(var/obj/item/flame/match/W, var/mob/user)
+/obj/item/storage/box/matches/attackby(obj/item/flame/match/W, mob/user)
if(istype(W) && !W.lit && !W.burnt)
if(prob(25))
W.light(user)
@@ -499,7 +499,7 @@
/obj/item/storage/box/freezer/red
icon_state = "portafreezer_red"
-/obj/item/storage/box/freezer/Entered(var/atom/movable/AM)
+/obj/item/storage/box/freezer/Entered(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 1
@@ -507,7 +507,7 @@
organ.preserved = 1
..()
-/obj/item/storage/box/freezer/Exited(var/atom/movable/AM)
+/obj/item/storage/box/freezer/Exited(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 0
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 3a8931294a..6df3f24b72 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -28,7 +28,7 @@
var/open_state
var/closed_state
-/obj/item/storage/fancy/update_icon(var/itemremoved = 0)
+/obj/item/storage/fancy/update_icon(itemremoved = 0)
var/total_contents = contents.len - itemremoved
icon_state = "[icon_type]box[total_contents]"
return
@@ -509,7 +509,7 @@
. = ..()
update_icon()
-/obj/item/storage/lockbox/vials/update_icon(var/itemremoved = 0)
+/obj/item/storage/lockbox/vials/update_icon(itemremoved = 0)
var/total_contents = contents.len - itemremoved
icon_state = "vialbox[total_contents]"
cut_overlays()
@@ -552,6 +552,6 @@
. = ..()
update_icon()
-/obj/item/storage/fancy/heartbox/update_icon(var/itemremoved = 0)
+/obj/item/storage/fancy/heartbox/update_icon(itemremoved = 0)
if (contents.len == 0)
icon_state = "heartbox_empty"
diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm
index 9bc6ce393b..8c8f11f38b 100644
--- a/code/game/objects/items/weapons/storage/internal.dm
+++ b/code/game/objects/items/weapons/storage/internal.dm
@@ -88,5 +88,5 @@
src.close(M)
return 1
-/obj/item/storage/internal/Adjacent(var/atom/neighbor)
+/obj/item/storage/internal/Adjacent(atom/neighbor)
return master_item.Adjacent(neighbor)
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 628c7a9c24..bf7b724e1e 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -56,7 +56,7 @@
..()
return
-/obj/item/storage/lockbox/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
+/obj/item/storage/lockbox/emag_act(remaining_charges, mob/user, emag_source, visual_feedback = "", audible_feedback = "")
if(!broken)
if(visual_feedback)
visual_feedback = span_warning("[visual_feedback]")
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index d93504df2d..5c4cbf968f 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(random_weighted_donuts, list(
. = ..()
update_icon()
-/obj/item/storage/box/wormcan/update_icon(var/itemremoved = 0)
+/obj/item/storage/box/wormcan/update_icon(itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty"
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(random_weighted_donuts, list(
max_storage_space = ITEMSIZE_COST_TINY * 6
starts_with = list(/obj/item/reagent_containers/food/snacks/wormsickly = 6)
-/obj/item/storage/box/wormcan/sickly/update_icon(var/itemremoved = 0)
+/obj/item/storage/box/wormcan/sickly/update_icon(itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty_sickly"
@@ -99,6 +99,6 @@ GLOBAL_LIST_INIT(random_weighted_donuts, list(
max_storage_space = ITEMSIZE_COST_TINY * 6
starts_with = list(/obj/item/reagent_containers/food/snacks/wormdeluxe = 6)
-/obj/item/storage/box/wormcan/deluxe/update_icon(var/itemremoved = 0)
+/obj/item/storage/box/wormcan/deluxe/update_icon(itemremoved = 0)
if (contents.len == 0)
icon_state = "wormcan_empty_deluxe"
diff --git a/code/game/objects/items/weapons/storage/ore_bag.dm b/code/game/objects/items/weapons/storage/ore_bag.dm
index 17bc64b4fc..f8603d5a19 100644
--- a/code/game/objects/items/weapons/storage/ore_bag.dm
+++ b/code/game/objects/items/weapons/storage/ore_bag.dm
@@ -102,7 +102,7 @@
update_icon()
return 1
-/obj/item/ore_bag/proc/gather_all(turf/T, mob/user, var/silent = 0)
+/obj/item/ore_bag/proc/gather_all(turf/T, mob/user, silent = 0)
var/success = 0
var/failure = 0
var/current_pickup = 0
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 43e1c6b885..65250b2716 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -145,7 +145,7 @@
. = TRUE
return
-/obj/item/storage/secure/emag_act(var/remaining_charges, var/mob/user, var/feedback)
+/obj/item/storage/secure/emag_act(remaining_charges, mob/user, feedback)
if(!emagged)
emagged = 1
src.add_overlay(icon_sparking)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index cf8ed983da..1ad0787e2e 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -302,7 +302,7 @@
return
//This proc draws out the inventory and places the items on it. It uses the standard position.
-/obj/item/storage/proc/slot_orient_objs(var/rows, var/cols, var/list/obj/item/display_contents)
+/obj/item/storage/proc/slot_orient_objs(rows, cols, list/obj/item/display_contents)
var/cx = 4
var/cy = 2+rows
src.boxes.screen_loc = "4:16,2:16 to [4+cols]:16,[2+rows]:16"
@@ -334,7 +334,7 @@
src.closer.screen_loc = "[4+cols+1]:16,2:16"
return
-/obj/item/storage/proc/space_orient_objs(var/list/obj/item/display_contents)
+/obj/item/storage/proc/space_orient_objs(list/obj/item/display_contents)
SHOULD_NOT_SLEEP(TRUE)
/// A prototype for drawing the leftmost border behind each item in storage
@@ -844,7 +844,7 @@
return TRUE
//Useful for spilling the contents of containers all over the floor
-/obj/item/storage/proc/spill(var/dist = 2, var/turf/T = null)
+/obj/item/storage/proc/spill(dist = 2, turf/T = null)
if (!istype(T))//If its not on the floor this might cause issues
T = get_turf(src)
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 3ebdf5c382..0c2f583c06 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -230,7 +230,7 @@
calibrate_size()
-/proc/fill_cigarre_package(var/obj/item/storage/fancy/cigarettes/C, var/list/reagents)
+/proc/fill_cigarre_package(obj/item/storage/fancy/cigarettes/C, list/reagents)
for(var/reagent in reagents)
C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots)
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 91567cb643..70a6be5eda 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -182,7 +182,7 @@
deductcharge(hitcost)
return ..()
-/obj/item/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/baton/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(isrobot(target))
return ..()
@@ -273,7 +273,7 @@
agonyforce = 25 // Less efficent than a regular baton.
attack_verb = list("poked")
-/obj/item/melee/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
..(target, user, hit_zone)
if(status && target.has_AI())
target.taunt(user)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index b807b82ec6..7136cb6c91 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -286,7 +286,7 @@ GLOBAL_LIST_EMPTY(tank_gauge_cache)
add_fingerprint(ui.user)
-/obj/item/tank/proc/toggle_valve(var/mob/user)
+/obj/item/tank/proc/toggle_valve(mob/user)
if(istype(loc,/mob/living/carbon))
var/mob/living/carbon/location = loc
if(location.internal == src)
@@ -537,7 +537,7 @@ GLOBAL_LIST_EMPTY(tank_gauge_cache)
///Onetankbombs (added as actual items)
/////////////////////////////////
-/obj/item/tank/proc/onetankbomb(var/fill = 1)
+/obj/item/tank/proc/onetankbomb(fill = 1)
var/phoron_amt = 4 + rand(4)
var/oxygen_amt = 6 + rand(8)
@@ -566,11 +566,11 @@ GLOBAL_LIST_EMPTY(tank_gauge_cache)
add_overlay("bomb_assembly")
-/obj/item/tank/phoron/onetankbomb/Initialize(mapload, var/amount = 1)
+/obj/item/tank/phoron/onetankbomb/Initialize(mapload, amount = 1)
. = ..()
onetankbomb(amount)
-/obj/item/tank/oxygen/onetankbomb/Initialize(mapload, var/amount = 1)
+/obj/item/tank/oxygen/onetankbomb/Initialize(mapload, amount = 1)
. = ..()
onetankbomb(amount)
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index 8c9b301520..e3bc0629d1 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -9,7 +9,7 @@
toolspeed = 2 //It is now used in surgery as a not awful, but probably dangerous option, due to speed.
-/obj/item/tape_roll/proc/can_place(var/mob/living/carbon/human/H, var/mob/user)
+/obj/item/tape_roll/proc/can_place(mob/living/carbon/human/H, mob/user)
if(isrobot(user) || user == H)
return TRUE
@@ -102,7 +102,7 @@
return ..()
return ITEM_INTERACT_SUCCESS
-/obj/item/tape_roll/proc/stick(var/obj/item/W, mob/user)
+/obj/item/tape_roll/proc/stick(obj/item/W, mob/user)
if(!istype(W, /obj/item/paper) || istype(W, /obj/item/paper/sticky) || !user.unEquip(W))
return
user.drop_from_inventory(W)
@@ -128,7 +128,7 @@
SHOULD_CALL_PARENT(FALSE)
return stuck.examine(user)
-/obj/item/ducttape/proc/attach(var/obj/item/W)
+/obj/item/ducttape/proc/attach(obj/item/W)
stuck = W
W.forceMove(src)
icon_state = W.icon_state + "_taped"
@@ -151,7 +151,7 @@
overlays = null
qdel(src)
-/obj/item/ducttape/attackby(var/obj/item/I, var/mob/user)
+/obj/item/ducttape/attackby(obj/item/I, mob/user)
if(!(istype(src, /obj/item/handcuffs/cable/tape) || istype(src, /obj/item/clothing/mask/muzzle/tape)))
return ..()
else
@@ -164,7 +164,7 @@
anchored = FALSE
return ..() // Pick it up now that it's unanchored.
-/obj/item/ducttape/afterattack(var/A, mob/user, flag, params)
+/obj/item/ducttape/afterattack(A, mob/user, flag, params)
if(!in_range(user, A) || istype(A, /obj/machinery/door) || !stuck)
return
diff --git a/code/game/objects/items/weapons/taskmanager_ch.dm b/code/game/objects/items/weapons/taskmanager_ch.dm
index 763dc44502..56e6b75259 100644
--- a/code/game/objects/items/weapons/taskmanager_ch.dm
+++ b/code/game/objects/items/weapons/taskmanager_ch.dm
@@ -381,7 +381,7 @@
to_chat(user, span_notice("If you are reading this, something has gone horribly wrong!"))
return
-/obj/item/taskmanager/proc/deploy_voucher(var/turf/T)
+/obj/item/taskmanager/proc/deploy_voucher(turf/T)
switch(mode)
if (TM_MODE_BRIDGE)
new /obj/item/surplus_voucher/com(T)
diff --git a/code/game/objects/items/weapons/tools/combitool.dm b/code/game/objects/items/weapons/tools/combitool.dm
index 8093e9b020..c7fc5be7b6 100644
--- a/code/game/objects/items/weapons/tools/combitool.dm
+++ b/code/game/objects/items/weapons/tools/combitool.dm
@@ -54,7 +54,7 @@
if(!tool) return 0
return (tool ? tool.attack(M,user) : 0)
-/obj/item/combitool/afterattack(var/atom/target, var/mob/living/user, proximity, params)
+/obj/item/combitool/afterattack(atom/target, mob/living/user, proximity, params)
if(!proximity)
return 0
var/obj/item/tool = tools[current_tool]
diff --git a/code/game/objects/items/weapons/tools/transforming.dm b/code/game/objects/items/weapons/tools/transforming.dm
index a1bebd9d2b..371f984501 100644
--- a/code/game/objects/items/weapons/tools/transforming.dm
+++ b/code/game/objects/items/weapons/tools/transforming.dm
@@ -33,7 +33,7 @@
on_tool_switch(user)
-/obj/item/tool/transforming/proc/on_tool_switch(var/mob/user)
+/obj/item/tool/transforming/proc/on_tool_switch(mob/user)
return
/obj/item/tool/transforming/jawsoflife
@@ -51,7 +51,7 @@
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked", "pinched", "nipped")
possible_tooltypes = list(TOOL_CROWBAR,TOOL_WIRECUTTER)
-/obj/item/tool/transforming/jawsoflife/on_tool_switch(var/mob/user)
+/obj/item/tool/transforming/jawsoflife/on_tool_switch(mob/user)
switch(possible_tooltypes[current_tooltype])
if(TOOL_CROWBAR)
desc = initial(desc) + " It's fitted with a prying head."
@@ -89,7 +89,7 @@
attack_verb = list("drilled", "screwed", "jabbed", "whacked")
possible_tooltypes = list(TOOL_WRENCH,TOOL_SCREWDRIVER)
-/obj/item/tool/transforming/powerdrill/on_tool_switch(var/mob/user)
+/obj/item/tool/transforming/powerdrill/on_tool_switch(mob/user)
switch(possible_tooltypes[current_tooltype])
if(TOOL_WRENCH)
desc = initial(desc) + " It's fitted with a bolt driver."
@@ -129,7 +129,7 @@
possible_tooltypes = list(TOOL_WRENCH,TOOL_CROWBAR,TOOL_WIRECUTTER,TOOL_SCREWDRIVER,TOOL_MULTITOOL,TOOL_WELDER)
weldertype = /obj/item/weldingtool/dummy/altevian
-/obj/item/tool/transforming/altevian/on_tool_switch(var/mob/user)
+/obj/item/tool/transforming/altevian/on_tool_switch(mob/user)
switch(possible_tooltypes[current_tooltype])
if(TOOL_WRENCH)
desc = initial(desc) + " It's currently in bolting mode."
diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm
index f8de4fefd5..a263318794 100644
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -182,7 +182,7 @@
return max_fuel
//Removes fuel from the welding tool. If a mob is passed, it will perform an eyecheck on the mob. This should probably be renamed to use()
-/obj/item/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/M = null)
+/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/M = null)
if(!welding)
return 0
if(amount)
@@ -265,7 +265,7 @@
//Sets the welding state of the welding tool. If you see W.welding = 1 anywhere, please change it to W.setWelding(1)
//so that the welding tool updates accordingly
-/obj/item/weldingtool/proc/setWelding(var/set_welding, var/mob/M)
+/obj/item/weldingtool/proc/setWelding(set_welding, mob/M)
if(!status) return
var/turf/T = get_turf(src)
@@ -583,7 +583,7 @@
return power_supply.maxcharge
return 0
-/obj/item/weldingtool/electric/remove_fuel(var/amount = 1, var/mob/M = null)
+/obj/item/weldingtool/electric/remove_fuel(amount = 1, mob/M = null)
if(!welding)
return 0
if(get_fuel() >= amount)
@@ -691,7 +691,7 @@
/obj/item/weldingtool/dummy/get_fuel()
return get_max_fuel()
-/obj/item/weldingtool/dummy/remove_fuel(var/amount = 1, var/mob/M = null)
+/obj/item/weldingtool/dummy/remove_fuel(amount = 1, mob/M = null)
return TRUE
/obj/item/weldingtool/dummy/isOn()
diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm
index 7212e074f1..f8cd1909aa 100644
--- a/code/game/objects/items/weapons/towels.dm
+++ b/code/game/objects/items/weapons/towels.dm
@@ -11,7 +11,7 @@
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
-/obj/item/towel/equipped(var/M, var/slot)
+/obj/item/towel/equipped(M, slot)
..()
switch(slot)
if(slot_head)
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index 644db64197..74b21ec156 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -188,7 +188,7 @@
sharp = TRUE
-/obj/item/material/barbedwire/set_material(var/new_material)
+/obj/item/material/barbedwire/set_material(new_material)
..()
if(!QDELETED(src))
@@ -290,7 +290,7 @@
update_icon()
..()
-/obj/item/material/barbedwire/proc/shock(mob/user as mob, prb, var/target_zone = BP_TORSO)
+/obj/item/material/barbedwire/proc/shock(mob/user as mob, prb, target_zone = BP_TORSO)
if(!anchored || health == 0) // anchored/destroyed grilles are never connected
return 0
if(material.conductivity <= 0)
diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm
index 8e3db413b3..9b6b8ec406 100644
--- a/code/game/objects/items/weapons/weldbackpack.dm
+++ b/code/game/objects/items/weapons/weldbackpack.dm
@@ -33,7 +33,7 @@
return_nozzle()
to_chat(user, span_notice("\The [nozzle] retracts to its fueltank."))
-/obj/item/weldpack/proc/get_nozzle(var/mob/living/user)
+/obj/item/weldpack/proc/get_nozzle(mob/living/user)
if(!ishuman(user))
return 0
@@ -49,7 +49,7 @@
return 1
-/obj/item/weldpack/proc/return_nozzle(var/mob/living/user)
+/obj/item/weldpack/proc/return_nozzle(mob/living/user)
nozzle.forceMove(src)
nozzle_attached = 1
diff --git a/code/game/objects/items_vr.dm b/code/game/objects/items_vr.dm
index b209640768..a4eafa0304 100644
--- a/code/game/objects/items_vr.dm
+++ b/code/game/objects/items_vr.dm
@@ -1,4 +1,4 @@
-/obj/item/proc/inhabit_item(var/mob/candidate, var/candidate_name, var/mob/living/candidate_original_form, var/is_item_tf = FALSE)
+/obj/item/proc/inhabit_item(mob/candidate, candidate_name, mob/living/candidate_original_form, is_item_tf = FALSE)
//This makes it so that any object in the game can have something put in it like the cursed sword!
//This means the proc can also be manually called by admin commands.
//Handle moving the person into the object.
@@ -33,7 +33,7 @@
//CHOMPEdit End
// Chomp edit
-/obj/item/proc/muffled_by_belly(var/mob/user)
+/obj/item/proc/muffled_by_belly(mob/user)
if(isbelly(user.loc))
var/obj/belly/B = user.loc
if(B.mode_flags & DM_FLAG_MUFFLEITEMS)
diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm
index 6688c58e5d..7a8fddffe9 100644
--- a/code/game/objects/mail.dm
+++ b/code/game/objects/mail.dm
@@ -248,7 +248,7 @@
playsound(loc, 'sound/items/poster_ripped.ogg', 100, TRUE)
qdel(src)
-/obj/item/mail/proc/initialize_for_recipient(var/datum/mind/recipient, var/preset_goodies = FALSE)
+/obj/item/mail/proc/initialize_for_recipient(datum/mind/recipient, preset_goodies = FALSE)
var/current_title = recipient.role_alt_title ? recipient.role_alt_title : recipient.assigned_role
name = "[initial(name)] for [recipient.name] ([current_title])"
recipient_ref = WEAKREF(recipient)
diff --git a/code/game/objects/micro_event.dm b/code/game/objects/micro_event.dm
index 686dd4b07f..fbc735a8ac 100644
--- a/code/game/objects/micro_event.dm
+++ b/code/game/objects/micro_event.dm
@@ -6,7 +6,7 @@
var/shrinking = TRUE
var/size_limit = 0.5
-/obj/structure/portal_event/resize/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/portal_event/resize/attack_ghost(mob/observer/dead/user)
if(!target && check_rights_for(user?.client, R_HOLDER))
if(tgui_alert(user, "Would you like to adjust the portal's size settings?", "Change portal size settings", list("No","Yes")) == "Yes")
var/our_message
diff --git a/code/game/objects/micro_structures.dm b/code/game/objects/micro_structures.dm
index 3de581b0c5..9b8171cbbd 100644
--- a/code/game/objects/micro_structures.dm
+++ b/code/game/objects/micro_structures.dm
@@ -225,7 +225,7 @@ GLOBAL_LIST_EMPTY(micro_tunnels)
enter_tunnel(user)
-/obj/structure/micro_tunnel/proc/can_enter(var/mob/living/user)
+/obj/structure/micro_tunnel/proc/can_enter(mob/living/user)
if(user.mob_size <= MOB_TINY || user.get_effective_size(TRUE) <= micro_accepted_scale)
return TRUE
@@ -259,7 +259,7 @@ GLOBAL_LIST_EMPTY(micro_tunnels)
to_chat(k,span_notice("You are inside of \the [src]. It's dark and gloomy inside of here. You can click upon the tunnel to exit, or travel to another tunnel if there are other tunnels linked to it."))
tunnel_notify(k)
-/obj/structure/micro_tunnel/proc/tunnel_notify(var/mob/living/user)
+/obj/structure/micro_tunnel/proc/tunnel_notify(mob/living/user)
to_chat(user, span_notice("You arrive inside \the [src]."))
var/our_message = "You can see "
var/found_stuff = FALSE
diff --git a/code/game/objects/mob_spawner_vr.dm b/code/game/objects/mob_spawner_vr.dm
index 336cd00fd5..f1784ef7fd 100644
--- a/code/game/objects/mob_spawner_vr.dm
+++ b/code/game/objects/mob_spawner_vr.dm
@@ -60,7 +60,7 @@
/obj/structure/mob_spawner/proc/choose_spawn()
return pickweight(spawn_types)
-/obj/structure/mob_spawner/proc/do_spawn(var/mob_path)
+/obj/structure/mob_spawner/proc/do_spawn(mob_path)
if(!ispath(mob_path))
return 0
//CHOMPEdit Start
@@ -84,11 +84,11 @@
return 0
//CHOMPEdit End
-/obj/structure/mob_spawner/proc/get_death_report(var/mob/living/L)
+/obj/structure/mob_spawner/proc/get_death_report(mob/living/L)
if(L in spawned_mobs)
spawned_mobs.Remove(L)
-/obj/structure/mob_spawner/attackby(var/obj/item/I, var/mob/living/user)
+/obj/structure/mob_spawner/attackby(obj/item/I, mob/living/user)
if(!I.force || I.flags & NOBLUDGEON || !destructible)
return
@@ -97,12 +97,12 @@
visible_message(span_warning("\The [src] has been [LAZYLEN(I.attack_verb) ? "[pick(I.attack_verb)]":"attacked"] with \the [I] by [user]."))
take_damage(I.force)
-/obj/structure/mob_spawner/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/mob_spawner/bullet_act(obj/item/projectile/Proj)
..()
if(destructible)
take_damage(Proj.get_structure_damage())
-/obj/structure/mob_spawner/take_damage(var/damage)
+/obj/structure/mob_spawner/take_damage(damage)
health -= damage
if(health <= 0)
visible_message(span_warning("\The [src] breaks apart!"))
@@ -141,7 +141,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
prox = new(src, range)
//CHOMPEdit Start
-/obj/structure/mob_spawner/scanner/do_spawn(var/mob_path)
+/obj/structure/mob_spawner/scanner/do_spawn(mob_path)
if(!ispath(mob_path))
return 0
if(!ispath(mob_path, /mob/living) && !ispath(mob_path, /obj/structure/closet/crate/mimic))
@@ -310,7 +310,7 @@ It also makes it so a ghost wont know where all the goodies/mobs are.
/mob/living/simple_mob/vore/demon = 0.5 // VERY rare!
)
-/obj/structure/mob_spawner/proc/get_used_report(var/obj/structure/closet/crate/mimic/O)
+/obj/structure/mob_spawner/proc/get_used_report(obj/structure/closet/crate/mimic/O)
if(O in spawned_mobs)
spawned_mobs.Remove(O)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 9edb6ba223..3efac73888 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -54,7 +54,7 @@
return ..()
-/obj/Topic(href, href_list, var/datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/Topic(href, href_list, datum/tgui_state/state = GLOB.tgui_default_state)
if(usr && ..())
return 1
@@ -67,24 +67,24 @@
CouldNotUseTopic(usr)
return 1
-/obj/CanUseTopic(var/mob/user, var/datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/CanUseTopic(mob/user, datum/tgui_state/state = GLOB.tgui_default_state)
if(user.CanUseObjTopic(src))
return ..()
to_chat(user, span_danger("[icon2html(src, user.client)]Access Denied!"))
return STATUS_CLOSE
-/mob/living/silicon/CanUseObjTopic(var/obj/O)
+/mob/living/silicon/CanUseObjTopic(obj/O)
var/id = src.GetIdCard()
return O.check_access(id)
/mob/proc/CanUseObjTopic()
return 1
-/obj/proc/CouldUseTopic(var/mob/user)
+/obj/proc/CouldUseTopic(mob/user)
var/atom/host = tgui_host()
host.add_hiddenprint(user)
-/obj/proc/CouldNotUseTopic(var/mob/user)
+/obj/proc/CouldNotUseTopic(mob/user)
// Nada
/obj/item/proc/is_used_on(obj/O, mob/user)
@@ -131,7 +131,7 @@
/obj/proc/hear_signlang(mob/M as mob, text, verb, datum/language/speaking) // Saycode gets worse every day.
return FALSE
-/obj/proc/see_emote(mob/M as mob, text, var/emote_type)
+/obj/proc/see_emote(mob/M as mob, text, emote_type)
return
// Used to mark a turf as containing objects that are dangerous to step onto.
/obj/proc/register_dangerous_to_step()
@@ -148,7 +148,7 @@
/obj/proc/is_safe_to_step(mob/living/L)
return TRUE
-/obj/proc/container_resist(var/mob/living)
+/obj/proc/container_resist(mob/living)
return
// If returns true, pai can interact with the object with a click
@@ -157,7 +157,7 @@
//To be called from things that spill objects on the floor.
//Makes an object move around randomly for a couple of tiles
-/obj/proc/tumble(var/dist = 2)
+/obj/proc/tumble(dist = 2)
set waitfor = FALSE
if (dist >= 1)
dist += rand(0,1)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index eeead760a3..383bba474a 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -45,7 +45,7 @@
if(3.0)
return
-/obj/structure/proc/can_touch(var/mob/user)
+/obj/structure/proc/can_touch(mob/user)
if (!user)
return 0
if(!Adjacent(user))
@@ -60,7 +60,7 @@
return 0
return 1
-/obj/structure/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/attack_generic(mob/user, damage, attack_verb)
if(!breakable || damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return 0
visible_message(span_danger("[user] [attack_verb] the [src] apart!"))
@@ -71,7 +71,7 @@
/obj/structure/proc/can_visually_connect()
return anchored
-/obj/structure/proc/can_visually_connect_to(var/obj/structure/S)
+/obj/structure/proc/can_visually_connect_to(obj/structure/S)
return istype(S, src)
/obj/structure/proc/update_connections(propagate = 0)
diff --git a/code/game/objects/structures/alien/alien.dm b/code/game/objects/structures/alien/alien.dm
index 7a4a79de64..bb821f854b 100644
--- a/code/game/objects/structures/alien/alien.dm
+++ b/code/game/objects/structures/alien/alien.dm
@@ -13,7 +13,7 @@
qdel(src)
return
-/obj/structure/alien/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/alien/bullet_act(obj/item/projectile/Proj)
health -= Proj.damage
..()
healthcheck()
@@ -52,7 +52,7 @@
..()
return
-/obj/structure/alien/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/alien/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
user.do_attack_animation(src)
diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm
index f27dc891ec..18b0f1122a 100644
--- a/code/game/objects/structures/artstuff.dm
+++ b/code/game/objects/structures/artstuff.dm
@@ -294,7 +294,7 @@
hud_level = FALSE
update_paint()
-/obj/item/paint_brush/proc/update_paint(var/new_color)
+/obj/item/paint_brush/proc/update_paint(new_color)
if(new_color)
selected_color = new_color
color_drop.color = new_color
@@ -554,7 +554,7 @@
* TODO: create a machine in the library for curators to spawn canvases and refactor this to use the proc used there.
* For now, we do it this way because calling this on a canvas itself might cause issues due to the whole dimension thing.
*/
-/obj/structure/sign/painting/proc/admin_lateload_painting(var/spawn_specific = 0, var/which_painting = 0)
+/obj/structure/sign/painting/proc/admin_lateload_painting(spawn_specific = 0, which_painting = 0)
if(!check_rights_for(usr.client, R_HOLDER))
return 0
if(spawn_specific && isnum(which_painting))
diff --git a/code/game/objects/structures/barricades.dm b/code/game/objects/structures/barricades.dm
index 11947a6402..9cebd67937 100644
--- a/code/game/objects/structures/barricades.dm
+++ b/code/game/objects/structures/barricades.dm
@@ -10,7 +10,7 @@
var/maxhealth = 100
var/datum/material/material
-/obj/structure/barricade/Initialize(mapload, var/material_name)
+/obj/structure/barricade/Initialize(mapload, material_name)
. = ..()
if(!material_name)
material_name = MAT_WOOD
@@ -77,12 +77,12 @@
return
-/obj/structure/barricade/take_damage(var/damage)
+/obj/structure/barricade/take_damage(damage)
health -= damage
CheckHealth()
return
-/obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/barricade/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
@@ -128,7 +128,7 @@
icon = 'icons/obj/sandbags.dmi'
icon_state = "blank"
-/obj/structure/barricade/sandbag/Initialize(mapload, var/material_name)
+/obj/structure/barricade/sandbag/Initialize(mapload, material_name)
if(!material_name)
material_name = MAT_CLOTH
. = ..(mapload, material_name)
@@ -164,7 +164,7 @@
return
-/obj/structure/barricade/sandbag/update_connections(propagate = 0, var/obj/structure/barricade/sandbag/ignore = null)
+/obj/structure/barricade/sandbag/update_connections(propagate = 0, obj/structure/barricade/sandbag/ignore = null)
if(!material)
return
var/list/dirs = list()
@@ -182,7 +182,7 @@
update_icon()
-/obj/structure/barricade/sandbag/proc/can_join_with(var/obj/structure/barricade/sandbag/S)
+/obj/structure/barricade/sandbag/proc/can_join_with(obj/structure/barricade/sandbag/S)
if(material == S.material)
return 1
return 0
diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm
index 7f5c6b53ad..09abd5a00a 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -139,7 +139,7 @@
/obj/structure/bonfire/permanent/add_fuel(mob/user)
to_chat(user, span_warning("\The [src] has plenty of fuel and doesn't need more fuel."))
-/obj/structure/bonfire/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
+/obj/structure/bonfire/proc/consume_fuel(obj/item/stack/consumed_fuel)
if(!istype(consumed_fuel))
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
@@ -339,7 +339,7 @@
to_chat(user, span_warning("\The [src] needs raw wood to burn, \a [new_fuel] won't work."))
return FALSE
-/obj/structure/fireplace/proc/consume_fuel(var/obj/item/stack/consumed_fuel)
+/obj/structure/fireplace/proc/consume_fuel(obj/item/stack/consumed_fuel)
if(!istype(consumed_fuel))
qdel(consumed_fuel) // Don't know, don't care.
return FALSE
diff --git a/code/game/objects/structures/catwalk.dm b/code/game/objects/structures/catwalk.dm
index 7526b3a75b..9b24ca8597 100644
--- a/code/game/objects/structures/catwalk.dm
+++ b/code/game/objects/structures/catwalk.dm
@@ -76,7 +76,7 @@
new /obj/item/stack/rods(src.loc, 2) //VOREstation Edit: Conservation of mass
qdel(src)
-/obj/structure/catwalk/attack_robot(var/mob/user)
+/obj/structure/catwalk/attack_robot(mob/user)
if(Adjacent(user))
attack_hand(user)
diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm
index f91b948819..038acac42c 100644
--- a/code/game/objects/structures/crates_lockers/__closets.dm
+++ b/code/game/objects/structures/crates_lockers/__closets.dm
@@ -173,7 +173,7 @@
return 1
//Cham Projector Exception
-/obj/structure/closet/proc/store_misc(var/stored_units)
+/obj/structure/closet/proc/store_misc(stored_units)
var/added_units = 0
for(var/obj/effect/dummy/chameleon/AD in loc)
if((stored_units + added_units) > storage_capacity)
@@ -182,7 +182,7 @@
added_units++
return added_units
-/obj/structure/closet/proc/store_items(var/stored_units)
+/obj/structure/closet/proc/store_items(stored_units)
var/added_units = 0
for(var/obj/item/I in loc)
var/item_size = CEILING(I.w_class / 2, 1)
@@ -193,7 +193,7 @@
added_units += item_size
return added_units
-/obj/structure/closet/proc/store_mobs(var/stored_units)
+/obj/structure/closet/proc/store_mobs(stored_units)
var/added_units = 0
for(var/mob/living/M in loc)
if(M.buckled || M.pinned.len)
@@ -204,7 +204,7 @@
added_units += M.mob_size
return added_units
-/obj/structure/closet/proc/store_closets(var/stored_units)
+/obj/structure/closet/proc/store_closets(stored_units)
var/added_units = 0
for(var/obj/structure/closet/C in loc)
if(C == src) //Don't store ourself
@@ -250,14 +250,14 @@
/obj/structure/closet/blob_act()
damage(100)
-/obj/structure/closet/proc/damage(var/damage)
+/obj/structure/closet/proc/damage(damage)
health -= damage
if(health <= 0)
for(var/atom/movable/A in src)
A.forceMove(loc)
qdel(src)
-/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/closet/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage)
return
@@ -416,7 +416,7 @@
else
icon_state = "closed_unlocked[sealed ? "_welded" : ""]"
-/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys")
+/obj/structure/closet/attack_generic(mob/user, damage, attack_message = "destroys")
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return
user.do_attack_animation(src)
@@ -432,7 +432,7 @@
return 0 //closed but not sealed...
return 1
-/obj/structure/closet/container_resist(var/mob/living/escapee)
+/obj/structure/closet/container_resist(mob/living/escapee)
if(breakout || !req_breakout())
return
@@ -477,19 +477,19 @@
BD.unwrap()
open()
-/obj/structure/closet/onDropInto(var/atom/movable/AM)
+/obj/structure/closet/onDropInto(atom/movable/AM)
return
/obj/structure/closet/AllowDrop()
return TRUE
-/obj/structure/closet/return_air_for_internal_lifeform(var/mob/living/L)
+/obj/structure/closet/return_air_for_internal_lifeform(mob/living/L)
if(loc)
if(istype(loc, /obj/structure/closet))
return (loc.return_air_for_internal_lifeform(L))
return return_air()
-/obj/structure/closet/take_damage(var/damage)
+/obj/structure/closet/take_damage(damage)
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return
dump_contents()
diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
index b9cd1afb88..5f10e1432d 100644
--- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
+++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
@@ -1,4 +1,4 @@
-/obj/structure/closet/debug/Initialize(mapload, var/newappearance)
+/obj/structure/closet/debug/Initialize(mapload, newappearance)
closet_appearance = newappearance
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index 99988ce1c3..f3ba4ecc73 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -145,10 +145,10 @@
.=..()
alpha = 255 // Needed because of grave hiding
-/obj/structure/closet/grave/bullet_act(var/obj/item/projectile/P)
+/obj/structure/closet/grave/bullet_act(obj/item/projectile/P)
return PROJECTILE_CONTINUE // It's a hole in the ground, doesn't usually stop or even care about bullets
-/obj/structure/closet/grave/return_air_for_internal_lifeform(var/mob/living/L)
+/obj/structure/closet/grave/return_air_for_internal_lifeform(mob/living/L)
var/gasid = GAS_CO2
if(ishuman(L))
var/mob/living/carbon/human/H = L
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index c194e6ec65..2a9d2ca01f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -83,7 +83,7 @@
to_chat(user, span_warning("Access Denied"))
update_icon()
-/obj/structure/closet/secure_closet/personal/emag_act(var/remaining_charges, var/mob/user, var/visual_feedback, var/audible_feedback)
+/obj/structure/closet/secure_closet/personal/emag_act(remaining_charges, mob/user, visual_feedback, audible_feedback)
if(!broken)
broken = 1
locked = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 1a4363961c..9661627b08 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -96,7 +96,7 @@
else
togglelock(user)
-/obj/structure/closet/secure_closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
+/obj/structure/closet/secure_closet/emag_act(remaining_charges, mob/user, emag_source, visual_feedback = "", audible_feedback = "")
if(!broken)
broken = 1
locked = 0
@@ -164,7 +164,7 @@
var/self_del = 1
anchored = 0
-/obj/structure/closet/secure_closet/mind/Initialize(mapload, var/datum/mind/mind_target, var/del_self = 1)
+/obj/structure/closet/secure_closet/mind/Initialize(mapload, datum/mind/mind_target, del_self = 1)
. = ..()
self_del = del_self
if(mind_target)
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 152056d62a..ada3d8f779 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -14,7 +14,7 @@
var/intialOxy = 0
var/timer = 240 //eventually the person will be freed
-/obj/structure/closet/statue/Initialize(mapload, var/mob/living/L)
+/obj/structure/closet/statue/Initialize(mapload, mob/living/L)
. = ..()
if(L && (ishuman(L) || L.isMonkey() || iscorgi(L)))
if(L.buckled)
@@ -81,13 +81,13 @@
for(var/mob/M in src)
shatter(M)
-/obj/structure/closet/statue/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/closet/statue/bullet_act(obj/item/projectile/Proj)
health -= Proj.get_structure_damage()
check_health()
return
-/obj/structure/closet/statue/attack_generic(var/mob/user, damage, attacktext, environment_smash)
+/obj/structure/closet/statue/attack_generic(mob/user, damage, attacktext, environment_smash)
if(damage && environment_smash)
for(var/mob/M in src)
shatter(M)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index ef74ce95bf..0b88c0fd5a 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -174,7 +174,7 @@
else
to_chat(user, span_notice("Access Denied"))
-/obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null)
+/obj/structure/closet/crate/secure/proc/set_locked(newlocked, mob/user = null)
if(locked == newlocked) return
locked = newlocked
@@ -214,7 +214,7 @@
return
return ..()
-/obj/structure/closet/crate/secure/emag_act(var/remaining_charges, var/mob/user)
+/obj/structure/closet/crate/secure/emag_act(remaining_charges, mob/user)
if(!broken)
playsound(src, "sparks", 60, 1)
locked = 0
@@ -330,7 +330,7 @@
newgas.temperature = target_temp
return newgas
-/obj/structure/closet/crate/freezer/Entered(var/atom/movable/AM)
+/obj/structure/closet/crate/freezer/Entered(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 1
@@ -338,7 +338,7 @@
organ.preserved = 1
..()
-/obj/structure/closet/crate/freezer/Exited(var/atom/movable/AM)
+/obj/structure/closet/crate/freezer/Exited(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 0
diff --git a/code/game/objects/structures/crates_lockers/crates_vr.dm b/code/game/objects/structures/crates_lockers/crates_vr.dm
index b0f6d7fcd9..b89f51c165 100644
--- a/code/game/objects/structures/crates_lockers/crates_vr.dm
+++ b/code/game/objects/structures/crates_lockers/crates_vr.dm
@@ -1,7 +1,7 @@
/obj/structure/closet/crate/secure
var/tamper_proof = 0
-/obj/structure/closet/crate/secure/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/closet/crate/secure/bullet_act(obj/item/projectile/Proj)
if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN))
return
diff --git a/code/game/objects/structures/crates_lockers/vehiclecage.dm b/code/game/objects/structures/crates_lockers/vehiclecage.dm
index 85d38ca189..967668030c 100644
--- a/code/game/objects/structures/crates_lockers/vehiclecage.dm
+++ b/code/game/objects/structures/crates_lockers/vehiclecage.dm
@@ -57,7 +57,7 @@
showcase.layer = src.layer - 0.1
underlays += showcase
-/obj/structure/vehiclecage/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/structure/vehiclecage/MouseDrop_T(atom/movable/C, mob/user as mob)
if(user && (user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C)))
return
@@ -70,7 +70,7 @@
if(!my_vehicle)
load_vehicle(V, user)
-/obj/structure/vehiclecage/proc/load_vehicle(var/obj/vehicle/V, mob/user as mob)
+/obj/structure/vehiclecage/proc/load_vehicle(obj/vehicle/V, mob/user as mob)
if(user)
user.visible_message(span_notice("[user] loads \the [V] into \the [src]."), \
span_notice("You load \the [V] into \the [src]."), \
diff --git a/code/game/objects/structures/dancepole_vr.dm b/code/game/objects/structures/dancepole_vr.dm
index aca81a5a69..a3807e4901 100644
--- a/code/game/objects/structures/dancepole_vr.dm
+++ b/code/game/objects/structures/dancepole_vr.dm
@@ -7,7 +7,7 @@
density = FALSE
anchored = TRUE
-/obj/structure/dancepole/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/structure/dancepole/attackby(obj/item/O as obj, mob/user as mob)
if(O.has_tool_quality(TOOL_SCREWDRIVER))
anchored = !anchored
playsound(src, O.usesound, 50, 1)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index d376be9a3f..a1b522ece2 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -28,7 +28,7 @@
src.healthcheck()
-/obj/structure/displaycase/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/displaycase/bullet_act(obj/item/projectile/Proj)
health -= Proj.get_structure_damage()
..()
src.healthcheck()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 889002e94e..65d7a9d6e0 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -324,7 +324,7 @@
// Airlock frames are indestructable, so bullets hitting them would always be stopped.
// To fix this, airlock assemblies will sometimes let bullets pass through, since generally the sprite shows them partially open.
-/obj/structure/door_assembly/bullet_act(var/obj/item/projectile/P)
+/obj/structure/door_assembly/bullet_act(obj/item/projectile/P)
if(prob(40)) // Chance for the frame to let the bullet keep going.
return PROJECTILE_CONTINUE
return ..()
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 4d8ca6d766..31391a5cd9 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -10,7 +10,7 @@
var/obj/item/extinguisher/has_extinguisher
var/opened = 0
-/obj/structure/extinguisher_cabinet/Initialize(mapload, var/dir, var/building = 0)
+/obj/structure/extinguisher_cabinet/Initialize(mapload, dir, building = 0)
. = ..()
if(building)
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index 2b0a088e05..0966099af1 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -21,7 +21,7 @@
fireaxe = new /obj/item/material/twohanded/fireaxe()
update_icon()
-/obj/structure/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
+/obj/structure/fireaxecabinet/attackby(obj/item/O as obj, mob/user as mob) //Marker -Agouri
//..() //That's very useful, Erro
// This could stand to be put further in, made better, etc. but fuck you. Fuck whoever
diff --git a/code/game/objects/structures/fitness.dm b/code/game/objects/structures/fitness.dm
index a9d45530db..a8f4501c9a 100644
--- a/code/game/objects/structures/fitness.dm
+++ b/code/game/objects/structures/fitness.dm
@@ -11,7 +11,7 @@
density = TRUE
var/list/hit_message = list("hit", "punch", "kick", "robust")
-/obj/structure/fitness/punchingbag/attack_hand(var/mob/living/carbon/human/user)
+/obj/structure/fitness/punchingbag/attack_hand(mob/living/carbon/human/user)
if(!istype(user))
..()
return
@@ -43,7 +43,7 @@
weight = ((weight) % qualifiers.len) + 1
to_chat(user, "You set the machine's weight level to [weight].")
-/obj/structure/fitness/weightlifter/attack_hand(var/mob/living/carbon/human/user)
+/obj/structure/fitness/weightlifter/attack_hand(mob/living/carbon/human/user)
if(!istype(user))
return
if(user.loc != src.loc)
diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm
index 72668192ac..920d256248 100644
--- a/code/game/objects/structures/flora/flora.dm
+++ b/code/game/objects/structures/flora/flora.dm
@@ -52,7 +52,7 @@
/obj/structure/flora/proc/get_harvestable_desc()
return span_notice("\The [src] seems to have something hanging from it.")
-/obj/structure/flora/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/flora/attackby(obj/item/W, mob/living/user)
if(can_harvest(W))
var/harvest_spawn = pickweight(harvest_loot)
@@ -72,13 +72,13 @@
..(W, user)
-/obj/structure/flora/proc/can_harvest(var/obj/item/I)
+/obj/structure/flora/proc/can_harvest(obj/item/I)
. = FALSE
if(harvest_tool && istype(I, harvest_tool) && harvest_loot && harvest_loot.len && harvest_count < max_harvests)
. = TRUE
return .
-/obj/structure/flora/proc/spawn_harvest(var/path = null, var/mob/user = null)
+/obj/structure/flora/proc/spawn_harvest(path = null, mob/user = null)
if(!ispath(path))
return 0
@@ -129,7 +129,7 @@
min_harvests = 1
max_harvests = 3
-/obj/structure/flora/ausbushes/spawn_harvest(var/path = null, var/mob/user = null)
+/obj/structure/flora/ausbushes/spawn_harvest(path = null, mob/user = null)
. = ..()
if(. && prob(15))
var/static/list/possibleseeds = list(
@@ -152,7 +152,7 @@
var/choice = pickweight(possibleseeds)
new choice(get_turf(user))
-/obj/structure/flora/ausbushes/Initialize(mapload, var/bush_icon)
+/obj/structure/flora/ausbushes/Initialize(mapload, bush_icon)
. = ..()
if(bush_icon)
icon_state = bush_icon
diff --git a/code/game/objects/structures/flora/grass.dm b/code/game/objects/structures/flora/grass.dm
index cfe04f2ff6..e0cd0c5c55 100644
--- a/code/game/objects/structures/flora/grass.dm
+++ b/code/game/objects/structures/flora/grass.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/flora/snowflora.dmi'
anchored = TRUE
-/obj/structure/flora/grass/Initialize(mapload, var/grass_icon)
+/obj/structure/flora/grass/Initialize(mapload, grass_icon)
. = ..()
icon_state = grass_icon
diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm
index d773786962..d9c95cdbb7 100644
--- a/code/game/objects/structures/flora/trees.dm
+++ b/code/game/objects/structures/flora/trees.dm
@@ -30,13 +30,13 @@
/obj/structure/flora/tree/proc/choose_icon_state()
return icon_state
-/obj/structure/flora/tree/can_harvest(var/obj/item/I)
+/obj/structure/flora/tree/can_harvest(obj/item/I)
. = FALSE
if(!is_stump && harvest_tool && istype(I, harvest_tool) && harvest_loot && harvest_loot.len && harvest_count < max_harvests)
. = TRUE
return .
-/obj/structure/flora/tree/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/flora/tree/attackby(obj/item/W, mob/living/user)
if(can_harvest(W))
..(W, user)
return
@@ -81,7 +81,7 @@
animate(transform=M, pixel_x=init_px, time=6, easing=ELASTIC_EASING)
// Used when the tree gets hurt.
-/obj/structure/flora/tree/proc/adjust_health(var/amount, var/damage_wood = FALSE)
+/obj/structure/flora/tree/proc/adjust_health(amount, damage_wood = FALSE)
if(is_stump || indestructable)
return
@@ -117,10 +117,10 @@
cut_overlays() // For the Sif tree and other future glowy trees.
set_light(0)
-/obj/structure/flora/tree/ex_act(var/severity)
+/obj/structure/flora/tree/ex_act(severity)
adjust_health(-(max_health / severity), TRUE)
-/obj/structure/flora/tree/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/flora/tree/bullet_act(obj/item/projectile/Proj)
if(Proj.get_structure_damage())
adjust_health(-Proj.get_structure_damage(), TRUE)
diff --git a/code/game/objects/structures/gargoyle.dm b/code/game/objects/structures/gargoyle.dm
index 4d422f9407..0f21c37330 100644
--- a/code/game/objects/structures/gargoyle.dm
+++ b/code/game/objects/structures/gargoyle.dm
@@ -25,7 +25,7 @@
var/can_revert = TRUE
var/was_rayed = FALSE
-/obj/structure/gargoyle/Initialize(mapload, var/mob/living/carbon/human/H, var/ident_ovr, var/mat_ovr, var/adj_ovr, var/tint_ovr, var/revert = TRUE, var/discard_clothes)
+/obj/structure/gargoyle/Initialize(mapload, mob/living/carbon/human/H, ident_ovr, mat_ovr, adj_ovr, tint_ovr, revert = TRUE, discard_clothes)
. = ..()
if(isspace(loc) || isopenspace(loc))
anchored = FALSE
@@ -182,7 +182,7 @@
. += stored_examine
return
-/obj/structure/gargoyle/proc/unpetrify(var/deal_damage = TRUE, var/deleting = FALSE)
+/obj/structure/gargoyle/proc/unpetrify(deal_damage = TRUE, deleting = FALSE)
var/mob/living/carbon/human/gargoyle = WR_gargoyle.resolve()
if(!gargoyle)
return
@@ -227,29 +227,29 @@
/obj/structure/gargoyle/return_air()
return return_air_for_internal_lifeform()
-/obj/structure/gargoyle/return_air_for_internal_lifeform(var/mob/living/lifeform)
+/obj/structure/gargoyle/return_air_for_internal_lifeform(mob/living/lifeform)
var/air_type = /datum/gas_mixture/belly_air
if(istype(lifeform))
air_type = lifeform.get_perfect_belly_air_type()
var/air = new air_type(1000)
return air
-/obj/structure/gargoyle/proc/damage(var/damage)
+/obj/structure/gargoyle/proc/damage(damage)
if(was_rayed)
return //gargoyle quick regenerates, the others don't, so let's not have them getting too damaged
obj_integrity = min(obj_integrity-damage, max_integrity)
if(obj_integrity <= 0)
qdel(src)
-/obj/structure/gargoyle/take_damage(var/damage)
+/obj/structure/gargoyle/take_damage(damage)
damage(damage)
-/obj/structure/gargoyle/attack_generic(var/mob/user, var/damage, var/attack_message = "hits")
+/obj/structure/gargoyle/attack_generic(mob/user, damage, attack_message = "hits")
user.do_attack_animation(src)
visible_message(span_danger("[user] [attack_message] the [src]!"))
damage(damage)
-/obj/structure/gargoyle/attackby(var/obj/item/W as obj, var/mob/living/user as mob)
+/obj/structure/gargoyle/attackby(obj/item/W as obj, mob/living/user as mob)
var/mob/living/carbon/human/gargoyle = WR_gargoyle.resolve()
if(W.is_wrench())
if(isspace(loc) || isopenspace(loc))
@@ -278,7 +278,7 @@
else
return ..()
-/obj/structure/gargoyle/set_dir(var/new_dir)
+/obj/structure/gargoyle/set_dir(new_dir)
. = ..()
if(. && tail_image)
cut_overlay(tail_image)
diff --git a/code/game/objects/structures/ghost_pods/antagonist.dm b/code/game/objects/structures/ghost_pods/antagonist.dm
index c5b9e73f26..5b7cb582ae 100644
--- a/code/game/objects/structures/ghost_pods/antagonist.dm
+++ b/code/game/objects/structures/ghost_pods/antagonist.dm
@@ -13,7 +13,7 @@
delay_to_try_again = 1 MINUTES //10 minutes for egg to grow, 5 minutes for larva to mature
anchored = TRUE
-/obj/structure/ghost_pod/automatic/xenomorph_egg/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/automatic/xenomorph_egg/create_occupant(mob/M)
var/mob/living/carbon/alien/larva/R = new(get_turf(src))
if(M.mind)
M.mind.transfer_to(R)
@@ -45,7 +45,7 @@
..()
return
-/obj/structure/ghost_pod/automatic/xenomorph_egg/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/ghost_pod/automatic/xenomorph_egg/bullet_act(obj/item/projectile/Proj)
switch(Proj.damtype)
if(BURN)
health -= Proj.damage * 1.5 //It burns!
diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm
index ec1fe2dbca..26a9a00256 100644
--- a/code/game/objects/structures/ghost_pods/event_vr.dm
+++ b/code/game/objects/structures/ghost_pods/event_vr.dm
@@ -14,7 +14,7 @@
invisibility = INVISIBILITY_OBSERVER
spawn_active = TRUE
-/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(mob/M)
..()
var/choice
var/finalized = "No"
@@ -75,7 +75,7 @@
invisibility = INVISIBILITY_OBSERVER
spawn_active = TRUE
-/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/morphspawn/create_occupant(mob/M)
..()
//No OOC notes
@@ -127,7 +127,7 @@
var/redgate_restricted = FALSE
//override the standard attack_ghost proc for custom messages
-/obj/structure/ghost_pod/ghost_activated/maint_lurker/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/ghost_pod/ghost_activated/maint_lurker/attack_ghost(mob/observer/dead/user)
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot use this spawnpoint because you are banned from playing ghost roles."))
return
@@ -149,7 +149,7 @@
create_occupant(user)
-/obj/structure/ghost_pod/ghost_activated/maint_lurker/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/maint_lurker/create_occupant(mob/M)
..()
var/picked_ckey = M.ckey
@@ -205,7 +205,7 @@
desc = "A starting location for characters who exist inside of the redgate!"
redgate_restricted = TRUE
-/obj/structure/ghost_pod/ghost_activated/maint_lurker/redgate/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/ghost_pod/ghost_activated/maint_lurker/redgate/attack_ghost(mob/observer/dead/user)
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot use this spawnpoint because you are banned from playing ghost roles."))
return
diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm
index 5d42b84fab..a48a267910 100644
--- a/code/game/objects/structures/ghost_pods/ghost_pods.dm
+++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm
@@ -14,7 +14,7 @@
var/delay_to_try_again = 0 // How long to wait if first attempt fails. Set to 0 to never try again.
// Call this to get a ghost volunteer.
-/obj/structure/ghost_pod/proc/trigger(var/alert, var/adminalert)
+/obj/structure/ghost_pod/proc/trigger(alert, adminalert)
if(!ghost_query_type)
return FALSE
if(busy)
@@ -45,7 +45,7 @@
QDEL_NULL(Q) //get rid of the query
// Override this to create whatever mob you need. Be sure to call ..() if you don't want it to make infinite mobs.
-/obj/structure/ghost_pod/proc/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/proc/create_occupant(mob/M)
used = TRUE
icon_state = icon_state_opened
GLOB.active_ghost_pods -= src
@@ -58,7 +58,7 @@
/obj/structure/ghost_pod/manual
var/confirm_before_open = FALSE // Recommended to be TRUE if the pod contains a surprise.
-/obj/structure/ghost_pod/manual/attack_hand(var/mob/living/user)
+/obj/structure/ghost_pod/manual/attack_hand(mob/living/user)
if(!used)
if(confirm_before_open)
if(tgui_alert(user, "Are you sure you want to touch \the [src]?", "Confirm", list("No", "Yes")) != "Yes")
@@ -70,7 +70,7 @@
ghostpod_startup(FALSE)
// VOREStation Addition End
-/obj/structure/ghost_pod/manual/attack_ai(var/mob/living/silicon/user)
+/obj/structure/ghost_pod/manual/attack_ai(mob/living/silicon/user)
if(Adjacent(user))
attack_hand(user) // Borgs can open pods.
@@ -93,7 +93,7 @@
/obj/structure/ghost_pod/ghost_activated
description_info = "A ghost can click on this to return to the round as whatever is contained inside this object."
-/obj/structure/ghost_pod/ghost_activated/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/ghost_pod/ghost_activated/attack_ghost(mob/observer/dead/user)
//VOREStation Add Start
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles."))
diff --git a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
index ff2523d652..cd86d30e78 100644
--- a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
+++ b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
@@ -9,7 +9,7 @@
var/remains_active = FALSE
var/activated = FALSE
-/obj/structure/ghost_pod/manual/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/ghost_pod/manual/attack_ghost(mob/observer/dead/user)
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot inhabit this creature because you are banned from playing ghost roles."))
return
@@ -45,7 +45,7 @@
create_occupant(user)
-/obj/structure/ghost_pod/proc/ghostpod_startup(var/notify = FALSE)
+/obj/structure/ghost_pod/proc/ghostpod_startup(notify = FALSE)
GLOB.active_ghost_pods |= src
if(notify)
trigger()
diff --git a/code/game/objects/structures/ghost_pods/human.dm b/code/game/objects/structures/ghost_pods/human.dm
index 56d23e9b0b..ed517bc65a 100644
--- a/code/game/objects/structures/ghost_pods/human.dm
+++ b/code/game/objects/structures/ghost_pods/human.dm
@@ -37,7 +37,7 @@
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/radio/headset
-/obj/structure/ghost_pod/ghost_activated/human/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/human/create_occupant(mob/M)
..()
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = new(src)
@@ -165,7 +165,7 @@
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/radio/headset
-/obj/structure/ghost_pod/manual/human/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/human/create_occupant(mob/M)
..()
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = new(src)
diff --git a/code/game/objects/structures/ghost_pods/mysterious.dm b/code/game/objects/structures/ghost_pods/mysterious.dm
index 5a96adb311..f4d46cec98 100644
--- a/code/game/objects/structures/ghost_pods/mysterious.dm
+++ b/code/game/objects/structures/ghost_pods/mysterious.dm
@@ -12,7 +12,7 @@
/obj/structure/ghost_pod/manual/corgi/trigger()
..(span_warning("\The [usr] places their hand on the rune!"), "is attempting to summon a corgi.")
-/obj/structure/ghost_pod/manual/corgi/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/corgi/create_occupant(mob/M)
lightning_strike(get_turf(src), cosmetic = TRUE)
density = FALSE
var/mob/living/simple_mob/animal/passive/dog/corgi/R = new(get_turf(src))
@@ -38,7 +38,7 @@
/obj/structure/ghost_pod/manual/cursedblade/trigger()
..(span_warning("\The [usr] attempts to pull out the sword!"), "is activating a cursed blade.")
-/obj/structure/ghost_pod/manual/cursedblade/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/cursedblade/create_occupant(mob/M)
density = FALSE
var/obj/item/melee/cursedblade/R = new(get_turf(src))
to_chat(M, span_notice("You are a " + span_bold("Cursed Sword") + ", discovered by a hapless explorer. \
diff --git a/code/game/objects/structures/ghost_pods/silicon.dm b/code/game/objects/structures/ghost_pods/silicon.dm
index 959b383f79..1ada93f76c 100644
--- a/code/game/objects/structures/ghost_pods/silicon.dm
+++ b/code/game/objects/structures/ghost_pods/silicon.dm
@@ -15,7 +15,7 @@
/obj/structure/ghost_pod/manual/lost_drone/trigger()
..(span_notice("\The [src] appears to be attempting to restart the robot contained inside."), "is attempting to open \a [src].")
-/obj/structure/ghost_pod/manual/lost_drone/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/lost_drone/create_occupant(mob/M)
density = FALSE
var/mob/living/silicon/robot/malf/lost/randomlaws/R = new(get_turf(src))
R.adjustBruteLoss(rand(5, 30))
@@ -45,7 +45,7 @@
ghost_query_type = /datum/ghost_query/gravekeeper_drone
needscharger = TRUE
-/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/automatic/gravekeeper_drone/create_occupant(mob/M)
density = FALSE
var/mob/living/silicon/robot/malf/gravekeeper/R = new(get_turf(src))
if(M.mind)
@@ -69,7 +69,7 @@
var/drone_class = "general"
var/drone_type = /mob/living/silicon/robot/drone/swarm
-/obj/structure/ghost_pod/ghost_activated/swarm_drone/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/swarm_drone/create_occupant(mob/M)
var/mob/living/silicon/robot/drone/swarm/R = new drone_type(get_turf(src))
if(M.mind)
M.mind.transfer_to(R)
diff --git a/code/game/objects/structures/ghost_pods/silicon_vr.dm b/code/game/objects/structures/ghost_pods/silicon_vr.dm
index 507eded1c5..30b1398849 100644
--- a/code/game/objects/structures/ghost_pods/silicon_vr.dm
+++ b/code/game/objects/structures/ghost_pods/silicon_vr.dm
@@ -1,7 +1,7 @@
/obj/structure/ghost_pod/manual/lost_drone/dogborg // name is just legacy now
remains_active = TRUE
-/obj/structure/ghost_pod/manual/lost_drone/dogborg/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/lost_drone/dogborg/create_occupant(mob/M)
var/response = tgui_alert(M, "What sort of laws do you wish to have as Lost Drone (they will still be random)", "Drone Type", list("Regular", "Vore"))
if(!(response == "Vore")) // No response somehow or Regular
return ..()
diff --git a/code/game/objects/structures/ghost_pods/survivor.dm b/code/game/objects/structures/ghost_pods/survivor.dm
index 8b487946f1..58f702bd59 100644
--- a/code/game/objects/structures/ghost_pods/survivor.dm
+++ b/code/game/objects/structures/ghost_pods/survivor.dm
@@ -58,7 +58,7 @@
clothing_possibilities |= /obj/item/clothing/shoes/black
clothing_possibilities |= /obj/item/radio/headset
-/obj/structure/ghost_pod/manual/survivor/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/survivor/create_occupant(mob/M)
..()
var/turf/T = get_turf(src)
var/mob/living/carbon/human/H = new(src)
diff --git a/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm b/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
index c44cc0ea16..6c2f9d8135 100644
--- a/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
+++ b/code/game/objects/structures/ghost_pods/unified_ghost_hole.dm
@@ -15,7 +15,7 @@
attack_ghost(user)
//override the standard attack_ghost proc for custom messages
-/obj/structure/ghost_pod/ghost_activated/unified_hole/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/ghost_pod/ghost_activated/unified_hole/attack_ghost(mob/observer/dead/user)
var/choice
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, span_warning("You cannot use this spawnpoint because you are banned from playing ghost roles."))
@@ -48,7 +48,7 @@
update_icon()
GLOB.active_ghost_pods -= src
-/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_simplemob(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_simplemob(mob/M)
var/choice
var/finalized = FALSE
GLOB.active_ghost_pods -= src
@@ -90,7 +90,7 @@
newPred.vore_selected = newPred.vore_organs[1]
qdel(src)
-/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_morph(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_morph(mob/M)
GLOB.active_ghost_pods -= src
var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src))
newMorph.voremob_loaded = TRUE // On-demand belly loading.
@@ -112,7 +112,7 @@
newMorph.vore_selected = newMorph.vore_organs[1]
qdel(src)
-/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_lurker(var/mob/M)
+/obj/structure/ghost_pod/ghost_activated/unified_hole/proc/create_lurker(mob/M)
var/picked_ckey = M.ckey
var/picked_slot = M.client.prefs.default_slot
GLOB.active_ghost_pods -= src
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index e553481934..9388ac9505 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -20,7 +20,7 @@
var/wall_type = /turf/simulated/wall
rad_insulation = RAD_VERY_LIGHT_INSULATION
-/obj/structure/girder/Initialize(mapload, var/material_key)
+/obj/structure/girder/Initialize(mapload, material_key)
. = ..()
if(!material_key)
material_key = default_material
@@ -56,7 +56,7 @@
return total_radiation
-/obj/structure/girder/proc/set_material(var/datum/material/new_material)
+/obj/structure/girder/proc/set_material(datum/material/new_material)
girder_material = new_material
name = "[girder_material.display_name] [initial(name)]"
max_health = round(girder_material.integrity) //Should be 150 with default integrity (steel). Weaker than ye-olden Girders now.
@@ -95,7 +95,7 @@
health = (displaced_health - round(current_damage / 4))
cover = 25
-/obj/structure/girder/attack_generic(var/mob/user, var/damage, var/attack_message = "smashes apart")
+/obj/structure/girder/attack_generic(mob/user, damage, attack_message = "smashes apart")
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
return 0
user.do_attack_animation(src)
@@ -103,7 +103,7 @@
spawn(1) dismantle()
return 1
-/obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/girder/bullet_act(obj/item/projectile/Proj)
//Girders only provide partial cover. There's a chance that the projectiles will just pass through. (unless you are trying to shoot the girder)
if(Proj.original != src && !prob(cover))
return PROJECTILE_CONTINUE //pass through
@@ -229,7 +229,7 @@
else
return ..()
-/obj/structure/girder/take_damage(var/damage)
+/obj/structure/girder/take_damage(damage)
health -= damage
if(health <= 0)
dismantle()
diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm
index 897ee2d23e..58e3e37261 100644
--- a/code/game/objects/structures/gravemarker.dm
+++ b/code/game/objects/structures/gravemarker.dm
@@ -18,7 +18,7 @@
var/datum/material/material
-/obj/structure/gravemarker/Initialize(mapload, var/material_name)
+/obj/structure/gravemarker/Initialize(mapload, material_name)
. = ..()
if(!material_name)
material_name = MAT_WOOD
@@ -75,7 +75,7 @@
dismantle()
..()
-/obj/structure/gravemarker/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/gravemarker/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage)
return
@@ -99,7 +99,7 @@
qdel(src)
return
-/obj/structure/gravemarker/proc/damage(var/damage)
+/obj/structure/gravemarker/proc/damage(damage)
health -= damage
if(health <= 0)
visible_message(span_danger("\The [src] falls apart!"))
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 7ac6bc7525..cf0d54b804 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -55,7 +55,7 @@
return prob(30)
return !density
-/obj/structure/grille/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/grille/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
//Flimsy grilles aren't so great at stopping projectiles. However they can absorb some of the impact
@@ -212,7 +212,7 @@
healthcheck()
..()
-/obj/structure/grille/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/grille/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
user.do_attack_animation(src)
health -= damage
@@ -288,7 +288,7 @@
qdel(src)
return TRUE
-/obj/structure/grille/take_damage(var/damage)
+/obj/structure/grille/take_damage(damage)
health -= damage
spawn(1) healthcheck()
return 1
diff --git a/code/game/objects/structures/holoplant.dm b/code/game/objects/structures/holoplant.dm
index a573d569e2..7ca058a604 100644
--- a/code/game/objects/structures/holoplant.dm
+++ b/code/game/objects/structures/holoplant.dm
@@ -14,7 +14,7 @@
. = ..()
activate()
-/obj/machinery/holoplant/attack_hand(var/mob/living/user)
+/obj/machinery/holoplant/attack_hand(mob/living/user)
if(!istype(user) || interference)
return
@@ -27,7 +27,7 @@
else
deactivate()
-/obj/machinery/holoplant/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/holoplant/attackby(obj/item/O as obj, mob/user as mob)
if(default_unfasten_wrench(user, O, 10))
deactivate()
return
@@ -73,7 +73,7 @@
set_light(2)
interference = FALSE
-/obj/machinery/holoplant/proc/prepare_icon(var/state)
+/obj/machinery/holoplant/proc/prepare_icon(state)
if(!state)
state = pick(GLOB.possible_plants)
var/plant_icon = icon(icon, state)
@@ -88,7 +88,7 @@
deactivate()
activate()
-/obj/machinery/holoplant/Crossed(var/mob/living/L)
+/obj/machinery/holoplant/Crossed(mob/living/L)
if(!interference && plant && istype(L))
flicker()
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index a88157d39a..034c01a3fa 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -37,7 +37,7 @@
playsound(loc, 'sound/weapons/egloves.ogg', 80, 1)
take_damage(W.force)
-/obj/structure/holosign/take_damage(var/damage)
+/obj/structure/holosign/take_damage(damage)
health -= damage
spawn(1) healthcheck()
return 1
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index cc634dfcd6..8191065cbb 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -17,7 +17,7 @@
return FALSE
inflate(user,user.loc)
-/obj/item/inflatable/afterattack(var/atom/A, var/mob/user)
+/obj/item/inflatable/afterattack(atom/A, mob/user)
..(A, user)
if(!user)
return
@@ -49,7 +49,7 @@
update_nearby_tiles()
return ..()
-/obj/structure/inflatable/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/inflatable/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage) return
@@ -90,7 +90,7 @@
..()
return
-/obj/structure/inflatable/proc/hit(var/damage, var/sound_effect = 1)
+/obj/structure/inflatable/proc/hit(damage, sound_effect = 1)
health = max(0, health - damage)
if(sound_effect)
playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
@@ -100,7 +100,7 @@
/obj/structure/inflatable/click_ctrl()
hand_deflate()
-/obj/item/inflatable/proc/inflate(var/mob/user,var/location)
+/obj/item/inflatable/proc/inflate(mob/user,location)
playsound(location, 'sound/items/zip.ogg', 75, 1)
to_chat(user, span_notice("You inflate [src]."))
var/obj/structure/inflatable/R = new deploy_path(location)
@@ -135,7 +135,7 @@
verbs -= /obj/structure/inflatable/verb/hand_deflate
deflate()
-/obj/structure/inflatable/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/inflatable/attack_generic(mob/user, damage, attack_verb)
health -= damage
user.do_attack_animation(src)
if(health <= 0)
@@ -145,7 +145,7 @@
user.visible_message(span_danger("[user] [attack_verb] at [src]!"))
return 1
-/obj/structure/inflatable/take_damage(var/damage)
+/obj/structure/inflatable/take_damage(damage)
health -= damage
if(health <= 0)
visible_message(span_danger("The [src] deflates!"))
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 137640f504..25a164ffae 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -311,7 +311,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
add_overlay("cart_sign[signs]")
//This is called if the cart is caught in an explosion, or destroyed by weapon fire
-/obj/structure/janitorialcart/proc/spill(var/chance = 100)
+/obj/structure/janitorialcart/proc/spill(chance = 100)
var/turf/dropspot = get_turf(src)
if (mymop && prob(chance))
mymop.forceMove(dropspot)
@@ -355,7 +355,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart)
-/obj/structure/janitorialcart/proc/dismantle(var/mob/user = null)
+/obj/structure/janitorialcart/proc/dismantle(mob/user = null)
if (!dismantled)
if (has_items)
spill()
diff --git a/code/game/objects/structures/kitchen_foodcart_vr.dm b/code/game/objects/structures/kitchen_foodcart_vr.dm
index 8b55f4ca96..f878731421 100644
--- a/code/game/objects/structures/kitchen_foodcart_vr.dm
+++ b/code/game/objects/structures/kitchen_foodcart_vr.dm
@@ -22,7 +22,7 @@
else
return
-/obj/structure/foodcart/attack_hand(var/mob/user as mob)
+/obj/structure/foodcart/attack_hand(mob/user as mob)
if(contents.len)
var/obj/item/reagent_containers/food/choice = tgui_input_list(user, "What would you like to grab from the cart?", "Grab Choice", contents)
if(choice)
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 1f73c1ad3a..d7b7117550 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -27,7 +27,7 @@
else
to_chat(user, span_danger("They are too big for the spike, try something smaller!"))
-/obj/structure/kitchenspike/proc/spike(var/mob/living/victim)
+/obj/structure/kitchenspike/proc/spike(mob/living/victim)
if(!istype(victim))
return
diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm
index 32ceb22e18..6afb730001 100644
--- a/code/game/objects/structures/loot_piles.dm
+++ b/code/game/objects/structures/loot_piles.dm
@@ -28,7 +28,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
var/busy = FALSE // Used so you can't spamclick to loot.
var/loot_element_path = null
-/obj/structure/loot_pile/attack_ai(var/mob/user)
+/obj/structure/loot_pile/attack_ai(mob/user)
if(isrobot(user) && Adjacent(user))
return attack_hand(user)
diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm
index d3ea0aaa99..985c9ab0e0 100644
--- a/code/game/objects/structures/low_wall.dm
+++ b/code/game/objects/structures/low_wall.dm
@@ -27,7 +27,7 @@
var/datum/material/material
var/grille_type
-/obj/structure/low_wall/Initialize(mapload, var/materialtype)
+/obj/structure/low_wall/Initialize(mapload, materialtype)
. = ..()
icon_state = "blank"
var/turf/T = loc
@@ -72,7 +72,7 @@
else
to_chat(user, span_danger("It's nearly falling to pieces."))
-/obj/structure/low_wall/attackby(var/obj/item/W, var/mob/user, var/hit_modifier, var/click_parameters)
+/obj/structure/low_wall/attackby(obj/item/W, mob/user, hit_modifier, click_parameters)
src.add_fingerprint(user)
// Making grilles (only works on Bay ones currently)
@@ -251,7 +251,7 @@
I.color = main_color
add_overlay(I)
-/obj/structure/low_wall/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/low_wall/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
var/damage = min(proj_damage, 100)
take_damage(damage)
@@ -276,7 +276,7 @@
if(health <= 0)
dismantle()
-/obj/structure/low_wall/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/low_wall/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
user.do_attack_animation(src)
take_damage(damage)
diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm
index 4630658586..c187a44699 100644
--- a/code/game/objects/structures/medical_stand_vr.dm
+++ b/code/game/objects/structures/medical_stand_vr.dm
@@ -90,11 +90,11 @@
beaker = null
return ..()
-/obj/structure/medical_stand/attack_robot(var/mob/user)
+/obj/structure/medical_stand/attack_robot(mob/user)
if(Adjacent(user))
attack_hand(user)
-/obj/structure/medical_stand/MouseDrop(var/mob/living/carbon/human/target, src_location, over_location)
+/obj/structure/medical_stand/MouseDrop(mob/living/carbon/human/target, src_location, over_location)
..()
if(istype(target))
if(usr.stat == DEAD || !CanMouseDrop(target))
@@ -244,7 +244,7 @@
if(N)
transfer_amount = N
-/obj/structure/medical_stand/proc/attach_mask(var/mob/living/carbon/C)
+/obj/structure/medical_stand/proc/attach_mask(mob/living/carbon/C)
if(C && istype(C))
if(C.equip_to_slot_if_possible(contained, slot_wear_mask))
if(tank)
@@ -252,7 +252,7 @@
breather = C
return TRUE
-/obj/structure/medical_stand/proc/can_apply_to_target(var/mob/living/carbon/human/target, var/mob/user)
+/obj/structure/medical_stand/proc/can_apply_to_target(mob/living/carbon/human/target, mob/user)
if(!user)
user = target
// Check target validity
@@ -289,7 +289,7 @@
return
return 1
-/obj/structure/medical_stand/attackby(var/obj/item/W, var/mob/user)
+/obj/structure/medical_stand/attackby(obj/item/W, mob/user)
if(istype (W, /obj/item/tool))
if (valve_opened)
to_chat(user, span_warning("Close the valve first."))
@@ -335,7 +335,7 @@
else
return ..()
-/obj/structure/medical_stand/examine(var/mob/user)
+/obj/structure/medical_stand/examine(mob/user)
. = ..()
if (get_dist(src, user) > 2)
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 41e0df398b..5948e39264 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -12,7 +12,7 @@
var/glass = 1
var/datum/tgui_module/appearance_changer/mirror/M
-/obj/structure/mirror/Initialize(mapload, var/dir, var/building = 0)
+/obj/structure/mirror/Initialize(mapload, dir, building = 0)
. = ..()
M = new(src, null)
if(building)
@@ -47,7 +47,7 @@
desc = "Oh no, seven years of bad luck!"
-/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/mirror/bullet_act(obj/item/projectile/Proj)
if(prob(Proj.get_structure_damage() * 2))
if(!shattered)
@@ -107,7 +107,7 @@
visible_message(span_warning("[user] hits [src] with [I]!"))
playsound(src, 'sound/effects/Glasshit.ogg', 70, 1)
-/obj/structure/mirror/attack_generic(var/mob/user, var/damage)
+/obj/structure/mirror/attack_generic(mob/user, damage)
user.do_attack_animation(src)
if(shattered && glass)
@@ -129,7 +129,7 @@
icon_state = "mirror_broke"
shattered = 1
-/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
+/obj/structure/mirror/raider/attack_hand(mob/living/carbon/human/user)
if(istype(get_area(src),/area/syndicate_mothership))
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != SPECIES_VOX && is_alien_whitelisted(user.client, SPECIES_VOX))
var/choice = tgui_alert(user, "Do you wish to become a true Vox of the Shoal? This is not reversible.", "Become Vox?", list("No","Yes"))
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index a340cc6eb7..169e801657 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -35,7 +35,7 @@
for(var/obj/structure/closet/body_bag/B in contents)
occupants += B.get_occupants()
-/obj/structure/morgue/proc/update(var/broadcast=0)
+/obj/structure/morgue/proc/update(broadcast=0)
if (src.connected)
src.icon_state = "morgue0"
else
diff --git a/code/game/objects/structures/pillows.dm b/code/game/objects/structures/pillows.dm
index 3f70987e95..7672d35e96 100644
--- a/code/game/objects/structures/pillows.dm
+++ b/code/game/objects/structures/pillows.dm
@@ -23,7 +23,7 @@
..()
icon_state = initial(icon_state)
-/obj/item/bedsheet/pillow/attackby(var/obj/item/component, mob/user as mob)
+/obj/item/bedsheet/pillow/attackby(obj/item/component, mob/user as mob)
if (istype(component,src))
to_chat(user, span_notice("You assemble a pillow pile!"))
user.drop_item()
diff --git a/code/game/objects/structures/props/beam_prism.dm b/code/game/objects/structures/props/beam_prism.dm
index 8ea0a8db8e..8244f9abd9 100644
--- a/code/game/objects/structures/props/beam_prism.dm
+++ b/code/game/objects/structures/props/beam_prism.dm
@@ -89,7 +89,7 @@
else
animate(src, transform = turn(src.transform, rotate_degrees), time = 6) //Can't update transform because it will reset the angle.
-/obj/structure/prop/prism/proc/rotate_auto(var/new_bearing)
+/obj/structure/prop/prism/proc/rotate_auto(new_bearing)
if(rotation_lock)
visible_message(span_infoplain(span_bold("\The [src]") + " shudders."))
playsound(src, 'sound/effects/clang.ogg', 50, 1)
@@ -117,7 +117,7 @@
else
animate(src, transform = turn(src.transform, rotate_degrees), time = 6)
-/obj/structure/prop/prism/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/prop/prism/bullet_act(obj/item/projectile/Proj)
if(istype(Proj, redirect_type))
visible_message(span_danger("\The [src] redirects \the [Proj]!"))
flick("[initial(icon_state)]+glow", src)
diff --git a/code/game/objects/structures/props/machines.dm b/code/game/objects/structures/props/machines.dm
index 7016c8e98d..c2c1ae072b 100644
--- a/code/game/objects/structures/props/machines.dm
+++ b/code/game/objects/structures/props/machines.dm
@@ -615,7 +615,7 @@
/obj/structure/prop/machine/nt_pod/Entered(atom/movable/mover)
abduct(mover)
-/obj/structure/prop/machine/nt_pod/proc/abduct(var/atom/movable/AM)
+/obj/structure/prop/machine/nt_pod/proc/abduct(atom/movable/AM)
// Save old settings
contents_vis_flags = AM.vis_flags
contents_original_pixel_y = AM.pixel_y
@@ -632,7 +632,7 @@
// TRAP THEM
change_state("closed")
-/obj/structure/prop/machine/nt_pod/proc/unduct(var/atom/movable/AM)
+/obj/structure/prop/machine/nt_pod/proc/unduct(atom/movable/AM)
// Geddout
vis_contents -= AM
if(ismob(AM))
@@ -644,7 +644,7 @@
AM.vis_flags = contents_vis_flags
AM.pixel_y = contents_original_pixel_y
-/obj/structure/prop/machine/nt_pod/MouseDrop_T(var/atom/movable/AM, var/mob/user)
+/obj/structure/prop/machine/nt_pod/MouseDrop_T(atom/movable/AM, mob/user)
if(contents.len)
return
if(!ismovable(AM))
@@ -694,7 +694,7 @@
// Old Virology stuff
-/obj/structure/prop/machine/nt_pod/proc/delayed_flick(var/obj/effect/overlay/ovrl, var/icon_state, var/flicked, var/get_out_time)
+/obj/structure/prop/machine/nt_pod/proc/delayed_flick(obj/effect/overlay/ovrl, icon_state, flicked, get_out_time)
ovrl.icon_state = icon_state
flick(flicked, ovrl)
// GET OUT
diff --git a/code/game/objects/structures/props/nest.dm b/code/game/objects/structures/props/nest.dm
index 5df8e3b7fe..c66d413ea1 100644
--- a/code/game/objects/structures/props/nest.dm
+++ b/code/game/objects/structures/props/nest.dm
@@ -44,7 +44,7 @@
if(world.time > last_spawn + spawn_delay)
spawn_creature(get_turf(src))
-/obj/structure/prop/nest/proc/spawn_creature(var/turf/spawnpoint)
+/obj/structure/prop/nest/proc/spawn_creature(turf/spawnpoint)
update_creatures() //Paranoia.
if(total_creature_max && tally >= total_creature_max)
return
@@ -58,7 +58,7 @@
den_mobs += L
tally++
-/obj/structure/prop/nest/proc/remove_creature(var/mob/target)
+/obj/structure/prop/nest/proc/remove_creature(mob/target)
den_mobs -= target
/obj/structure/prop/nest/proc/update_creatures()
diff --git a/code/game/objects/structures/props/projectile_lock.dm b/code/game/objects/structures/props/projectile_lock.dm
index 5b72976057..a2bd2dfa7a 100644
--- a/code/game/objects/structures/props/projectile_lock.dm
+++ b/code/game/objects/structures/props/projectile_lock.dm
@@ -39,7 +39,7 @@
interaction_message = span_notice("The object remains inert to your touch.")
-/obj/structure/prop/lock/projectile/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/prop/lock/projectile/bullet_act(obj/item/projectile/Proj)
if(!istype(Proj, projectile_key) || timing)
return
diff --git a/code/game/objects/structures/props/puzzledoor.dm b/code/game/objects/structures/props/puzzledoor.dm
index 285daa6b02..c079509ef9 100644
--- a/code/game/objects/structures/props/puzzledoor.dm
+++ b/code/game/objects/structures/props/puzzledoor.dm
@@ -27,7 +27,7 @@
return 0
return 1
-/obj/machinery/door/blast/puzzle/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/door/blast/puzzle/bullet_act(obj/item/projectile/Proj)
if(!istype(Proj, /obj/item/projectile/test))
visible_message(span_cult("\The [src] is completely unaffected by \the [Proj]."))
qdel(Proj) //No piercing. No.
@@ -88,11 +88,11 @@
qdel(C)
return 0
-/obj/machinery/door/blast/puzzle/attack_generic(var/mob/user, var/damage)
+/obj/machinery/door/blast/puzzle/attack_generic(mob/user, damage)
if(check_locks())
force_toggle(1, user)
-/obj/machinery/door/blast/puzzle/attack_alien(var/mob/user)
+/obj/machinery/door/blast/puzzle/attack_alien(mob/user)
if(check_locks())
force_toggle(1, user)
diff --git a/code/game/objects/structures/props/swarm.dm b/code/game/objects/structures/props/swarm.dm
index e2ad805fb2..7044565794 100644
--- a/code/game/objects/structures/props/swarm.dm
+++ b/code/game/objects/structures/props/swarm.dm
@@ -32,7 +32,7 @@
active_beams = null
. = ..()
-/obj/structure/cult/pylon/swarm/pylonhit(var/damage)
+/obj/structure/cult/pylon/swarm/pylonhit(damage)
if(!isbroken)
if(prob(1 + damage * 3))
visible_message(span_danger("[shatter_message]"))
@@ -43,7 +43,7 @@
icon_state = "[initial(icon_state)]-broken"
set_light(0)
-/obj/structure/cult/pylon/swarm/attackpylon(mob/user as mob, var/damage)
+/obj/structure/cult/pylon/swarm/attackpylon(mob/user as mob, damage)
if(!isbroken)
if(prob(1 + damage * 3))
user.visible_message(
@@ -112,7 +112,7 @@
description_info = "An infinitely small point in space spread upon infinitely many finitely-bounded points in space. Nice."
-/obj/structure/cult/pylon/swarm/defender/pylonhit(var/damage)
+/obj/structure/cult/pylon/swarm/defender/pylonhit(damage)
if(!isbroken)
if(prob(1 + damage * 3) && damage >= 25)
visible_message(span_danger("[shatter_message]"))
@@ -123,7 +123,7 @@
icon_state = "[initial(icon_state)]-broken"
set_light(0)
-/obj/structure/cult/pylon/swarm/defender/attackpylon(mob/user as mob, var/damage)
+/obj/structure/cult/pylon/swarm/defender/attackpylon(mob/user as mob, damage)
if(!isbroken)
if(prob(1 + damage * 2) && damage >= 15)
user.visible_message(
diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm
index 4bc1c61b7a..a4ac67a399 100644
--- a/code/game/objects/structures/railing.dm
+++ b/code/game/objects/structures/railing.dm
@@ -70,7 +70,7 @@
new /obj/item/stack/rods(get_turf(src))
qdel(src)
-/obj/structure/railing/proc/NeighborsCheck(var/UpdateNeighbors = 1)
+/obj/structure/railing/proc/NeighborsCheck(UpdateNeighbors = 1)
check = 0
//if (!anchored) return
var/Rturn = turn(src.dir, -90)
@@ -108,7 +108,7 @@
if (UpdateNeighbors)
R.update_icon(0)
-/obj/structure/railing/update_icon(var/UpdateNeighgors = 1)
+/obj/structure/railing/update_icon(UpdateNeighgors = 1)
NeighborsCheck(UpdateNeighgors)
//layer = (dir == SOUTH) ? FLY_LAYER : initial(layer) // wtf does this even do
cut_overlays()
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 03d050e010..c447050108 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -184,7 +184,7 @@ FLOOR SAFES
hide(1)
update_icon()
-/obj/structure/safe/floor/hide(var/intact)
+/obj/structure/safe/floor/hide(intact)
invisibility = intact ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
/obj/structure/safe/floor/hides_under_flooring()
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index c252c0dd34..f5c7d7f29c 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -1563,7 +1563,7 @@
icon_state = "flag"
flagtype = /obj/item/flag
-/obj/item/flag/afterattack(var/atom/A, var/mob/user, var/adjacent, var/clickparams)
+/obj/item/flag/afterattack(atom/A, mob/user, adjacent, clickparams)
if (!adjacent)
return
@@ -1660,7 +1660,7 @@
add_fingerprint(user)
rip()
-/obj/structure/sign/flag/proc/rip(var/rip_linked = TRUE)
+/obj/structure/sign/flag/proc/rip(rip_linked = TRUE)
var/icon/I = new('icons/obj/flags.dmi', icon_state)
var/icon/mask = new('icons/obj/flags.dmi', "ripped")
I.AddAlphaMask(mask)
diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm
index c6e9ebe5c1..e8afef4d42 100644
--- a/code/game/objects/structures/simple_doors.dm
+++ b/code/game/objects/structures/simple_doors.dm
@@ -32,7 +32,7 @@
hardness -= material.combustion_effect(get_turf(src),temperature, 0.3)
CheckHardness()
-/obj/structure/simple_door/Initialize(mapload, var/material_name)
+/obj/structure/simple_door/Initialize(mapload, material_name)
. = ..()
set_material(material_name)
if(!material)
@@ -43,7 +43,7 @@
update_nearby_tiles()
return ..()
-/obj/structure/simple_door/proc/set_material(var/material_name)
+/obj/structure/simple_door/proc/set_material(material_name)
if(!material_name)
material_name = MAT_STEEL
material = get_material_by_name(material_name)
@@ -196,15 +196,15 @@
attack_hand(user)
return
-/obj/structure/simple_door/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/simple_door/bullet_act(obj/item/projectile/Proj)
take_damage(Proj.damage/10)
CheckHardness()
-/obj/structure/simple_door/take_damage(var/damage)
+/obj/structure/simple_door/take_damage(damage)
hardness -= damage/10
CheckHardness()
-/obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/simple_door/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
if(material == get_material_by_name(MAT_RESIN))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
@@ -252,19 +252,19 @@
strength = material.radioactivity
)
-/obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/iron/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_IRON)
/obj/structure/simple_door/silver
rad_insulation = RAD_HEAVY_INSULATION
-/obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/silver/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_SILVER)
/obj/structure/simple_door/gold
rad_insulation = RAD_HEAVY_INSULATION
-/obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/gold/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_GOLD)
/obj/structure/simple_door/uranium
@@ -273,7 +273,7 @@
/// Mutex to prevent infinite recursion when propagating radiation pulses
var/active = null
-/obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/uranium/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_URANIUM)
START_PROCESSING(SSobj, src)
@@ -295,61 +295,61 @@
last_event = world.time
active = FALSE
-/obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/sandstone/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_SANDSTONE)
-/obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/phoron/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_PHORON)
/obj/structure/simple_door/diamond
rad_insulation = RAD_EXTREME_INSULATION
-/obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/diamond/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_DIAMOND)
//I was going to give wooden doors RAD_VERY_LIGHT_INSULATION but they need a proper parent instead of this garbage.
-/obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/wood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_WOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/hardwood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/hardwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_HARDWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/sifwood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/sifwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_SIFWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/birchwood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/birchwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_BIRCHWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/pinewood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/pinewood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_PINEWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/oakwood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/oakwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_OAKWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/acaciawood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/acaciawood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_ACACIAWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/redwood/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/redwood/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_REDWOOD)
knock_sound = 'sound/machines/door/knock_wood.wav'
-/obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/resin/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_RESIN)
-/obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/cult/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_CULT)
-/obj/structure/simple_door/glamour/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/glamour/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_GLAMOUR)
-/obj/structure/simple_door/snowbrick/Initialize(mapload, var/material_name)
+/obj/structure/simple_door/snowbrick/Initialize(mapload, material_name)
. = ..(mapload, material_name || MAT_SNOWBRICK)
diff --git a/code/game/objects/structures/simple_doors_vr.dm b/code/game/objects/structures/simple_doors_vr.dm
index 033b86d430..880b574276 100644
--- a/code/game/objects/structures/simple_doors_vr.dm
+++ b/code/game/objects/structures/simple_doors_vr.dm
@@ -20,5 +20,5 @@
icon = 'icons/goonstation/featherzone.dmi'
icon_state = "flockdoor"
-/obj/structure/simple_door/flock/Initialize(mapload, var/newmat)
+/obj/structure/simple_door/flock/Initialize(mapload, newmat)
. = ..(mapload, MAT_FLOKIUM)
diff --git a/code/game/objects/structures/stasis_cage.dm b/code/game/objects/structures/stasis_cage.dm
index 445e345591..c547b0a0c9 100644
--- a/code/game/objects/structures/stasis_cage.dm
+++ b/code/game/objects/structures/stasis_cage.dm
@@ -15,14 +15,14 @@
if(A)
contain(A)
-/obj/structure/stasis_cage/attack_hand(var/mob/user)
+/obj/structure/stasis_cage/attack_hand(mob/user)
release()
-/obj/structure/stasis_cage/attack_robot(var/mob/user)
+/obj/structure/stasis_cage/attack_robot(mob/user)
if(Adjacent(user))
release()
-/obj/structure/stasis_cage/proc/contain(var/mob/living/simple_mob/animal)
+/obj/structure/stasis_cage/proc/contain(mob/living/simple_mob/animal)
if(contained || !istype(animal))
return
@@ -52,7 +52,7 @@
return ..()
-/mob/living/simple_mob/MouseDrop(var/obj/structure/stasis_cage/over_object)
+/mob/living/simple_mob/MouseDrop(obj/structure/stasis_cage/over_object)
if(istype(over_object) && Adjacent(over_object) && CanMouseDrop(over_object, usr))
if(!src.buckled || !istype(src.buckled, /obj/effect/energy_net))
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 10949f927f..8a438bd07d 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -23,7 +23,7 @@
var/applies_material_colour = 1
var/flippable = TRUE
-/obj/structure/bed/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/Initialize(mapload, new_material, new_padding_material)
..()
color = null
if(!new_material)
@@ -171,7 +171,7 @@
padding_material = null
update_icon()
-/obj/structure/bed/proc/add_padding(var/padding_type)
+/obj/structure/bed/proc/add_padding(padding_type)
padding_material = get_material_by_name(padding_type)
update_icon()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index b14083f3d6..4934d9cbc2 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -9,7 +9,7 @@
buckle_lying = 0 //force people to sit up in chairs when buckled
var/propelled = 0 // Check for fire-extinguisher-driven chairs
-/obj/structure/bed/chair/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/Initialize(mapload, new_material, new_padding_material)
. = ..()
update_layer()
@@ -99,37 +99,37 @@
I.color = padding_material.icon_colour
add_overlay(I)
-/obj/structure/bed/chair/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BROWN)
-/obj/structure/bed/chair/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
-/obj/structure/bed/chair/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_TEAL)
-/obj/structure/bed/chair/comfy/black/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLACK)
-/obj/structure/bed/chair/comfy/green/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_GREEN)
-/obj/structure/bed/chair/comfy/purp/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/purp/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_PURPLE)
-/obj/structure/bed/chair/comfy/blue/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
-/obj/structure/bed/chair/comfy/beige/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BEIGE)
-/obj/structure/bed/chair/comfy/lime/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_LIME)
-/obj/structure/bed/chair/comfy/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_YELLOW)
-/obj/structure/bed/chair/comfy/orange/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/orange/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
@@ -139,37 +139,37 @@
icon = 'icons/obj/furniture.dmi' //CHOMP Edit - These need to be base dmi, chomp's does not have them.
base_icon = "roundedchair"
-/obj/structure/bed/chair/comfy/rounded/brown/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BROWN)
-/obj/structure/bed/chair/comfy/rounded/red/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
-/obj/structure/bed/chair/comfy/rounded/teal/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_TEAL)
-/obj/structure/bed/chair/comfy/rounded/black/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLACK)
-/obj/structure/bed/chair/comfy/rounded/green/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_GREEN)
-/obj/structure/bed/chair/comfy/rounded/purple/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/purple/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_PURPLE)
-/obj/structure/bed/chair/comfy/rounded/blue/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
-/obj/structure/bed/chair/comfy/rounded/beige/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BEIGE)
-/obj/structure/bed/chair/comfy/rounded/lime/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_LIME)
-/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_YELLOW)
-/obj/structure/bed/chair/comfy/rounded/orange/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/comfy/rounded/orange/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
@@ -335,7 +335,7 @@
color = null
var/padding_color = "#CC0000"
-/obj/structure/bed/chair/sofa/bench/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/sofa/bench/Initialize(mapload, new_material, new_padding_material)
. = ..()
var/mutable_appearance/MA
// If we're north-facing, metal goes above mob, padding overlay goes below mob.
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm
index 5628d72149..825bfbe186 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_ch.dm
@@ -24,14 +24,14 @@
icon_state = "sofacornerOLD"
base_icon = "sofacornerOLD"
-/obj/structure/bed/chair/sofa/sif_ora/Initialize(mapload,var/newmaterial)
+/obj/structure/bed/chair/sofa/sif_ora/Initialize(mapload,newmaterial)
. = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE)
-/obj/structure/bed/chair/sofa/left/sif_ora/Initialize(mapload,var/newmaterial)
+/obj/structure/bed/chair/sofa/left/sif_ora/Initialize(mapload,newmaterial)
. = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE)
-/obj/structure/bed/chair/sofa/right/sif_ora/Initialize(mapload,var/newmaterial)
+/obj/structure/bed/chair/sofa/right/sif_ora/Initialize(mapload,newmaterial)
. = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE)
-/obj/structure/bed/chair/sofa/corner/sif_ora/Initialize(mapload,var/newmaterial)
+/obj/structure/bed/chair/sofa/corner/sif_ora/Initialize(mapload,newmaterial)
. = ..(mapload,MAT_SIFWOOD,MAT_CARPET_ORANGE)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
index 135dd0b657..f6f769e815 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
@@ -25,7 +25,7 @@
base_icon = "modern_chair"
applies_material_colour = 0
-/obj/structure/bed/chair/modern_chair/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/modern_chair/Initialize(mapload, new_material, new_padding_material)
. = ..()
var/image/I = image(icon, "[base_icon]_over")
I.layer = ABOVE_MOB_LAYER
@@ -141,34 +141,34 @@
base_icon = "bay_chair"
buckle_movable = 1
-/obj/structure/bed/chair/bay/chair/padded/red/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CARPET)
-/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BROWN)
-/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_TEAL)
-/obj/structure/bed/chair/bay/chair/padded/black/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLACK)
-/obj/structure/bed/chair/bay/chair/padded/green/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_GREEN)
-/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_PURPLE)
-/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLUE)
-/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BEIGE)
-/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_LIME)
-/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy
@@ -177,34 +177,34 @@
icon_state = "bay_comfychair_preview"
base_icon = "bay_comfychair"
-/obj/structure/bed/chair/bay/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/red/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CARPET)
-/obj/structure/bed/chair/bay/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/brown/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BROWN)
-/obj/structure/bed/chair/bay/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/teal/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_TEAL)
-/obj/structure/bed/chair/bay/comfy/black/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/black/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLACK)
-/obj/structure/bed/chair/bay/comfy/green/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/green/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_GREEN)
-/obj/structure/bed/chair/bay/comfy/purple/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/purple/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_PURPLE)
-/obj/structure/bed/chair/bay/comfy/blue/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/blue/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLUE)
-/obj/structure/bed/chair/bay/comfy/beige/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/beige/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BEIGE)
-/obj/structure/bed/chair/bay/comfy/lime/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/lime/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_LIME)
-/obj/structure/bed/chair/bay/comfy/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/yellow/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain
@@ -220,7 +220,7 @@
I.layer = ABOVE_MOB_LAYER
add_overlay(I)
-/obj/structure/bed/chair/bay/comfy/captain/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/comfy/captain/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle
@@ -232,7 +232,7 @@
var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = MAT_CLOTH_BLUE
-/obj/structure/bed/chair/bay/shuttle/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/bay/shuttle/Initialize(mapload, new_material, new_padding_material)
. = ..(mapload, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/post_buckle_mob()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
index 704e7a74ea..8608ed2598 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm
@@ -18,7 +18,7 @@
/obj/item/stool/padded
icon_state = "stool_padded_preview" //set for the map
-/obj/item/stool/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/item/stool/Initialize(mapload, new_material, new_padding_material)
. = ..()
if(!new_material)
new_material = MAT_STEEL
@@ -31,7 +31,7 @@
force = round(material.get_blunt_damage()*0.4)
update_icon()
-/obj/item/stool/padded/Initialize(mapload, var/new_material)
+/obj/item/stool/padded/Initialize(mapload, new_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
/obj/item/stool/update_icon()
@@ -61,7 +61,7 @@
name = "[material.display_name] [initial(name)]"
desc = "A stool. Apply butt with care. It's made of [material.use_name]."
-/obj/item/stool/proc/add_padding(var/padding_type)
+/obj/item/stool/proc/add_padding(padding_type)
padding_material = get_material_by_name(padding_type)
update_icon()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
index e82beb7650..24e64c1c0d 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm
@@ -15,5 +15,5 @@
/obj/item/stool/baystool/padded
icon_state = "bar_stool_padded_preview" //set for the map
-/obj/item/stool/baystool/padded/Initialize(mapload, var/new_material)
+/obj/item/stool/baystool/padded/Initialize(mapload, new_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
index e8e44a190f..316fed3172 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
@@ -13,7 +13,7 @@
var/min_mob_buckle_size = MOB_SMALL
var/max_mob_buckle_size = MOB_LARGE
-/obj/structure/bed/chair/wheelchair/Initialize(mapload, var/new_material, var/new_padding_material)
+/obj/structure/bed/chair/wheelchair/Initialize(mapload, new_material, new_padding_material)
. = ..()
update_icon()
diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm
index d0530196d3..20932fa7b1 100644
--- a/code/game/objects/structures/trash_pile_vr.dm
+++ b/code/game/objects/structures/trash_pile_vr.dm
@@ -162,11 +162,11 @@
"trashbag",
"brokecomp")
-/obj/structure/mob_spawner/mouse_nest/do_spawn(var/mob_path)
+/obj/structure/mob_spawner/mouse_nest/do_spawn(mob_path)
. = ..()
var/atom/A = get_holder_at_turf_level(src)
A.visible_message("[.] crawls out of \the [src].")
-/obj/structure/mob_spawner/mouse_nest/get_death_report(var/mob/living/L)
+/obj/structure/mob_spawner/mouse_nest/get_death_report(mob/living/L)
..()
last_spawn = rand(world.time - spawn_delay, world.time)
diff --git a/code/game/objects/structures/under_wardrobe.dm b/code/game/objects/structures/under_wardrobe.dm
index b13467fd4e..23b89e0ff2 100644
--- a/code/game/objects/structures/under_wardrobe.dm
+++ b/code/game/objects/structures/under_wardrobe.dm
@@ -9,13 +9,13 @@
. = ..()
AddElement(/datum/element/climbable)
-/obj/structure/undies_wardrobe/attack_hand(var/mob/user)
+/obj/structure/undies_wardrobe/attack_hand(mob/user)
if(!human_who_can_use_underwear(user))
to_chat(user, span_warning("Sadly there's nothing in here for you to wear."))
return
interact(user)
-/obj/structure/undies_wardrobe/interact(var/mob/living/carbon/human/H)
+/obj/structure/undies_wardrobe/interact(mob/living/carbon/human/H)
var/dat = list()
dat += span_bold("Underwear:") + "
"
for(var/datum/category_group/underwear/UWC in GLOB.global_underwear.categories)
@@ -30,7 +30,7 @@
dat = jointext(dat,null)
H << browse("[dat]", "window=wardrobe;size=400x200")
-/obj/structure/undies_wardrobe/proc/get_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt)
+/obj/structure/undies_wardrobe/proc/get_metadata(mob/living/carbon/human/H, underwear_category, datum/gear_tweak/gt)
var/metadata = H.all_underwear_metadata[underwear_category]
if(!metadata)
metadata = list()
@@ -42,16 +42,16 @@
metadata["[gt]"] = tweak_data
return tweak_data
-/obj/structure/undies_wardrobe/proc/set_metadata(var/mob/living/carbon/human/H, var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
+/obj/structure/undies_wardrobe/proc/set_metadata(mob/living/carbon/human/H, underwear_category, datum/gear_tweak/gt, new_metadata)
var/list/metadata = H.all_underwear_metadata[underwear_category]
metadata["[gt]"] = new_metadata
-/obj/structure/undies_wardrobe/proc/human_who_can_use_underwear(var/mob/living/carbon/human/H)
+/obj/structure/undies_wardrobe/proc/human_who_can_use_underwear(mob/living/carbon/human/H)
if(!istype(H) || !H.species || !(H.species.appearance_flags & HAS_UNDERWEAR))
return FALSE
return TRUE
-/obj/structure/undies_wardrobe/CanUseTopic(var/user)
+/obj/structure/undies_wardrobe/CanUseTopic(user)
if(!human_who_can_use_underwear(user))
return STATUS_CLOSE
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 682176aa5a..e7c1196d6d 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -708,7 +708,7 @@
user.forceMove(src)
to_chat(user, span_vnotice("You have been swallowed alive by the rubber ducky. Your entire body compacted up and squeezed into the tiny space that makes up the oddly realistic and not at all rubbery stomach. The walls themselves are kneading over you, grinding some sort of fluids into your trapped body. You can even hear the sound of bodily functions echoing around you..."))
-/obj/item/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee)
+/obj/item/bikehorn/rubberducky/pink/container_resist(mob/living/escapee)
if(isdisposalpacket(loc))
escapee.forceMove(loc)
else
@@ -909,7 +909,7 @@
AddComponent(/datum/component/hose_connector/endless_source/water)
AddComponent(/datum/component/hose_connector/endless_drain)
-/obj/structure/sink/MouseDrop_T(var/obj/item/thing, var/mob/user)
+/obj/structure/sink/MouseDrop_T(obj/item/thing, mob/user)
..()
if(!istype(thing) || !thing.is_open_container())
return ..()
diff --git a/code/game/objects/structures/watercloset_vr.dm b/code/game/objects/structures/watercloset_vr.dm
index 1f3f68dc83..f69cc93d3d 100644
--- a/code/game/objects/structures/watercloset_vr.dm
+++ b/code/game/objects/structures/watercloset_vr.dm
@@ -112,7 +112,7 @@
else
muffin_mode = FALSE
-/obj/structure/biowaste_tank/attack_hand(var/mob/user as mob)
+/obj/structure/biowaste_tank/attack_hand(mob/user as mob)
if(contents.len)
var/atom/movable/choice = tgui_input_list(usr, "It appears the machine has caught some items in the lost-and-found filter system. Would you like to eject something?", "Item Retrieval Console", contents)
if(choice)
@@ -133,7 +133,7 @@
else
choice.forceMove(get_turf(src))
-/obj/structure/biowaste_tank/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
+/obj/structure/biowaste_tank/emag_act(remaining_charges, mob/user, emag_source)
if(muffinmonster && muffin_mode)
muffinmonster.name = "Muffin Monster"
muffinmonster.forceMove(get_turf(src))
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index ebe57f18ea..df8a2cb683 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -51,7 +51,7 @@
/obj/structure/window/examine_icon()
return icon(icon=initial(icon),icon_state=initial(icon_state))
-/obj/structure/window/take_damage(var/damage = 0, var/sound_effect = 1)
+/obj/structure/window/take_damage(damage = 0, sound_effect = 1)
var/initialhealth = health
if(silicate)
@@ -75,7 +75,7 @@
update_icon()
return
-/obj/structure/window/proc/apply_silicate(var/amount)
+/obj/structure/window/proc/apply_silicate(amount)
if(health < maxhealth) // Mend the damage
health = min(health + amount * 3, maxhealth)
if(health == maxhealth)
@@ -93,7 +93,7 @@
img.alpha = silicate * 255 / 100
add_overlay(img)
-/obj/structure/window/proc/shatter(var/display_message = 1)
+/obj/structure/window/proc/shatter(display_message = 1)
playsound(src, "shatter", 70, 1)
if(display_message)
visible_message("[src] shatters!")
@@ -111,7 +111,7 @@
PROTECTED_PROC(TRUE)
return TRUE
-/obj/structure/window/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/window/bullet_act(obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage) return
@@ -219,7 +219,7 @@
"You hear a knocking sound.")
return
-/obj/structure/window/attack_generic(var/mob/user, var/damage)
+/obj/structure/window/attack_generic(mob/user, damage)
user.setClickCooldown(user.get_attack_speed())
if(!damage)
return
@@ -349,7 +349,7 @@
..()
return
-/obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
+/obj/structure/window/proc/hit(damage, sound_effect = 1)
if(damage < force_threshold || force_threshold < 0)
return
if(reinf) damage *= 0.5
@@ -418,7 +418,7 @@
/obj/structure/window/proc/is_fulltile()
return fulltile
-/obj/structure/window/is_between_turfs(var/turf/origin, var/turf/target)
+/obj/structure/window/is_between_turfs(turf/origin, turf/target)
if(is_fulltile())
return TRUE
return ..()
diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm
index 78140348e0..a73735540c 100644
--- a/code/game/objects/structures/window_spawner.dm
+++ b/code/game/objects/structures/window_spawner.dm
@@ -61,11 +61,11 @@
if((flags & ATOM_INITIALIZED) && !QDELETED(src))
qdel(src)
-/obj/effect/wingrille_spawn/proc/handle_window_spawn(var/obj/structure/window/W)
+/obj/effect/wingrille_spawn/proc/handle_window_spawn(obj/structure/window/W)
return
// Currently unused, could be useful for pre-wired electrified windows.
-/obj/effect/wingrille_spawn/proc/handle_grille_spawn(var/obj/structure/grille/G)
+/obj/effect/wingrille_spawn/proc/handle_grille_spawn(obj/structure/grille/G)
return
/obj/effect/wingrille_spawn/reinforced
@@ -78,7 +78,7 @@
icon_state = "r-wingrille"
win_path = /obj/structure/window/reinforced
-/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(var/obj/structure/window/W)
+/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(obj/structure/window/W)
W.maxhealth = 1000000
W.health = 1000000
@@ -98,6 +98,6 @@
win_path = /obj/structure/window/reinforced/polarized
var/id
-/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(var/obj/structure/window/reinforced/polarized/P)
+/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(obj/structure/window/reinforced/polarized/P)
if(id)
P.id = id
diff --git a/code/game/objects/trash_eating.dm b/code/game/objects/trash_eating.dm
index 58b8861807..50f92728bc 100644
--- a/code/game/objects/trash_eating.dm
+++ b/code/game/objects/trash_eating.dm
@@ -1,5 +1,5 @@
// checks for when items are consumed by trash/ore eater
-/obj/item/proc/on_trash_eaten(var/mob/living/user)
+/obj/item/proc/on_trash_eaten(mob/living/user)
SHOULD_CALL_PARENT(TRUE)
var/signal_results = SEND_SIGNAL(src, COMSIG_ITEM_TRASH_EATEN, user) | SEND_SIGNAL(user, COMSIG_MOB_TRASH_EATING, src)
@@ -22,7 +22,7 @@
return TRUE
/// Override this for post-swallow messages. Returns true if components on mob or item allow trash eating messages
-/obj/proc/after_trash_eaten(var/mob/living/user)
+/obj/proc/after_trash_eaten(mob/living/user)
SHOULD_CALL_PARENT(TRUE)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_ITEM_TRASH_EATEN, src, user)
var/signal_results = SEND_SIGNAL(src, COMSIG_ITEM_AFTER_TRASH_EAT, user) | SEND_SIGNAL(user, COMSIG_MOB_AFTER_TRASH_EATING, src)
@@ -30,13 +30,13 @@
return FALSE // Deny messages
return TRUE
-/obj/item/after_trash_eaten(var/mob/living/user)
+/obj/item/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of garbage. Delicious."))
// PAI
-/obj/item/paicard/on_trash_eaten(var/mob/living/user)
+/obj/item/paicard/on_trash_eaten(mob/living/user)
if(!..())
return FALSE
var/mob/living/silicon/pai/pocketpal = pai
@@ -45,7 +45,7 @@
return FALSE
return TRUE
-/obj/item/paicard/after_trash_eaten(var/mob/living/user)
+/obj/item/paicard/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the sweet flavor of digital friendship."))
@@ -54,7 +54,7 @@
to_chat(pai, span_boldnotice("[B.desc]"))
// Book
-/obj/item/book/on_trash_eaten(var/mob/living/user)
+/obj/item/book/on_trash_eaten(mob/living/user)
if(!..())
return FALSE
if(carved)
@@ -62,13 +62,13 @@
return FALSE
return TRUE
-/obj/item/book/after_trash_eaten(var/mob/living/user)
+/obj/item/book/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the dry flavor of knowledge."))
// PDA
-/obj/item/pda/on_trash_eaten(var/mob/living/user)
+/obj/item/pda/on_trash_eaten(mob/living/user)
if(!..())
return FALSE
if(owner)
@@ -90,14 +90,14 @@
user.visible_message(span_warning("[user] successfully makes [src] disappear!"))
return TRUE
-/obj/item/pda/after_trash_eaten(var/mob/living/user)
+/obj/item/pda/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the sweet flavor of delicious technology."))
// ID
-/obj/item/card/id/on_trash_eaten(var/mob/living/user)
+/obj/item/card/id/on_trash_eaten(mob/living/user)
if(!..())
return FALSE
if(registered_name)
@@ -115,13 +115,13 @@
user.visible_message(span_warning("[user] successfully makes [src] disappear!"))
return TRUE
-/obj/item/card/id/after_trash_eaten(var/mob/living/user)
+/obj/item/card/id/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the delicious flavour of a person's whole identity."))
// Shoes
-/obj/item/clothing/shoes/on_trash_eaten(var/mob/living/user)
+/obj/item/clothing/shoes/on_trash_eaten(mob/living/user)
if(!..())
return FALSE
if(holding)
@@ -130,7 +130,7 @@
return TRUE
// Capture crystal
-/obj/item/capture_crystal/on_trash_eaten(var/mob/living/user)
+/obj/item/capture_crystal/on_trash_eaten(mob/living/user)
if(!..())
return FALSE
if(!bound_mob.devourable)
@@ -138,7 +138,7 @@
return FALSE
return TRUE
-/obj/item/capture_crystal/after_trash_eaten(var/mob/living/user)
+/obj/item/capture_crystal/after_trash_eaten(mob/living/user)
if(!..(user))
return
if(bound_mob && (bound_mob in contents))
@@ -146,32 +146,32 @@
to_chat(user, span_notice("You can taste the the power of command."))
// Most trash has no special check, so the rest of these are just after_trash_eaten()
-/obj/item/flashlight/flare/after_trash_eaten(var/mob/living/user)
+/obj/item/flashlight/flare/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of spicy cardboard."))
-/obj/item/flame/match/after_trash_eaten(var/mob/living/user)
+/obj/item/flame/match/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of spicy cardboard."))
-/obj/item/storage/box/matches/after_trash_eaten(var/mob/living/user)
+/obj/item/storage/box/matches/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of spicy cardboard."))
-/obj/item/flashlight/glowstick/after_trash_eaten(var/mob/living/user)
+/obj/item/flashlight/glowstick/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You found out the glowy juice only tastes like regret."))
-/obj/item/trash/cigbutt/after_trash_eaten(var/mob/living/user)
+/obj/item/trash/cigbutt/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of bitter ash. Classy."))
-/obj/item/clothing/mask/smokable/after_trash_eaten(var/mob/living/user)
+/obj/item/clothing/mask/smokable/after_trash_eaten(mob/living/user)
if(!..(user))
return
if(lit)
@@ -179,52 +179,52 @@
else
to_chat(user, span_notice("You can taste the flavor of aromatic rolling paper and funny looks."))
-/obj/item/paper/after_trash_eaten(var/mob/living/user)
+/obj/item/paper/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the dry flavor of bureaucracy."))
-/obj/item/dice/after_trash_eaten(var/mob/living/user)
+/obj/item/dice/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the bitter flavor of cheating."))
-/obj/item/roulette_ball/after_trash_eaten(var/mob/living/user)
+/obj/item/roulette_ball/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the bitter flavor of cheating."))
-/obj/item/lipstick/after_trash_eaten(var/mob/living/user)
+/obj/item/lipstick/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of couture and style. Toddler at the make-up bag style."))
-/obj/item/soap/after_trash_eaten(var/mob/living/user)
+/obj/item/soap/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the bitter flavor of verbal purification."))
-/obj/item/spacecash/after_trash_eaten(var/mob/living/user)
+/obj/item/spacecash/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of wealth and reckless waste."))
-/obj/item/storage/wallet/after_trash_eaten(var/mob/living/user)
+/obj/item/storage/wallet/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of wealth and reckless waste."))
-/obj/item/broken_bottle/after_trash_eaten(var/mob/living/user)
+/obj/item/broken_bottle/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of pain. This can't possibly be healthy for your guts."))
-/obj/item/material/shard/after_trash_eaten(var/mob/living/user)
+/obj/item/material/shard/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the flavor of pain. This can't possibly be healthy for your guts."))
-/obj/item/light/after_trash_eaten(var/mob/living/user)
+/obj/item/light/after_trash_eaten(mob/living/user)
if(!..(user))
return
if(status == LIGHT_BROKEN)
@@ -232,22 +232,22 @@
else
to_chat(user, span_notice("You can taste the flavor of really bad ideas."))
-/obj/item/bikehorn/tinytether/after_trash_eaten(var/mob/living/user)
+/obj/item/bikehorn/tinytether/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You feel a rush of power swallowing such a large, err, tiny structure."))
-/obj/item/mmi/digital/posibrain/after_trash_eaten(var/mob/living/user)
+/obj/item/mmi/digital/posibrain/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the sweet flavor of digital friendship. Or maybe it is something else."))
-/obj/item/aicard/after_trash_eaten(var/mob/living/user)
+/obj/item/aicard/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the sweet flavor of digital friendship. Or maybe it is something else."))
-/obj/item/reagent_containers/food/after_trash_eaten(var/mob/living/user)
+/obj/item/reagent_containers/food/after_trash_eaten(mob/living/user)
if(!..(user))
return
if(!reagents?.total_volume)
@@ -255,7 +255,7 @@
else
to_chat(user, span_notice("You can taste the flavor of gluttonous waste of food."))
-/obj/item/clothing/accessory/collar/after_trash_eaten(var/mob/living/user)
+/obj/item/clothing/accessory/collar/after_trash_eaten(mob/living/user)
if(!..(user))
return
to_chat(user, span_notice("You can taste the submissiveness in the wearer of [src]!"))
diff --git a/code/game/objects/unit_testing.dm b/code/game/objects/unit_testing.dm
index 334e5490ea..5a831317b0 100644
--- a/code/game/objects/unit_testing.dm
+++ b/code/game/objects/unit_testing.dm
@@ -16,7 +16,7 @@
/obj/distilling_tester/return_air()
return GM
-/obj/distilling_tester/proc/test_distilling(var/datum/decl/chemical_reaction/distilling/D, var/temp_prog)
+/obj/distilling_tester/proc/test_distilling(datum/decl/chemical_reaction/distilling/D, temp_prog)
QDEL_SWAP(GM,new())
if(D.require_xgm_gas)
GM.gas[D.require_xgm_gas] = 100
diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm
index 22a47955b9..d9a42f9735 100644
--- a/code/game/objects/weapons.dm
+++ b/code/game/objects/weapons.dm
@@ -48,6 +48,6 @@
..()
// This is purely the visual effect of cleaving.
-/obj/item/proc/cleave_visual(var/mob/living/user, var/mob/living/target)
+/obj/item/proc/cleave_visual(mob/living/user, mob/living/target)
var/obj/effect/temporary_effect/cleave_attack/E = new(get_turf(src))
E.dir = get_dir(user, target)
diff --git a/code/game/skincmd.dm b/code/game/skincmd.dm
index f09e880bfa..0792ea0629 100644
--- a/code/game/skincmd.dm
+++ b/code/game/skincmd.dm
@@ -1,7 +1,7 @@
/mob/var/skincmds = list()
-/obj/proc/SkinCmd(mob/user as mob, var/data as text)
+/obj/proc/SkinCmd(mob/user as mob, data as text)
-/proc/SkinCmdRegister(var/mob/user, var/name as text, var/O as obj)
+/proc/SkinCmdRegister(mob/user, name as text, O as obj)
user.skincmds[name] = O
/mob/verb/skincmd(data as text)
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 3869035bfb..a3bb083426 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -436,7 +436,7 @@ GLOBAL_LIST_INIT(species_sound_map, list(
* If your species has a gendered sound, DON'T PANIC. Simply set the gender_specific_species_sounds var on the species to true, and when you call this, do it like so:
* get_species_sound(H.species.species_sounds_male)["emote"] // If we're male, and want an emote sound gendered correctly.
*/
-/proc/get_species_sound(var/sounds)
+/proc/get_species_sound(sounds)
if(!islist(GLOB.species_sound_map[sounds])) // We check here if this list actually has anything in it, or if we're about to return a null index
return null // Shitty failsafe but better than rewriting an entire litany of procs rn when I'm low on time - Rykka // list('sound/voice/silence.ogg')
return GLOB.species_sound_map[sounds] // Otherwise, successfully return our sound
@@ -445,7 +445,7 @@ GLOBAL_LIST_INIT(species_sound_map, list(
* The following helper proc will select a species' default sounds - useful for if we're set to "Unset"
* This is ONLY called by Unset, meaning we haven't chosen a species sound.
*/
-/proc/select_default_species_sound(var/datum/preferences/pref) // Called in character setup. This is similar to check_gendered_sounds, except here we pull from the prefs.
+/proc/select_default_species_sound(datum/preferences/pref) // Called in character setup. This is similar to check_gendered_sounds, except here we pull from the prefs.
// First, we determine if we're custom-choosing a body or if we're a base game species.
var/pref_species = pref.read_preference(/datum/preference/choiced/species)
var/datum/species/valid = GLOB.all_species[pref_species]
@@ -463,7 +463,7 @@ GLOBAL_LIST_INIT(species_sound_map, list(
else
return valid.species_sounds
-/proc/get_gendered_sound(var/mob/living/user) // Called anywhere we need gender-specific species sounds. Gets the gender-specific sound if one exists, but otherwise, will return the species-generic sound list.
+/proc/get_gendered_sound(mob/living/user) // Called anywhere we need gender-specific species sounds. Gets the gender-specific sound if one exists, but otherwise, will return the species-generic sound list.
var/mob/living/carbon/human/H = user
if(ishuman(H))
if(H.species.gender_specific_species_sounds) // Do we have gender-specific sounds?
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 60128730d7..2faa0a50e8 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
floor_types["[flooring_path]"] = new flooring_path
return floor_types
-/proc/get_flooring_data(var/flooring_path)
+/proc/get_flooring_data(flooring_path)
return GLOB.flooring_types["[flooring_path]"]
// State values:
@@ -112,10 +112,10 @@ GLOBAL_LIST_INIT(flooring_types, populate_flooring_types())
var/check_season = FALSE //VOREStation Addition
-/datum/decl/flooring/proc/get_plating_type(var/turf/T)
+/datum/decl/flooring/proc/get_plating_type(turf/T)
return plating_type
-/datum/decl/flooring/proc/get_flooring_overlay(var/cache_key, var/icon_base, var/icon_dir = 0, var/layer = BUILTIN_DECAL_LAYER)
+/datum/decl/flooring/proc/get_flooring_overlay(cache_key, icon_base, icon_dir = 0, layer = BUILTIN_DECAL_LAYER)
if(!LAZYACCESS(flooring_cache, cache_key))
var/image/I = image(icon = icon, icon_state = icon_base, dir = icon_dir)
I.layer = layer
diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
index e816ab98fd..5ea1d5dbed 100644
--- a/code/game/turfs/flooring/flooring_decals.dm
+++ b/code/game/turfs/flooring/flooring_decals.dm
@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(floor_decals)
layer = DECAL_LAYER
var/supplied_dir
-/obj/effect/floor_decal/Initialize(mapload, var/newdir, var/newcolour)
+/obj/effect/floor_decal/Initialize(mapload, newdir, newcolour)
supplied_dir = newdir
if(newcolour)
color = newcolour
@@ -40,7 +40,7 @@ GLOBAL_LIST_EMPTY(floor_decals)
I.alpha = alpha
return I
-/obj/effect/floor_decal/proc/get_cache_key(var/turf/T)
+/obj/effect/floor_decal/proc/get_cache_key(turf/T)
return "[alpha]-[color]-[dir]-[icon_state]-[T.layer]"
/obj/effect/floor_decal/reset
diff --git a/code/game/turfs/flooring/gas_cracks.dm b/code/game/turfs/flooring/gas_cracks.dm
index e9d5935271..c00733d546 100644
--- a/code/game/turfs/flooring/gas_cracks.dm
+++ b/code/game/turfs/flooring/gas_cracks.dm
@@ -23,7 +23,7 @@
oxygen = 0
nitrogen = 0
-/turf/simulated/floor/gas_crack/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/pump_reagents(datum/reagents/R, volume)
// pick random turfs in range, then use their deep ores to get some extra reagents
var/i = 0
while(i++ < 4) // Do this a few times
@@ -46,7 +46,7 @@
gas_type = list(GAS_O2)
oxygen = 500
-/turf/simulated/floor/gas_crack/oxygen/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/oxygen/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_OXYGEN, round(volume / 2, 0.1))
@@ -59,7 +59,7 @@
gas_type = list(GAS_N2)
nitrogen = 500
-/turf/simulated/floor/gas_crack/nitrogen/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/nitrogen/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_NITROGEN, round(volume / 2, 0.1))
@@ -71,7 +71,7 @@
gas_type = list(GAS_CO2)
carbon_dioxide = 500
-/turf/simulated/floor/gas_crack/carbon/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/carbon/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_CARBON, round(volume / 2, 0.1))
@@ -84,7 +84,7 @@
nitrogen = 250
carbon_dioxide = 250
-/turf/simulated/floor/gas_crack/nitro/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/nitro/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_OXYGEN, round(volume / 3, 0.1))
R.add_reagent(REAGENT_ID_NITROGEN, round(volume / 3, 0.1))
@@ -97,7 +97,7 @@
gas_type = list(GAS_PHORON)
phoron = 500
-/turf/simulated/floor/gas_crack/phoron/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/phoron/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_PHORON, round(volume / 3, 0.1))
@@ -110,7 +110,7 @@
oxygen = 250
nitrogen = 250
-/turf/simulated/floor/gas_crack/air/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/air/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_OXYGEN, round(volume / 2, 0.1))
R.add_reagent(REAGENT_ID_NITROGEN, round(volume / 2, 0.1))
@@ -123,7 +123,7 @@
gas_type = list(GAS_CH4)
methane = 250
-/turf/simulated/floor/gas_crack/methane/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/methane/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_SULFUR, round(volume / 2, 0.1))
R.add_reagent(REAGENT_ID_PHOSPHORUS, round(volume / 2, 0.1))
@@ -138,7 +138,7 @@
methane = 250
phoron = 250
-/turf/simulated/floor/gas_crack/terrible/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/terrible/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_NITROGEN, round(volume / 2, 0.1))
R.add_reagent(REAGENT_ID_SULFUR, round(volume / 2, 0.1))
@@ -211,7 +211,7 @@
REAGENT_ID_FLUORINE,
REAGENT_ID_CHLORINE))
-/turf/simulated/floor/gas_crack/random/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/gas_crack/random/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(pick(random_reagents), round(volume / 3, 0.1))
R.add_reagent(pick(random_reagents), round(volume / 3, 0.1))
diff --git a/code/game/turfs/initialization/init.dm b/code/game/turfs/initialization/init.dm
index 6c2d8ead29..3a7bcc3a7d 100644
--- a/code/game/turfs/initialization/init.dm
+++ b/code/game/turfs/initialization/init.dm
@@ -1,4 +1,4 @@
-/datum/turf_initializer/proc/InitializeTurf(var/turf/T)
+/datum/turf_initializer/proc/InitializeTurf(turf/T)
return
/area
diff --git a/code/game/turfs/initialization/maintenance.dm b/code/game/turfs/initialization/maintenance.dm
index 07f941021b..2af413026b 100644
--- a/code/game/turfs/initialization/maintenance.dm
+++ b/code/game/turfs/initialization/maintenance.dm
@@ -1,4 +1,4 @@
-/datum/turf_initializer/maintenance/InitializeTurf(var/turf/simulated/T)
+/datum/turf_initializer/maintenance/InitializeTurf(turf/simulated/T)
if(T.density)
return
if(!T.can_dirty)
@@ -39,7 +39,7 @@
GLOB.random_junk -= /obj/item/trash/tray
return pick(GLOB.random_junk)
-/datum/turf_initializer/maintenance/proc/dirty_neighbors(var/list/cardinal_turfs)
+/datum/turf_initializer/maintenance/proc/dirty_neighbors(list/cardinal_turfs)
var/how_dirty = 0
for(var/turf/simulated/T in cardinal_turfs)
// Considered dirty if more than halfway to visible dirt
@@ -47,7 +47,7 @@
how_dirty++
return how_dirty
-/datum/turf_initializer/maintenance/proc/attempt_web(var/turf/simulated/T)
+/datum/turf_initializer/maintenance/proc/attempt_web(turf/simulated/T)
var/turf/north_turf = get_step(T, NORTH)
if(!north_turf || !north_turf.density)
return
@@ -61,7 +61,7 @@
new /obj/effect/decal/cleanable/cobweb2(T)
return
-/datum/turf_initializer/maintenance/shallow/InitializeTurf(var/turf/simulated/dirty)
+/datum/turf_initializer/maintenance/shallow/InitializeTurf(turf/simulated/dirty)
if(dirty.density)
return
if(!dirty.can_dirty)
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index c810775d26..def25956f4 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -23,7 +23,7 @@
var/wet_cleanup_timer
// This is not great.
-/turf/simulated/proc/wet_floor(var/wet_val = 1)
+/turf/simulated/proc/wet_floor(wet_val = 1)
if(wet >= TURFSLIP_ICE) //Can't mop up ice
return
wet = wet_val
@@ -79,7 +79,7 @@
. += "This [src] looks climbable."
-/turf/simulated/proc/AddTracks(var/typepath,var/bloodDNA,var/comingdir,var/goingdir,var/bloodcolor="#A10808")
+/turf/simulated/proc/AddTracks(typepath,bloodDNA,comingdir,goingdir,bloodcolor="#A10808")
var/obj/effect/decal/cleanable/blood/tracks/tracks = locate(typepath) in src
if(!tracks)
tracks = new typepath(src)
diff --git a/code/game/turfs/simulated/dungeon/wall.dm b/code/game/turfs/simulated/dungeon/wall.dm
index dc8cefff47..cc13bd863b 100644
--- a/code/game/turfs/simulated/dungeon/wall.dm
+++ b/code/game/turfs/simulated/dungeon/wall.dm
@@ -48,7 +48,7 @@
name = "solid rock"
desc = "This rock seems dense, impossible to drill."
-/turf/simulated/wall/solidrock/proc/get_cached_border(var/cache_id, var/direction, var/icon_file, var/icon_state, var/offset = 32)
+/turf/simulated/wall/solidrock/proc/get_cached_border(cache_id, direction, icon_file, icon_state, offset = 32)
if(!GLOB.mining_overlay_cache["[cache_id]_[direction]"])
var/image/new_cached_image = image(icon_state, dir = direction, layer = ABOVE_TURF_LAYER)
switch(direction)
@@ -65,7 +65,7 @@
return GLOB.mining_overlay_cache["[cache_id]_[direction]"]
-/turf/simulated/wall/solidrock/update_icon(var/update_neighbors)
+/turf/simulated/wall/solidrock/update_icon(update_neighbors)
cut_overlays()
if(density)
var/image/I
@@ -102,7 +102,7 @@
/turf/simulated/wall/solidrock/Initialize(mapload)
. = ..(mapload, "mossyrock")
-/turf/simulated/wall/solidrock/mossyrockpoi/update_icon(var/update_neighbors)
+/turf/simulated/wall/solidrock/mossyrockpoi/update_icon(update_neighbors)
if(density)
var/image/I
for(var/i = 1 to 4)
diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm
index 39dedfe0cb..78d326e1a3 100644
--- a/code/game/turfs/simulated/fancy_shuttles.dm
+++ b/code/game/turfs/simulated/fancy_shuttles.dm
@@ -82,7 +82,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/fancy_shuttle)
return ..()
// No girders, and Eris plating
-/turf/simulated/wall/fancy_shuttle/dismantle_wall(var/devastated, var/explode, var/no_product)
+/turf/simulated/wall/fancy_shuttle/dismantle_wall(devastated, explode, no_product)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(!no_product && !devastated)
@@ -178,7 +178,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/fancy_shuttle)
/obj/effect/floor_decal/fancy_shuttle/make_decal_image()
return image(icon = icon, icon_state = icon_state, layer = BUILTIN_DECAL_LAYER)
-/obj/effect/floor_decal/fancy_shuttle/get_cache_key(var/turf/T)
+/obj/effect/floor_decal/fancy_shuttle/get_cache_key(turf/T)
return "[alpha]-[color]-[dir]-[icon_state]-[T.layer]-[icon_file]"
/**
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 541a0bf7a5..36058b4524 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -50,7 +50,7 @@
decals = old_decals
old_decals = current_decals
-/turf/simulated/floor/proc/set_flooring(var/datum/decl/flooring/newflooring, var/initializing)
+/turf/simulated/floor/proc/set_flooring(datum/decl/flooring/newflooring, initializing)
//make_plating(defer_icon_update = 1)
if(is_plating() && !initializing) // Plating -> Flooring
swap_decals()
@@ -61,7 +61,7 @@
//This proc will set floor_type to null and the update_icon() proc will then change the icon_state of the turf
//This proc auto corrects the grass tiles' siding.
-/turf/simulated/floor/proc/make_plating(var/place_product, var/defer_icon_update)
+/turf/simulated/floor/proc/make_plating(place_product, defer_icon_update)
cut_overlays()
for(var/obj/effect/decal/writing/W in src)
@@ -100,7 +100,7 @@
/turf/simulated/floor/can_engrave()
return (!flooring || flooring.can_engrave)
-/turf/simulated/floor/proc/cause_slip(var/mob/living/M)
+/turf/simulated/floor/proc/cause_slip(mob/living/M)
PROTECTED_PROC(TRUE)
return
diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index 17d31295a1..9842bcbfc0 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -1,4 +1,4 @@
-/turf/simulated/floor/attackby(var/obj/item/C, var/mob/user, attack_modifier, click_parameters)
+/turf/simulated/floor/attackby(obj/item/C, mob/user, attack_modifier, click_parameters)
if(!C || !user)
return 0
diff --git a/code/game/turfs/simulated/floor_damage.dm b/code/game/turfs/simulated/floor_damage.dm
index 255333fa40..113ed456a9 100644
--- a/code/game/turfs/simulated/floor_damage.dm
+++ b/code/game/turfs/simulated/floor_damage.dm
@@ -15,7 +15,7 @@
broken = 0
update_icon()
-/turf/simulated/floor/proc/burn_tile(var/exposed_temperature)
+/turf/simulated/floor/proc/burn_tile(exposed_temperature)
if(!flooring || !(flooring.flags & TURF_CAN_BURN) || !isnull(burnt))
return
if(flooring.has_burn_range)
diff --git a/code/game/turfs/simulated/floor_icon.dm b/code/game/turfs/simulated/floor_icon.dm
index c2fd10b22e..21580c4a23 100644
--- a/code/game/turfs/simulated/floor_icon.dm
+++ b/code/game/turfs/simulated/floor_icon.dm
@@ -4,7 +4,7 @@ GLOBAL_DATUM_INIT(no_ceiling_image, /image, new)
GLOB.no_ceiling_image = image(icon = 'icons/turf/open_space.dmi', icon_state = "no_ceiling")
GLOB.no_ceiling_image.plane = PLANE_MESONS
-/turf/simulated/floor/update_icon(var/update_neighbors)
+/turf/simulated/floor/update_icon(update_neighbors)
cut_overlays()
if(flooring)
@@ -127,7 +127,7 @@ GLOBAL_DATUM_INIT(no_ceiling_image, /image, new)
//Tests whether this flooring will smooth with the specified turf
//You can override this if you want a flooring to have super special snowflake smoothing behaviour
-/datum/decl/flooring/proc/test_link(var/turf/origin, var/turf/T, var/countercheck = FALSE)
+/datum/decl/flooring/proc/test_link(turf/origin, turf/T, countercheck = FALSE)
var/is_linked = FALSE
if (countercheck)
diff --git a/code/game/turfs/simulated/floor_static.dm b/code/game/turfs/simulated/floor_static.dm
index f91e9820b3..03c57783d9 100644
--- a/code/game/turfs/simulated/floor_static.dm
+++ b/code/game/turfs/simulated/floor_static.dm
@@ -7,7 +7,7 @@
icon_state = "steel"
initial_flooring = null
-/turf/simulated/floor/fixed/attackby(var/obj/item/C, var/mob/user)
+/turf/simulated/floor/fixed/attackby(obj/item/C, mob/user)
if(istype(C, /obj/item/stack) && !istype(C, /obj/item/stack/cable_coil))
return
return ..()
diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm
index 7bdca24bb3..847eeb74bb 100644
--- a/code/game/turfs/simulated/floor_types.dm
+++ b/code/game/turfs/simulated/floor_types.dm
@@ -20,7 +20,7 @@
my_turf = get_turf(src)
moveToNullspace()
-/obj/landed_holder/proc/land_on(var/turf/T)
+/obj/landed_holder/proc/land_on(turf/T)
//Gather destination information
var/obj/landed_holder/new_holder = new(null)
T.lighting_clear_overlay()
@@ -59,7 +59,7 @@
return new_dest
-/obj/landed_holder/proc/leave_turf(var/turf/base_turf = null)
+/obj/landed_holder/proc/leave_turf(turf/base_turf = null)
var/turf/new_source
//Change our source to whatever it was before
if(turf_type)
diff --git a/code/game/turfs/simulated/floor_types_eris.dm b/code/game/turfs/simulated/floor_types_eris.dm
index 32ba987e61..cc20f8eb56 100644
--- a/code/game/turfs/simulated/floor_types_eris.dm
+++ b/code/game/turfs/simulated/floor_types_eris.dm
@@ -1096,10 +1096,10 @@
/* Eris features we lack on flooring decls
//Hull can upgrade to underplating
-/datum/decl/flooring/reinforced/plating/hull/can_build_floor(var/datum/decl/flooring/newfloor)
+/datum/decl/flooring/reinforced/plating/hull/can_build_floor(datum/decl/flooring/newfloor)
return FALSE //Not allowed to build directly on hull, you must first remove it and then build on the underplating
-/datum/decl/flooring/reinforced/plating/hull/get_plating_type(var/turf/location)
+/datum/decl/flooring/reinforced/plating/hull/get_plating_type(turf/location)
if (turf_is_lower_hull(location)) //Hull plating is only on the lowest level of the ship
return null
else if (turf_is_upper_hull(location))
diff --git a/code/game/turfs/simulated/floor_types_vr.dm b/code/game/turfs/simulated/floor_types_vr.dm
index 6281c569ab..46f6ef4ee9 100644
--- a/code/game/turfs/simulated/floor_types_vr.dm
+++ b/code/game/turfs/simulated/floor_types_vr.dm
@@ -39,7 +39,7 @@
icon = 'icons/goonstation/featherzone.dmi'
icon_state = "floor"
-/turf/simulated/floor/flock/Crossed(var/atom/movable/AM)
+/turf/simulated/floor/flock/Crossed(atom/movable/AM)
. = ..()
if(isliving(AM))
icon_state = "floor-on"
diff --git a/code/game/turfs/simulated/nanogoop.dm b/code/game/turfs/simulated/nanogoop.dm
index e85032a529..eb854e9f64 100644
--- a/code/game/turfs/simulated/nanogoop.dm
+++ b/code/game/turfs/simulated/nanogoop.dm
@@ -257,7 +257,7 @@ GLOBAL_LIST_BOILERPLATE(nanite_turfs, /turf/simulated/floor/water/digestive_enzy
nutrients += how_much
give_nutrients(nutrients)
-/turf/simulated/floor/water/digestive_enzymes/nanites/proc/give_nutrients(var/amt)
+/turf/simulated/floor/water/digestive_enzymes/nanites/proc/give_nutrients(amt)
var/mob/living/nutrienttarget = moblink?.resolve()
var/obj/machinery/power/smes/smes = linkedsmes?.resolve()
if(smes)
@@ -276,12 +276,12 @@ GLOBAL_LIST_BOILERPLATE(nanite_turfs, /turf/simulated/floor/water/digestive_enzy
return
-/turf/simulated/floor/water/digestive_enzymes/nanites/return_air_for_internal_lifeform(var/mob/living/targetmob)
+/turf/simulated/floor/water/digestive_enzymes/nanites/return_air_for_internal_lifeform(mob/living/targetmob)
if(!can_digest(targetmob))
return return_air() //Nanites should always be nonlethal until the AI turns on digestion
return ..()
-/turf/simulated/floor/water/digestive_enzymes/nanites/proc/toggle_all(var/on = TRUE, var/digest = FALSE, var/robot = FALSE, var/synth = FALSE)
+/turf/simulated/floor/water/digestive_enzymes/nanites/proc/toggle_all(on = TRUE, digest = FALSE, robot = FALSE, synth = FALSE)
var/mob/living/nutrienttarget = moblink?.resolve()
for(var/turf/simulated/floor/water/digestive_enzymes/nanites/nanites in GLOB.nanite_turfs)
if(nanites.id == id)
@@ -290,7 +290,7 @@ GLOBAL_LIST_BOILERPLATE(nanite_turfs, /turf/simulated/floor/water/digestive_enzy
nanites.moblink = WEAKREF(nutrienttarget)
nanites.select_state(on, digest, robot, synth)
-/turf/simulated/floor/water/digestive_enzymes/nanites/proc/select_state(var/on = TRUE, var/digest = FALSE, var/robot = FALSE, var/synth = FALSE)
+/turf/simulated/floor/water/digestive_enzymes/nanites/proc/select_state(on = TRUE, digest = FALSE, robot = FALSE, synth = FALSE)
if(!on)
name = "nanite-infested tiles."
desc = "This section of reinforced plating appears to host a colony of nanites between the tiles"
diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm
index d2bd29c040..2655e7b1a7 100644
--- a/code/game/turfs/simulated/outdoors/outdoors.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors.dm
@@ -103,7 +103,7 @@ GLOBAL_LIST_EMPTY(turf_edge_cache)
// This proc adds a 'layer' on top of the turf.
/* CHOMP Removal start
-/turf/simulated/floor/outdoors/proc/promote(var/new_turf_type)
+/turf/simulated/floor/outdoors/proc/promote(new_turf_type)
var/list/new_turf_layer_list = turf_layers.Copy()
var/list/coords = list(x, y, z)
diff --git a/code/game/turfs/simulated/outdoors/outdoors_ch.dm b/code/game/turfs/simulated/outdoors/outdoors_ch.dm
index d1dc264742..8f7ec4c97d 100644
--- a/code/game/turfs/simulated/outdoors/outdoors_ch.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors_ch.dm
@@ -1,7 +1,7 @@
/turf/simulated/floor/outdoors
var/demote_to = /turf/simulated/floor/outdoors/rocks
-/turf/simulated/floor/outdoors/proc/promote(var/new_turf_type)
+/turf/simulated/floor/outdoors/proc/promote(new_turf_type)
var/mytype = src.type
var/list/coords = list(x, y, z)
@@ -62,7 +62,7 @@
for(var/d in crossed_dirs)
add_overlay(image(icon = 'icons/turf/outdoors.dmi', icon_state = "snow_footprints", dir = text2num(d)))
-/turf/simulated/floor/outdoors/snow/sif/planetuse/attackby(var/obj/item/W, var/mob/user)
+/turf/simulated/floor/outdoors/snow/sif/planetuse/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/shovel))
to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
if(do_after(user, 4 SECONDS * W.toolspeed, src))
diff --git a/code/game/turfs/simulated/outdoors/sky.dm b/code/game/turfs/simulated/outdoors/sky.dm
index 1c7d70a208..cf14056650 100644
--- a/code/game/turfs/simulated/outdoors/sky.dm
+++ b/code/game/turfs/simulated/outdoors/sky.dm
@@ -12,7 +12,7 @@
nitrogen = 0
phoron = 0
-/turf/simulated/sky/Initialize(mapload, var/color = "#FFFFFF")
+/turf/simulated/sky/Initialize(mapload, color = "#FFFFFF")
. = ..()
//SSplanets.addTurf(src) VOREStation edit - Handled by parent
set_light(2, 2, color)
diff --git a/code/game/turfs/simulated/outdoors/sky_effect.dm b/code/game/turfs/simulated/outdoors/sky_effect.dm
index bf8294ae9d..9ed5fe3a84 100644
--- a/code/game/turfs/simulated/outdoors/sky_effect.dm
+++ b/code/game/turfs/simulated/outdoors/sky_effect.dm
@@ -1,5 +1,5 @@
// Those turfs replace the fall from sky step striggers
-/turf/Entered(var/atom/movable/am, var/atom/old_loc)
+/turf/Entered(atom/movable/am, atom/old_loc)
..()
if(!am.can_fall())
return
@@ -12,7 +12,7 @@
return
trigger_fall(am, planet)
-/turf/proc/trigger_fall(var/atom/movable/am, var/datum/planet/destination)
+/turf/proc/trigger_fall(atom/movable/am, datum/planet/destination)
if(!destination)
message_admins("ERROR: planetary_fall step trigger lacks a planet to fall onto.")
return
diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm
index cc0b898574..139e220f81 100644
--- a/code/game/turfs/simulated/outdoors/snow.dm
+++ b/code/game/turfs/simulated/outdoors/snow.dm
@@ -24,7 +24,7 @@
for(var/d in crossed_dirs)
add_overlay(image(icon = 'icons/turf/outdoors.dmi', icon_state = "snow_footprints", dir = text2num(d)))
-/turf/simulated/floor/outdoors/snow/attackby(var/obj/item/W, var/mob/user)
+/turf/simulated/floor/outdoors/snow/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/shovel))
to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
if(do_after(user, 4 SECONDS * W.toolspeed, target = src))
diff --git a/code/game/turfs/simulated/outdoors/survival_action_vr.dm b/code/game/turfs/simulated/outdoors/survival_action_vr.dm
index 5d92166313..48b0dcac46 100644
--- a/code/game/turfs/simulated/outdoors/survival_action_vr.dm
+++ b/code/game/turfs/simulated/outdoors/survival_action_vr.dm
@@ -48,7 +48,7 @@ GLOBAL_LIST_INIT(has_rocks, list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9"))
return pick(/obj/item/stack/material/flint, /obj/item/ore/iron)
. = ..()
-/turf/simulated/floor/outdoors/newdirt/examine(var/mob/user)
+/turf/simulated/floor/outdoors/newdirt/examine(mob/user)
. = ..()
if(Adjacent(user))
var/static/list/has_rocks = list("dirt5", "dirt6", "dirt7", "dirt8", "dirt9")
diff --git a/code/game/turfs/simulated/underwater.dm b/code/game/turfs/simulated/underwater.dm
index 213a259d1e..ad353d8abe 100644
--- a/code/game/turfs/simulated/underwater.dm
+++ b/code/game/turfs/simulated/underwater.dm
@@ -17,7 +17,7 @@
reagent_type = REAGENT_ID_WATER
-/turf/simulated/floor/water/underwater/return_air_for_internal_lifeform(var/mob/living/L)
+/turf/simulated/floor/water/underwater/return_air_for_internal_lifeform(mob/living/L)
if(L.can_breathe_water()) // For squid.
var/datum/gas_mixture/water_breath = new()
var/datum/gas_mixture/above_air = return_air()
diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index 6fa5af92f9..5837cfc55d 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -1,5 +1,5 @@
//Interactions
-/turf/simulated/wall/proc/toggle_open(var/mob/user)
+/turf/simulated/wall/proc/toggle_open(mob/user)
if(can_open == WALL_OPENING)
return
@@ -41,14 +41,14 @@
SSair.mark_for_update(turf)
-/turf/simulated/wall/proc/update_thermal(var/turf/simulated/source)
+/turf/simulated/wall/proc/update_thermal(turf/simulated/source)
if(istype(source))
if(density && opacity)
source.thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
else
source.thermal_conductivity = initial(source.thermal_conductivity)
-/turf/simulated/wall/proc/fail_smash(var/mob/user)
+/turf/simulated/wall/proc/fail_smash(mob/user)
var/damage_lower = 25
var/damage_upper = 75
if(isanimal(user))
@@ -63,7 +63,7 @@
user.do_attack_animation(src)
take_damage(rand(damage_lower,damage_upper))
-/turf/simulated/wall/proc/success_smash(var/mob/user)
+/turf/simulated/wall/proc/success_smash(mob/user)
to_chat(user, span_danger("You smash through the wall!"))
user.do_attack_animation(src)
if(isanimal(user))
@@ -72,7 +72,7 @@
spawn(1)
dismantle_wall(1)
-/turf/simulated/wall/proc/try_touch(var/mob/user, var/rotting)
+/turf/simulated/wall/proc/try_touch(mob/user, rotting)
if(rotting)
if(reinf_material)
@@ -90,7 +90,7 @@
toggle_open(user)
return 0
-/turf/simulated/wall/attack_ai(var/mob/user)
+/turf/simulated/wall/attack_ai(mob/user)
if(!Adjacent(user))
return
if(!isrobot((user)))
@@ -98,7 +98,7 @@
var/rotting = (locate(/obj/effect/overlay/wallrot) in src)
try_touch(user, rotting)
-/turf/simulated/wall/attack_hand(var/mob/user)
+/turf/simulated/wall/attack_hand(mob/user)
radiate()
add_fingerprint(user)
@@ -113,7 +113,7 @@
try_touch(user, rotting)
-/turf/simulated/wall/attack_generic(var/mob/user, var/damage, var/attack_message)
+/turf/simulated/wall/attack_generic(mob/user, damage, attack_message)
radiate()
user.setClickCooldown(user.get_attack_speed())
@@ -132,7 +132,7 @@
return success_smash(user)
return fail_smash(user)
-/turf/simulated/wall/attackby(var/obj/item/W, var/mob/user, attack_modifier, click_parameters)
+/turf/simulated/wall/attackby(obj/item/W, mob/user, attack_modifier, click_parameters)
user.setClickCooldown(user.get_attack_speed(W))
diff --git a/code/game/turfs/simulated/wall_icon.dm b/code/game/turfs/simulated/wall_icon.dm
index 49610b560e..8a8834e344 100644
--- a/code/game/turfs/simulated/wall_icon.dm
+++ b/code/game/turfs/simulated/wall_icon.dm
@@ -30,7 +30,7 @@
update_icon()
-/turf/simulated/wall/proc/set_material(var/datum/material/newmaterial, var/datum/material/newrmaterial, var/datum/material/newgmaterial)
+/turf/simulated/wall/proc/set_material(datum/material/newmaterial, datum/material/newrmaterial, datum/material/newgmaterial)
material = newmaterial
reinf_material = newrmaterial
if(!newgmaterial)
@@ -135,7 +135,7 @@
if ((additional_dirs & diag_dir) == diag_dir)
dirs += diag_dir
-/turf/simulated/wall/proc/can_join_with_wall(var/turf/simulated/wall/W)
+/turf/simulated/wall/proc/can_join_with_wall(turf/simulated/wall/W)
//No blending if no material
if(!material || !W.material)
return 0
@@ -147,5 +147,5 @@
return 1
return 0
-/turf/simulated/wall/proc/can_join_with_low_wall(var/obj/structure/low_wall/WF)
+/turf/simulated/wall/proc/can_join_with_low_wall(obj/structure/low_wall/WF)
return FALSE
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index cf41e2d272..df1dfcaff5 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -451,7 +451,7 @@
var/static/list/blend_objects = list(/obj/machinery/door) //CHOMPEdit convert to static list
var/static/list/noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) //CHOMPEdit convert to static list
-/turf/simulated/wall/eris/can_join_with_low_wall(var/obj/structure/low_wall/WF)
+/turf/simulated/wall/eris/can_join_with_low_wall(obj/structure/low_wall/WF)
return istype(WF, /obj/structure/low_wall/eris)
/turf/simulated/wall/eris/special_wall_connections(list/dirs, list/inrange)
@@ -490,7 +490,7 @@
var/stripe_color // Adds a colored stripe to the walls
-/turf/simulated/wall/bay/can_join_with_low_wall(var/obj/structure/low_wall/WF)
+/turf/simulated/wall/bay/can_join_with_low_wall(obj/structure/low_wall/WF)
return istype(WF, /obj/structure/low_wall/bay)
/turf/simulated/wall/bay/update_icon()
@@ -614,7 +614,7 @@
wall_connections = dirs
-/turf/simulated/wall/tgmc/can_join_with_low_wall(var/obj/structure/low_wall/WF)
+/turf/simulated/wall/tgmc/can_join_with_low_wall(obj/structure/low_wall/WF)
return istype(WF, /obj/structure/low_wall)
/turf/simulated/wall/tgmc/rwall
diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm
index d957a915f0..1ba51be5da 100644
--- a/code/game/turfs/simulated/wall_types_vr.dm
+++ b/code/game/turfs/simulated/wall_types_vr.dm
@@ -41,7 +41,7 @@
GLOBAL_LIST_EMPTY(flesh_overlay_cache)
-/turf/simulated/flesh/update_icon(var/update_neighbors)
+/turf/simulated/flesh/update_icon(update_neighbors)
cut_overlays()
if(density)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 0685d2b332..f333f9643d 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -59,7 +59,7 @@
/turf/simulated/wall/proc/get_material()
return material
-/turf/simulated/wall/bullet_act(var/obj/item/projectile/Proj)
+/turf/simulated/wall/bullet_act(obj/item/projectile/Proj)
if(istype(Proj,/obj/item/projectile/beam))
burn(2500)
else if(istype(Proj,/obj/item/projectile/ion))
@@ -126,7 +126,7 @@
plant.pixel_y = 0
plant.update_neighbors()
-/turf/simulated/wall/ChangeTurf(var/turf/N, var/tell_universe, var/force_lighting_update, var/preserve_outdoors)
+/turf/simulated/wall/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors)
clear_plants()
. = ..(N, tell_universe, force_lighting_update, preserve_outdoors)
@@ -196,7 +196,7 @@
return ..()
-/turf/simulated/wall/proc/dismantle_wall(var/devastated, var/explode, var/no_product)
+/turf/simulated/wall/proc/dismantle_wall(devastated, explode, no_product)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(!no_product)
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index acd3fed2ff..328d35cd9c 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -64,7 +64,7 @@
else return ..()
-/turf/simulated/floor/water/return_air_for_internal_lifeform(var/mob/living/L)
+/turf/simulated/floor/water/return_air_for_internal_lifeform(mob/living/L)
if(L && L.lying)
if(L.can_breathe_water()) // For squid.
var/datum/gas_mixture/water_breath = new()
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index c3d8e95c45..59ac96974e 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -38,7 +38,7 @@
return ..()
-/turf/space/proc/toggle_transit(var/direction)
+/turf/space/proc/toggle_transit(direction)
if(edge) //Not a great way to do this yet. Maybe we'll come up with one. We could pre-make sprites... or tile the overlay over it?
return
@@ -134,7 +134,7 @@
// If that's changed, then you'll want to swipe the rest of the roofing code from code/game/turfs/simulated/floor_attackby.dm
return
-/turf/space/Entered(var/atom/movable/A)
+/turf/space/Entered(atom/movable/A)
. = ..()
if(edge && SSticker?.mode && !density) // !density so 'fake' space turfs don't fling ghosts everywhere
@@ -260,5 +260,5 @@
A.loc.Entered(A)
return
-/turf/space/ChangeTurf(var/turf/N, var/tell_universe, var/force_lighting_update, var/preserve_outdoors)
+/turf/space/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors)
return ..(N, tell_universe, 1, preserve_outdoors)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 645b994009..919c437595 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -316,7 +316,7 @@
for(var/obj/O in src)
O.hide(O.hides_under_flooring() && !is_plating())
-/turf/proc/AdjacentTurfs(var/check_blockage = TRUE)
+/turf/proc/AdjacentTurfs(check_blockage = TRUE)
. = list()
for(var/turf/T as anything in (trange(1,src) - src))
if(check_blockage)
@@ -326,7 +326,7 @@
else
. += T
-/turf/proc/CardinalTurfs(var/check_blockage = TRUE)
+/turf/proc/CardinalTurfs(check_blockage = TRUE)
. = list()
for(var/turf/T as anything in AdjacentTurfs(check_blockage))
if(T.x == src.x || T.y == src.y)
@@ -377,7 +377,7 @@
/turf/proc/can_engrave()
return FALSE
-/turf/proc/try_graffiti(var/mob/vandal, var/obj/item/tool, click_parameters)
+/turf/proc/try_graffiti(mob/vandal, obj/item/tool, click_parameters)
if(!tool || !tool.sharp || !can_engrave()) //CHOMP Edit
return FALSE
@@ -484,16 +484,16 @@
return TRUE
// We're about to be the A-side in a turf translation
-/turf/proc/pre_translate_A(var/turf/B)
+/turf/proc/pre_translate_A(turf/B)
return
// We're about to be the B-side in a turf translation
-/turf/proc/pre_translate_B(var/turf/A)
+/turf/proc/pre_translate_B(turf/A)
return
// We were the the A-side in a turf translation
-/turf/proc/post_translate_A(var/turf/B)
+/turf/proc/post_translate_A(turf/B)
return
// We were the the B-side in a turf translation
-/turf/proc/post_translate_B(var/turf/A)
+/turf/proc/post_translate_B(turf/A)
return
/turf/proc/add_vomit_floor(mob/living/M, toxvomit = NONE, purge = TRUE)
diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm
index 4939573623..183ecee52b 100644
--- a/code/game/turfs/turf_changing.dm
+++ b/code/game/turfs/turf_changing.dm
@@ -27,7 +27,7 @@
return HAS_VALID_ZONE(T)
//Creates a new turf
-/turf/proc/ChangeTurf(var/turf/N, var/tell_universe=1, var/force_lighting_update = 0, var/preserve_outdoors = FALSE)
+/turf/proc/ChangeTurf(turf/N, tell_universe=1, force_lighting_update = 0, preserve_outdoors = FALSE)
if (!N)
return
@@ -169,7 +169,7 @@
outdoors = old_outdoors
-/turf/proc/propogate_sunlight_changes(oldtype, old_density, new_turf, var/above = FALSE)
+/turf/proc/propogate_sunlight_changes(oldtype, old_density, new_turf, above = FALSE)
//SEND_SIGNAL(src, COMSIG_TURF_UPDATE, oldtype, old_density, W)
//Sends signals in a cross pattern to all tiles that may have their sunlight var affected including this tile.
for(var/i = - SUNLIGHT_RADIUS, i <= SUNLIGHT_RADIUS, i++)
diff --git a/code/game/turfs/unsimulated/planetary.dm b/code/game/turfs/unsimulated/planetary.dm
index c075c9dbb0..3fdca3bf51 100644
--- a/code/game/turfs/unsimulated/planetary.dm
+++ b/code/game/turfs/unsimulated/planetary.dm
@@ -26,7 +26,7 @@
SSplanets.removeTurf(src)
return ..()
-/turf/unsimulated/wall/planetary/proc/set_temperature(var/new_temperature)
+/turf/unsimulated/wall/planetary/proc/set_temperature(new_temperature)
if(new_temperature == temperature)
return
temperature = new_temperature
diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm
index 1ef473acdf..26a5fb25ee 100644
--- a/code/game/turfs/unsimulated/sky_vr.dm
+++ b/code/game/turfs/unsimulated/sky_vr.dm
@@ -41,7 +41,7 @@
do_fall(AM)
-/turf/unsimulated/floor/sky/hitby(var/atom/movable/source, datum/thrownthing/throwingdatum)
+/turf/unsimulated/floor/sky/hitby(atom/movable/source, datum/thrownthing/throwingdatum)
. = ..()
if(!does_skyfall)
diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm
index 13c366bf8b..c337b375d3 100644
--- a/code/game/vehicles/vehicle.dm
+++ b/code/game/vehicles/vehicle.dm
@@ -75,7 +75,7 @@
/obj/vehicle/proc/addVerb(verb_path)
src.verbs += verb_path
-/obj/vehicle/proc/add_cell(var/obj/item/cell/C=null)
+/obj/vehicle/proc/add_cell(obj/item/cell/C=null)
if(C)
C.forceMove(src)
cell = C
diff --git a/code/game/world.dm b/code/game/world.dm
index f9446429cc..500736a3ca 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -549,7 +549,7 @@ GLOBAL_VAR_INIT(world_topic_spam_protect_time, world.timeofday)
GLOB.master_mode = Lines[1]
log_world("## MISC Saved mode is '[GLOB.master_mode]'")
-/world/proc/save_mode(var/the_mode)
+/world/proc/save_mode(the_mode)
var/F = file("data/mode.txt")
fdel(F)
F << the_mode
diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm
index 1a17c96d0a..3cb98ddb5a 100644
--- a/code/modules/admin/DB ban/functions.dm
+++ b/code/modules/admin/DB ban/functions.dm
@@ -1,6 +1,6 @@
//Either pass the mob you wish to ban in the 'banned_mob' attribute, or the banckey, banip and bancid variables. If both are passed, the mob takes priority! If a mob is not passed, banckey is the minimum that needs to be passed! banip and bancid are optional.
-/datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null, var/banip = null, var/bancid = null)
+/datum/admins/proc/DB_ban_record(bantype, mob/banned_mob, duration = -1, reason, job = "", rounds = 0, banckey = null, banip = null, bancid = null)
if(!check_rights(R_MOD,0) && !check_rights(R_BAN)) return
@@ -88,7 +88,7 @@
qdel(query_insert)
-/datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
+/datum/admins/proc/DB_ban_unban(ckey, bantype, job = "")
if(!check_rights(R_BAN))
return
@@ -153,7 +153,7 @@
DB_ban_unban_by_id(ban_id)
-/datum/admins/proc/DB_ban_edit(client/user, var/banid = null, var/param = null)
+/datum/admins/proc/DB_ban_edit(client/user, banid = null, param = null)
if(!check_rights_for(user, R_BAN))
return
@@ -216,7 +216,7 @@
to_chat(user, span_filter_adminlog("Cancelled"))
return
-/datum/admins/proc/DB_ban_unban_by_id(var/id)
+/datum/admins/proc/DB_ban_unban_by_id(id)
if(!check_rights(R_BAN)) return
@@ -266,7 +266,7 @@
holder.DB_ban_panel(src)
-/datum/admins/proc/DB_ban_panel(client/user, var/playerckey = null)
+/datum/admins/proc/DB_ban_panel(client/user, playerckey = null)
if(!user)
return
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index b569f33ae8..71160fb783 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -2,7 +2,7 @@ GLOBAL_VAR_INIT(c_minutes, 0)
GLOBAL_DATUM(banlist, /savefile)
-/proc/CheckBan(var/ckey, var/id, var/address)
+/proc/CheckBan(ckey, id, address)
if(!GLOB.banlist) // if Banlist cannot be located for some reason
LoadBans() // try to load the bans
if(!GLOB.banlist) // uh oh, can't find bans!
diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm
index 3ebb0c83a2..2c9439fd00 100644
--- a/code/modules/admin/ToRban.dm
+++ b/code/modules/admin/ToRban.dm
@@ -4,7 +4,7 @@
#define TORFILE "data/ToR_ban.bdb"
#define TOR_UPDATE_INTERVAL 216000 //~6 hours
-/proc/ToRban_isbanned(var/ip_address)
+/proc/ToRban_isbanned(ip_address)
var/savefile/F = new(TORFILE)
if(F)
if( ip_address in F.dir )
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 50a97f96f9..a06ab9e11f 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -2,7 +2,7 @@ GLOBAL_VAR_INIT(floorIsLava, 0)
////////////////////////////////
-/proc/message_admins(var/msg)
+/proc/message_admins(msg)
msg = span_filter_adminlog(span_log_message(span_prefix("ADMIN LOG:") + span_message("[msg]")))
//log_admin_private(msg) //log_and_message_admins is for this
@@ -13,7 +13,7 @@ GLOBAL_VAR_INIT(floorIsLava, 0)
html = msg,
confidential = TRUE)
-/proc/msg_admin_attack(var/text) //Toggleable Attack Messages
+/proc/msg_admin_attack(text) //Toggleable Attack Messages
var/rendered = span_filter_attacklog(span_log_message(span_prefix("ATTACK:") + span_message("[text]")))
for(var/client/C in GLOB.admins)
if(check_rights_for(C, (R_ADMIN|R_MOD)))
@@ -24,7 +24,7 @@ GLOBAL_VAR_INIT(floorIsLava, 0)
html = msg,
confidential = TRUE)
-/proc/admin_notice(var/message, var/rights)
+/proc/admin_notice(message, rights)
for(var/mob/M in GLOB.mob_list)
var/C = M.client
@@ -262,7 +262,7 @@ ADMIN_VERB(PlayerNotes, R_ADMIN|R_MOD|R_EVENT|R_DEBUG, "Player Notes", "Access t
A.tgui_interact(user)
-/datum/admins/proc/player_has_info(var/key as text)
+/datum/admins/proc/player_has_info(key as text)
var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
var/list/infos
info >> infos
@@ -554,7 +554,7 @@ ADMIN_VERB(access_news_network, R_ADMIN|R_EVENT, "Access Newscaster Network", "A
popup.open()
/*
-/datum/admins/proc/Secrets(var/datum/admin_secret_category/active_category = null)
+/datum/admins/proc/Secrets(datum/admin_secret_category/active_category = null)
if(!check_rights(0)) return
// Print the header with category selection buttons.
@@ -927,7 +927,7 @@ ADMIN_VERB(adrev, R_SERVER, "Toggle Revive", "Toggle admin revives.", ADMIN_CATE
message_admins(span_blue("Toggled reviving to [CONFIG_GET(flag/allow_admin_rev)]."))
feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/datum/admins/proc/unprison(var/mob/M in GLOB.mob_list)
+/datum/admins/proc/unprison(mob/M in GLOB.mob_list)
set category = "Admin.Moderation"
set name = "Unprison"
if (M.z == 2)
@@ -943,7 +943,7 @@ ADMIN_VERB(adrev, R_SERVER, "Toggle Revive", "Toggle admin revives.", ADMIN_CATE
////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS
-/proc/is_special_character(var/character) // returns 1 for special characters and 2 for heroes of gamemode
+/proc/is_special_character(character) // returns 1 for special characters and 2 for heroes of gamemode
if(!SSticker|| !SSticker.mode)
return 0
var/datum/mind/M
@@ -1223,7 +1223,7 @@ ADMIN_VERB(toggleguests, R_HOST, "Toggle guests", "Guests can't enter.", ADMIN_C
//Returns 1 to let the dragdrop code know we are trapping this event
//Returns 0 if we don't plan to trap the event
-/datum/admins/proc/cmd_ghost_drag(var/mob/observer/dead/frommob, var/mob/living/tomob)
+/datum/admins/proc/cmd_ghost_drag(mob/observer/dead/frommob, mob/living/tomob)
if(!istype(frommob))
return //Extra sanity check to make sure only observers are shoved into things
@@ -1322,7 +1322,7 @@ ADMIN_VERB(sendFax, R_ADMIN|R_MOD|R_EVENT, "Send Fax", "Sends a fax to this mach
/datum/admins/var/obj/item/paper/admin/faxreply // var to hold fax replies in
-/datum/admins/proc/faxCallback(var/obj/item/paper/admin/P, var/obj/machinery/photocopier/faxmachine/destination)
+/datum/admins/proc/faxCallback(obj/item/paper/admin/P, obj/machinery/photocopier/faxmachine/destination)
var/customname = tgui_input_text(src.owner, "Pick a title for the report", "Title")
P.name = "[P.origin] - [customname]"
diff --git a/code/modules/admin/admin_attack_log.dm b/code/modules/admin/admin_attack_log.dm
index 99cc586ff7..a236f5fb66 100644
--- a/code/modules/admin/admin_attack_log.dm
+++ b/code/modules/admin/admin_attack_log.dm
@@ -1,10 +1,10 @@
/atom/var/lastattacker = null
-/proc/log_and_message_admins(var/message as text, var/mob/user = usr)
+/proc/log_and_message_admins(message as text, mob/user = usr)
log_admin(user ? "[key_name(user)] [message]" : "EVENT [message]")
message_admins(user ? "[key_name_admin(user)] [message]" : "EVENT [message]")
-/proc/log_and_message_admins_many(var/list/mob/users, var/message)
+/proc/log_and_message_admins_many(list/mob/users, message)
if(!users || !users.len)
return
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index 322c18eb8d..3cdef564f7 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -8,7 +8,7 @@
#define INVESTIGATE_DIR "data/investigate/"
//SYSTEM
-/proc/investigate_subject2file(var/subject)
+/proc/investigate_subject2file(subject)
return file("[INVESTIGATE_DIR][subject].html")
/hook/startup/proc/resetInvestigate()
@@ -19,7 +19,7 @@
if(fdel(INVESTIGATE_DIR)) return 1
return 0
-/atom/proc/investigate_log(var/message, var/subject)
+/atom/proc/investigate_log(message, subject)
if(!message) return
var/F = investigate_subject2file(subject)
if(!F) return
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index b64a66cd6d..df555a47c2 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(jobban_keylist) //to store the keys & ranks
return ckey_is_jobbanned(M.ckey, rank)
return 0
-/proc/ckey_is_jobbanned(var/check_key, var/rank)
+/proc/ckey_is_jobbanned(check_key, rank)
for(var/s in GLOB.jobban_keylist)
if(findtext(s,"[check_key] - [rank]") == 1 )
var/startpos = findtext(s, "## ")+3
@@ -105,7 +105,7 @@ DEBUG
jobban_savebanfile()
-/proc/ban_unban_log_save(var/formatted_log)
+/proc/ban_unban_log_save(formatted_log)
text2file(formatted_log,"data/ban_unban_log.txt")
diff --git a/code/modules/admin/ckey_vr.dm b/code/modules/admin/ckey_vr.dm
index 09641d8508..1a136d46a5 100644
--- a/code/modules/admin/ckey_vr.dm
+++ b/code/modules/admin/ckey_vr.dm
@@ -1,5 +1,5 @@
// Command to set the ckey of a mob without requiring VV permission
-/client/proc/SetCKey(var/mob/M in GLOB.mob_list)
+/client/proc/SetCKey(mob/M in GLOB.mob_list)
set category = "Admin.Game"
set name = "Set CKey"
set desc = "Mob to teleport"
diff --git a/code/modules/admin/health_scan.dm b/code/modules/admin/health_scan.dm
index 7d625c6950..36dff7212a 100644
--- a/code/modules/admin/health_scan.dm
+++ b/code/modules/admin/health_scan.dm
@@ -4,7 +4,7 @@
// showadvscan toggles whether to give additional scan information about chemicals in their body.
// By default this proc is set to it's most powerful scan.
-/mob/living/proc/scan_mob(mob/user, var/mode = 1, var/advscan = SCANNABLE_SECRETIVE, var/showadvscan = 1)
+/mob/living/proc/scan_mob(mob/user, mode = 1, advscan = SCANNABLE_SECRETIVE, showadvscan = 1)
var/mob/living/M = src
var/dat = ""
diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 1703dc71da..ae1b1ce404 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -584,13 +584,13 @@ ADMIN_VERB_AND_CONTEXT_MENU(modify_robot, R_ADMIN|R_FUN|R_VAREDIT|R_EVENT, "Modi
target.hud_used?.update_robot_modules_display()
return TRUE
-/datum/eventkit/modify_robot/proc/get_target_items(var/mob/user)
+/datum/eventkit/modify_robot/proc/get_target_items(mob/user)
var/list/target_items = list()
for(var/obj/item in target.module.modules)
target_items += list(list("name" = item.name, "ref" = "\ref[item]", "icon" = icon2html(item, user, sourceonly=TRUE), "desc" = item.desc))
return target_items
-/datum/eventkit/modify_robot/proc/get_module_source(var/mob/user, var/datum/asset/spritesheet_batched/robot_icons/spritesheet)
+/datum/eventkit/modify_robot/proc/get_module_source(mob/user, datum/asset/spritesheet_batched/robot_icons/spritesheet)
var/list/source_list = list()
source_list["model"] = source.module
source_list["sprite"] = sanitize_css_class_name("[source.sprite_datum.type]")
@@ -660,7 +660,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(modify_robot, R_ADMIN|R_FUN|R_VAREDIT|R_EVENT, "Modi
all_upgrades["restricted_upgrades"] = restricted_upgrades
return all_upgrades
-/datum/eventkit/modify_robot/proc/get_pka(var/obj/item/gun/energy/kinetic_accelerator/kin)
+/datum/eventkit/modify_robot/proc/get_pka(obj/item/gun/energy/kinetic_accelerator/kin)
var/list/pka = list()
pka["name"] = kin.name
var/list/installed_modkits = list()
@@ -695,7 +695,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(modify_robot, R_ADMIN|R_FUN|R_VAREDIT|R_EVENT, "Modi
pka["max_capacity"] = kin.max_mod_capacity
return pka
-/datum/eventkit/modify_robot/proc/get_mult_belt(var/obj/item/robotic_multibelt/mult_belt)
+/datum/eventkit/modify_robot/proc/get_mult_belt(obj/item/robotic_multibelt/mult_belt)
var/list/multi_belt_list = list()
multi_belt_list["name"] = mult_belt.name
multi_belt_list["ref"] = REF(mult_belt)
@@ -739,7 +739,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(modify_robot, R_ADMIN|R_FUN|R_VAREDIT|R_EVENT, "Modi
cell_options += list(initial(C.name) = list("path" = "[C]", "charge" = initial(C.maxcharge), "max_charge" = initial(C.maxcharge), "charge_amount" = initial(C.charge_amount) , "self_charge" = initial(C.self_recharge), "max_damage" = initial(C.robot_durability))) // our cells do not have their charge predefined, they do it on init, so both maaxcharge for now
return cell_options
-/datum/eventkit/modify_robot/proc/get_component(var/type)
+/datum/eventkit/modify_robot/proc/get_component(type)
var/path
switch(type)
if("camera")
@@ -791,14 +791,14 @@ ADMIN_VERB_AND_CONTEXT_MENU(modify_robot, R_ADMIN|R_FUN|R_VAREDIT|R_EVENT, "Modi
components += list(list("name" = C.name, "ref" = "\ref[C]", "brute_damage" = C.brute_damage, "electronics_damage" = C.electronics_damage, "max_damage" = C.max_damage, "idle_usage" = C.idle_usage, "active_usage" = C.active_usage, "installed" = C.installed, "exists" = (C.wrapped ? TRUE : FALSE)))
return components
-/datum/eventkit/modify_robot/proc/package_laws(var/list/data, var/field, var/list/datum/ai_law/laws)
+/datum/eventkit/modify_robot/proc/package_laws(list/data, field, list/datum/ai_law/laws)
var/list/packaged_laws = list()
for(var/datum/ai_law/AL in laws)
packaged_laws[++packaged_laws.len] = list("law" = AL.law, "index" = AL.get_index(), "state" = target.laws.get_state_law(AL), "ref" = "\ref[AL]")
data[field] = packaged_laws
data["has_[field]"] = packaged_laws.len
-/datum/eventkit/modify_robot/proc/package_multiple_laws(var/list/datum/ai_laws/laws)
+/datum/eventkit/modify_robot/proc/package_multiple_laws(list/datum/ai_laws/laws)
var/list/law_sets = list()
for(var/datum/ai_laws/ALs in laws)
var/list/packaged_laws = list()
@@ -809,8 +809,8 @@ ADMIN_VERB_AND_CONTEXT_MENU(modify_robot, R_ADMIN|R_FUN|R_VAREDIT|R_EVENT, "Modi
law_sets[++law_sets.len] = list("name" = ALs.name, "header" = ALs.law_header, "ref" = "\ref[ALs]","laws" = packaged_laws)
return law_sets
-/datum/eventkit/modify_robot/proc/is_malf(var/mob/user)
+/datum/eventkit/modify_robot/proc/is_malf(mob/user)
return (is_admin(user) && !target.is_slaved()) || is_special_role(user)
-/datum/eventkit/modify_robot/proc/is_special_role(var/mob/user)
+/datum/eventkit/modify_robot/proc/is_special_role(mob/user)
return user.mind?.special_role ? TRUE : FALSE
diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm
index 17f800b5d0..c15a692acc 100644
--- a/code/modules/admin/newbanjob.dm
+++ b/code/modules/admin/newbanjob.dm
@@ -18,7 +18,7 @@
GLOBAL_DATUM(banlistjob, /savefile)
-/proc/_jobban_isbanned(var/client/clientvar, var/rank)
+/proc/_jobban_isbanned(client/clientvar, rank)
if(!clientvar) return 1
ClearTempbansjob()
var/id = clientvar.computer_id
diff --git a/code/modules/admin/news.dm b/code/modules/admin/news.dm
index 51072998ee..391df02dd7 100644
--- a/code/modules/admin/news.dm
+++ b/code/modules/admin/news.dm
@@ -42,7 +42,7 @@ ADMIN_VERB(modify_server_news, R_SERVER|R_EVENT, "Modify Public News", "Modify t
return F
// This is used when submitting the news input, so the safe markup can get past sanitize.
-/proc/paper_markup2html(var/text)
+/proc/paper_markup2html(text)
text = replacetext(text, "\n", "
")
text = replacetext(text, "\[center\]", "")
text = replacetext(text, "\[/center\]", "")
@@ -80,7 +80,7 @@ ADMIN_VERB(modify_server_news, R_SERVER|R_EVENT, "Modify Public News", "Modify t
return text
// This is used when reading text that went through paper_markup2html(), to reverse it so that edits don't need to replace everything once more to avoid sanitization.
-/proc/html2paper_markup(var/text)
+/proc/html2paper_markup(text)
text = replacetext(text, "
", "\[br\]")
text = replacetext(text, "", "\[center\]")
text = replacetext(text, "", "\[/center\]")
diff --git a/code/modules/admin/player_notes.dm b/code/modules/admin/player_notes.dm
index 3074026aca..f8f29aeef5 100644
--- a/code/modules/admin/player_notes.dm
+++ b/code/modules/admin/player_notes.dm
@@ -1,5 +1,5 @@
//Hijacking this file for BS12 playernotes functions. I like this ^ one systemm alright, but converting sounds too bothersome~ Chinsky.
-/proc/notes_add(var/key, var/note, var/mob/user)
+/proc/notes_add(key, note, mob/user)
if (!key || !note)
return
@@ -52,7 +52,7 @@
del(note_list) // savefile, so NOT qdel
-/proc/notes_del(var/key, var/index)
+/proc/notes_del(key, index)
var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
var/list/infos
info >> infos
@@ -67,7 +67,7 @@
admin_action_message(usr.key, key, "deleted note on", "\[Note gone\]", 0) //VOREStation Add
qdel(info)
-/proc/show_player_info_irc(var/key as text)
+/proc/show_player_info_irc(key as text)
var/dat = " Info on [key]\n"
var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
var/list/infos
diff --git a/code/modules/admin/random_quest.dm b/code/modules/admin/random_quest.dm
index 5fd0fb42ab..1cd61eb7a1 100644
--- a/code/modules/admin/random_quest.dm
+++ b/code/modules/admin/random_quest.dm
@@ -1,4 +1,4 @@
-/mob/proc/quest_from_above(var/specific_quest)
+/mob/proc/quest_from_above(specific_quest)
var/list/quests = list("Search",
"Collect",
"Drink",
diff --git a/code/modules/admin/savefile_convert.dm b/code/modules/admin/savefile_convert.dm
index 165906eb2d..ce90878f37 100644
--- a/code/modules/admin/savefile_convert.dm
+++ b/code/modules/admin/savefile_convert.dm
@@ -13,7 +13,7 @@
*/
/// Returns the base save directory for a given ckey.
-/proc/get_player_save_dir(var/ckey)
+/proc/get_player_save_dir(ckey)
return "data/player_saves/[copytext(ckey, 1, 2)]/[ckey]"
ADMIN_VERB(admin_convert_savefile, R_ADMIN, "Convert Player Savefile", "Convert a player's preferences.sav to preferences.json or vice versa. Player must be logged off.", ADMIN_CATEGORY_SERVER_ADMIN)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 9ac7b81b09..d58e2b750e 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1810,15 +1810,15 @@
/atom/proc/extra_admin_link()
return
-/mob/extra_admin_link(var/source)
+/mob/extra_admin_link(source)
if(client && eyeobj)
return "|EYE"
-/mob/observer/dead/extra_admin_link(var/source)
+/mob/observer/dead/extra_admin_link(source)
if(mind && mind.current)
return "|BDY"
-/proc/admin_jump_link(var/atom/target, var/source)
+/proc/admin_jump_link(atom/target, source)
if(!target) return
// The way admin jump links handle their src is weirdly inconsistent...
if(istype(source, /datum/admins))
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
index 9d6c58ec09..e6a477ba10 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
@@ -319,7 +319,7 @@
//assignment: '=' expression
-/datum/SDQL_parser/proc/assignment(var/i, var/list/node, var/list/assignment_list = list())
+/datum/SDQL_parser/proc/assignment(i, list/node, list/assignment_list = list())
assignment_list += token(i)
if(token(i + 1) == ".")
@@ -426,7 +426,7 @@
return i + 1
//array: '[' expression, expression, ... ']'
-/datum/SDQL_parser/proc/array(var/i, var/list/node)
+/datum/SDQL_parser/proc/array(i, list/node)
// Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array.
if(copytext(token(i), 1, 2) != "\[")
parse_error("Expected an array but found '[token(i)]'")
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index e753a31927..94ff394b0c 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -44,7 +44,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(jumptomob, R_ADMIN|R_MOD|R_DEBUG|R_EVENT, "Jump to M
user.do_jumptomob(M)
/// Performs the jumps, also called from admin Topic() for JMP links
-/client/proc/do_jumptomob(var/mob/M)
+/client/proc/do_jumptomob(mob/M)
if(!CONFIG_GET(flag/allow_admin_jump))
tgui_alert_async(usr, "Admin jumping disabled")
return
@@ -174,7 +174,7 @@ ADMIN_VERB(Getkey, R_ADMIN|R_MOD|R_DEBUG|R_EVENT, "Get Key", "Key to teleport."
else
tgui_alert_async(usr, "Admin jumping disabled")
-/client/proc/cmd_admin_move_atom(var/atom/movable/AM, tx as num, ty as num, tz as num)
+/client/proc/cmd_admin_move_atom(atom/movable/AM, tx as num, ty as num, tz as num)
set category = "Admin.Game"
set name = "Move Atom to Coordinate"
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index 668b702bf0..94cc62f02b 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -345,7 +345,7 @@ GLOBAL_LIST_EMPTY(active_buildmode_holders)
objholder = get_path_from_partial_text()
return 1
-/proc/build_click(var/mob/user, buildmode, params, var/obj/object)
+/proc/build_click(mob/user, buildmode, params, obj/object)
var/obj/effect/bmode/buildholder/holder = null
for(var/obj/effect/bmode/buildholder/H)
if(H.cl == user.client)
@@ -738,7 +738,7 @@ CHOMP Remove end */
if(holder.buildmode.objsay)
to_chat(usr, "[object.type]")
-/proc/build_drag(var/client/user, buildmode, var/atom/fromatom, var/atom/toatom, var/atom/fromloc, var/atom/toloc, var/fromcontrol, var/tocontrol, params)
+/proc/build_drag(client/user, buildmode, atom/fromatom, atom/toatom, atom/fromloc, atom/toloc, fromcontrol, tocontrol, params)
var/obj/effect/bmode/buildholder/holder = null
for(var/obj/effect/bmode/buildholder/H)
if(H.cl == user)
@@ -805,7 +805,7 @@ CHOMP Remove end */
log_admin("BUILDMODE/ITEM GENERATION: [key_name(usr)] selected [result] to be spawned.")
return result
-/obj/effect/bmode/buildmode/proc/make_rectangle(var/turf/A, var/turf/B, var/turf/wall_type, var/turf/floor_type, var/area_enabled, var/area_name)
+/obj/effect/bmode/buildmode/proc/make_rectangle(turf/A, turf/B, turf/wall_type, turf/floor_type, area_enabled, area_name)
if(!A || !B) // No coords
return
if(A.z != B.z) // Not same z-level
@@ -867,7 +867,7 @@ CHOMP Remove end */
if(area_enabled) //Let's try not to make a new area unless you got walls and a floor.
create_buildmode_area(area_name, origin) //Generates a new area.
-/proc/create_buildmode_area(var/area_name, var/turf/origin)
+/proc/create_buildmode_area(area_name, turf/origin)
var/turfs = detect_room_buildmode(origin)
var/area/newA
@@ -891,7 +891,7 @@ CHOMP Remove end */
oldA.power_check() //Simply makes the area turn the power off if you nicked an APC from it.
return TRUE
-/proc/detect_room_buildmode(var/turf/first, var/allowedAreas = AREA_SPACE)
+/proc/detect_room_buildmode(turf/first, allowedAreas = AREA_SPACE)
if(!istype(first))
return
var/list/turf/found = list()
diff --git a/code/modules/admin/verbs/check_customitem_activity.dm b/code/modules/admin/verbs/check_customitem_activity.dm
index 55e17d090c..98c5d9e3cd 100644
--- a/code/modules/admin/verbs/check_customitem_activity.dm
+++ b/code/modules/admin/verbs/check_customitem_activity.dm
@@ -22,7 +22,7 @@ ADMIN_VERB(check_customitem_activity, R_ADMIN|R_MOD|R_SERVER, "Check activity of
popup.set_content(dat)
popup.open()
-/proc/populate_inactive_customitems_list(var/client/C)
+/proc/populate_inactive_customitems_list(client/C)
set background = 1
if(GLOB.checked_for_inactives)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 14b83c7cc0..2720214e86 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -369,7 +369,7 @@ ADMIN_VERB(cmd_admin_dress, R_FUN, "elect equipment", "Select equipment for a mo
feedback_add_details("admin_verb","SEQ")
dressup_human(target_human, outfit, 1)
-/proc/dressup_human(var/mob/living/carbon/human/H, var/datum/decl/hierarchy/outfit/outfit)
+/proc/dressup_human(mob/living/carbon/human/H, datum/decl/hierarchy/outfit/outfit)
if(!H || !outfit)
return
if(outfit.undress)
@@ -514,7 +514,7 @@ ADMIN_VERB(cmd_debug_using_map, R_DEBUG, "Debug Map Datum", "Debug the map metad
user.debug_variables(using_map)
// DNA2 - Admin Hax
-/client/proc/cmd_admin_toggle_block(var/mob/M,var/block)
+/client/proc/cmd_admin_toggle_block(mob/M,block)
if(!SSticker)
tgui_alert_async(src, "Wait until the game starts")
return
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 146af55796..c5a46dc3c3 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -119,7 +119,7 @@ ADMIN_VERB(intercom_view, R_DEBUG, "Intercom Range Display", "Displays the inter
/client/var/usedZAScolors = 0
/client/var/list/image/ZAScolors = list()
-/client/proc/recurse_zone(var/datum/zone/Z, var/recurse_level =1)
+/client/proc/recurse_zone(datum/zone/Z, recurse_level =1)
testZAScolors_zones += Z
if(recurse_level > 10)
return
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index e277de372d..a4d719c8ac 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -26,7 +26,7 @@
feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_prayer("[src.key]/([src.name]): [raw_msg]")
-/proc/CentCom_announce(var/msg, var/mob/Sender, var/iamessage)
+/proc/CentCom_announce(msg, mob/Sender, iamessage)
msg = span_blue(span_bold(span_orange("[uppertext(using_map.boss_short)]M[iamessage ? " IA" : ""]:") + "[key_name(Sender, 1)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] ([admin_jump_link(Sender)]) [ADMIN_CA(Sender)] [ADMIN_BSA(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]:") + " [msg]")
for(var/client/C in GLOB.admins) //VOREStation Edit - GLOB admins
if(!check_rights_for(C, R_ADMIN|R_EVENT)) //CHOMPEdit
@@ -34,7 +34,7 @@
to_chat(C,msg)
C << 'sound/machines/signal.ogg'
-/proc/Syndicate_announce(var/msg, var/mob/Sender)
+/proc/Syndicate_announce(msg, mob/Sender)
msg = span_blue(span_bold(span_crimson("ILLEGAL:") + "[key_name(Sender, 1)] [ADMIN_PP(Sender)] [ADMIN_VV(Sender)] [ADMIN_SM(Sender)] ([admin_jump_link(Sender)]) [ADMIN_CA(Sender)] [ADMIN_BSA(Sender)] [ADMIN_SYNDICATE_REPLY(Sender)]:") + " [msg]")
for(var/client/C in GLOB.admins) //VOREStation Edit - GLOB admins
if(!check_rights_for(C, R_ADMIN|R_EVENT)) //CHOMPEdit
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 71f0efcb70..4d6e2a1eba 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -232,7 +232,7 @@ Allow admins to set players to be able to respawn/bypass 30 min wait, without th
Ccomp's first proc.
*/
-/client/proc/get_ghosts(var/notify = 0,var/what = 2)
+/client/proc/get_ghosts(notify = 0,what = 2)
// what = 1, return ghosts ass list.
// what = 2, return mob list
diff --git a/code/modules/admin/verbs/smite.dm b/code/modules/admin/verbs/smite.dm
index ce73723600..beb55d3129 100644
--- a/code/modules/admin/verbs/smite.dm
+++ b/code/modules/admin/verbs/smite.dm
@@ -1,4 +1,4 @@
-/client/proc/smite(var/mob/living/carbon/human/target in GLOB.player_list)
+/client/proc/smite(mob/living/carbon/human/target in GLOB.player_list)
set name = "Smite"
set desc = "Abuse a player with various 'special treatments' from a list."
set category = "Fun.Do Not"
@@ -322,7 +322,7 @@ GLOBAL_VAR(redspace_abduction_z)
target.transforming = FALSE
-/proc/fake_autosave(var/mob/living/target, var/client/user, var/wide)
+/proc/fake_autosave(mob/living/target, client/user, wide)
if(!istype(target) || !target.client)
to_chat(user, span_warning("Skipping [target] because they are not a /mob/living or have no client."))
return
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index 12efba2764..80305ac520 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -153,7 +153,7 @@ ADMIN_VERB(response_team, R_ADMIN|R_MOD|R_EVENT, "Dispatch Emergency Response Te
sleep(600 * 3) // Minute * Number of Minutes
-/proc/trigger_armed_response_team(var/force = 0)
+/proc/trigger_armed_response_team(force = 0)
if(!GLOB.can_call_ert && !force)
return
if(GLOB.send_emergency_team)
diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm
index 594d82cf3a..ed31101166 100644
--- a/code/modules/ai/ai_holder.dm
+++ b/code/modules/ai/ai_holder.dm
@@ -211,7 +211,7 @@
to_chat(usr,span_notice("Mass AI edit done."))
href_list[VV_HK_DATUM_REFRESH] = "\ref[src]"
-/datum/ai_holder/New(var/new_holder)
+/datum/ai_holder/New(new_holder)
ASSERT(new_holder)
holder = new_holder
home_turf = get_turf(holder)
@@ -225,7 +225,7 @@
home_turf = null
return ..()
-/datum/ai_holder/proc/manage_processing(var/desired)
+/datum/ai_holder/proc/manage_processing(desired)
if(desired & AI_PROCESSING)
START_AIPROCESSING(src)
else
@@ -236,7 +236,7 @@
else
STOP_AIFASTPROCESSING(src)
-/datum/ai_holder/proc/holder_stat_change(var/mob, old_stat, new_stat)
+/datum/ai_holder/proc/holder_stat_change(mob, old_stat, new_stat)
SIGNAL_HANDLER
if(old_stat >= DEAD && new_stat <= DEAD) //Revived
manage_processing(AI_PROCESSING)
@@ -259,7 +259,7 @@
holder.apply_hud(STATUS_HUD, sleepingimage)
// Now for the actual AI stuff.
-/datum/ai_holder/proc/set_busy(var/value = 0)
+/datum/ai_holder/proc/set_busy(value = 0)
busy = value
update_paused_hud()
@@ -322,7 +322,7 @@
/datum/ai_holder/proc/handle_special_strategical()
// For setting the stance WITHOUT processing it
-/datum/ai_holder/proc/set_stance(var/new_stance)
+/datum/ai_holder/proc/set_stance(new_stance)
if(holder?.key && !autopilot)
return
if(stance == new_stance)
diff --git a/code/modules/ai/ai_holder_communication.dm b/code/modules/ai/ai_holder_communication.dm
index 8331a57762..9351f3afbc 100644
--- a/code/modules/ai/ai_holder_communication.dm
+++ b/code/modules/ai/ai_holder_communication.dm
@@ -123,7 +123,7 @@
return
// This is to make responses feel a bit more natural and not instant.
-/datum/ai_holder/proc/delayed_say(var/message, var/mob/speak_to)
+/datum/ai_holder/proc/delayed_say(message, mob/speak_to)
spawn(rand(1 SECOND, 2 SECONDS))
if(!src || !holder || !can_act()) // We might've died/got deleted/etc in the meantime.
return
diff --git a/code/modules/ai/ai_holder_debug.dm b/code/modules/ai/ai_holder_debug.dm
index 553a54955d..69b5737974 100644
--- a/code/modules/ai/ai_holder_debug.dm
+++ b/code/modules/ai/ai_holder_debug.dm
@@ -25,7 +25,7 @@
return ..()
//For debug purposes!
-/datum/ai_holder/proc/ai_log_output(var/msg = "missing message", var/ver = AI_LOG_INFO)
+/datum/ai_holder/proc/ai_log_output(msg = "missing message", ver = AI_LOG_INFO)
var/span_type
switch(ver)
if(AI_LOG_OFF)
diff --git a/code/modules/ai/ai_holder_pathfinding.dm b/code/modules/ai/ai_holder_pathfinding.dm
index 0b87c58e57..68234bbc11 100644
--- a/code/modules/ai/ai_holder_pathfinding.dm
+++ b/code/modules/ai/ai_holder_pathfinding.dm
@@ -45,7 +45,7 @@
ai_log("calculate_path() : Exiting.", AI_LOG_DEBUG)
//A* now, try to a path to a target
-/datum/ai_holder/proc/get_path(var/turf/target,var/get_to = 1, var/max_distance = world.view*6)
+/datum/ai_holder/proc/get_path(turf/target,get_to = 1, max_distance = world.view*6)
ai_log("get_path() : Entering.",AI_LOG_DEBUG)
forget_path()
var/list/new_path = SSpathfinder.default_ai_pathfinding(src, target, get_to) //CHOMPEdit
diff --git a/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm b/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm
index 8f37476673..b9e38f89de 100644
--- a/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm
+++ b/code/modules/ai/ai_holder_subtypes/slime_xenobio_ai.dm
@@ -192,7 +192,7 @@
return 1 // Melee (eat) the target if dead/dying, don't shoot it.
return ..()
-/datum/ai_holder/simple_mob/xenobio_slime/can_attack(atom/movable/AM, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/xenobio_slime/can_attack(atom/movable/AM, vision_required = TRUE)
. = ..()
if(.) // Do some additional checks because we have Special Code(tm).
if(ishuman(AM))
diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm
index 241c69bb09..1d6026fb0a 100644
--- a/code/modules/ai/ai_holder_targeting.dm
+++ b/code/modules/ai/ai_holder_targeting.dm
@@ -47,7 +47,7 @@
//CHOMPEdit End
// Step 2, filter down possible targets to things we actually care about.
-/datum/ai_holder/proc/find_target(var/list/possible_targets, var/has_targets_list = FALSE)
+/datum/ai_holder/proc/find_target(list/possible_targets, has_targets_list = FALSE)
ai_log("find_target() : Entered.", AI_LOG_TRACE)
if(!hostile) // So retaliating mobs only attack the thing that hit it.
return null
@@ -130,7 +130,7 @@
closest_targets += A
return closest_targets
-/datum/ai_holder/proc/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/proc/can_attack(atom/movable/the_target, vision_required = TRUE)
//CHOMP Removal (optimizing by making most intense check last)
if(!belly_attack)
if(isbelly(holder.loc))
@@ -195,7 +195,7 @@
//CHOMPEdit Begin
//It may seem a bit funny to define a proc above and then immediately override it in the same file
//But this is basically layering the checks so that the vision check will always come last
-/datum/ai_holder/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/can_attack(atom/movable/the_target, vision_required = TRUE)
if(!..())
return FALSE
if(vision_required && !can_see_target(the_target))
@@ -323,15 +323,15 @@
add_attacker(AM)
// Checks to see if an atom attacked us lately
-/datum/ai_holder/proc/check_attacker(var/atom/movable/A)
+/datum/ai_holder/proc/check_attacker(atom/movable/A)
return (A.name in attackers)
// We were attacked by this thing recently
-/datum/ai_holder/proc/add_attacker(var/atom/movable/A)
+/datum/ai_holder/proc/add_attacker(atom/movable/A)
attackers |= A.name
// Forgive this attacker
-/datum/ai_holder/proc/remove_attacker(var/atom/movable/A)
+/datum/ai_holder/proc/remove_attacker(atom/movable/A)
attackers -= A.name
// Causes targeting to prefer targeting the taunter if possible.
diff --git a/code/modules/alarm/alarm.dm b/code/modules/alarm/alarm.dm
index fc1c54f631..d16195e47a 100644
--- a/code/modules/alarm/alarm.dm
+++ b/code/modules/alarm/alarm.dm
@@ -8,7 +8,7 @@
var/start_time = 0 // When this source began alarming.
var/end_time = 0 // Use to set when this trigger should clear, in case the source is lost.
-/datum/alarm_source/New(var/atom/source)
+/datum/alarm_source/New(atom/source)
src.source = source
start_time = world.time
source_name = source.get_source_name()
@@ -24,7 +24,7 @@
var/end_time //Used to set when this alarm should clear, in case the origin is lost.
var/hidden = FALSE //If this alarm can be seen from consoles or other things.
-/datum/alarm/New(var/atom/origin, var/atom/source, var/duration, var/severity, var/hidden)
+/datum/alarm/New(atom/origin, atom/source, duration, severity, hidden)
src.origin = origin
cameras() // Sets up both cameras and last alarm area.
@@ -45,7 +45,7 @@
#undef ALARM_RESET_DELAY
-/datum/alarm/proc/set_source_data(var/atom/source, var/duration, var/severity, var/hidden)
+/datum/alarm/proc/set_source_data(atom/source, duration, severity, hidden)
var/datum/alarm_source/AS = sources_assoc[source]
if(!AS)
AS = new/datum/alarm_source(source)
@@ -59,7 +59,7 @@
AS.severity = severity
src.hidden = min(src.hidden, hidden)
-/datum/alarm/proc/clear(var/source)
+/datum/alarm/proc/clear(source)
var/datum/alarm_source/AS = sources_assoc[source]
sources -= AS
sources_assoc -= source
diff --git a/code/modules/alarm/alarm_handler.dm b/code/modules/alarm/alarm_handler.dm
index b49402d7ff..3f0970b7a5 100644
--- a/code/modules/alarm/alarm_handler.dm
+++ b/code/modules/alarm/alarm_handler.dm
@@ -12,7 +12,7 @@
A.process()
check_alarm_cleared(A)
-/datum/alarm_handler/proc/triggerAlarm(var/atom/origin, var/atom/source, var/duration = 0, var/severity = 1, var/hidden = 0)
+/datum/alarm_handler/proc/triggerAlarm(atom/origin, atom/source, duration = 0, severity = 1, hidden = 0)
var/new_alarm
//Proper origin and source mandatory
if(!(origin && source))
@@ -36,7 +36,7 @@
return new_alarm
-/datum/alarm_handler/proc/clearAlarm(var/atom/origin, var/source)
+/datum/alarm_handler/proc/clearAlarm(atom/origin, source)
//Proper origin and source mandatory
if(!(origin && source))
return
@@ -47,19 +47,19 @@
existing.clear(source)
return check_alarm_cleared(existing)
-/datum/alarm_handler/proc/major_alarms(var/z)
+/datum/alarm_handler/proc/major_alarms(z)
return visible_alarms(z)
-/datum/alarm_handler/proc/has_major_alarms(var/z)
+/datum/alarm_handler/proc/has_major_alarms(z)
if(!LAZYLEN(alarms))
return 0
return LAZYLEN(major_alarms(z))
-/datum/alarm_handler/proc/minor_alarms(var/z)
+/datum/alarm_handler/proc/minor_alarms(z)
return visible_alarms(z)
-/datum/alarm_handler/proc/check_alarm_cleared(var/datum/alarm/alarm)
+/datum/alarm_handler/proc/check_alarm_cleared(datum/alarm/alarm)
if ((alarm.end_time && world.time > alarm.end_time) || !alarm.sources.len)
alarms -= alarm
alarms_assoc -= alarm.origin
@@ -67,7 +67,7 @@
return 1
return 0
-/datum/alarm_handler/proc/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
+/datum/alarm_handler/proc/on_alarm_change(datum/alarm/alarm, was_raised)
for(var/obj/machinery/camera/C in alarm.cameras())
if(was_raised && !alarm.hidden)
C.add_network(category)
@@ -78,7 +78,7 @@
#undef ALARM_RAISED
#undef ALARM_CLEARED
-/datum/alarm_handler/proc/get_alarm_severity_for_origin(var/atom/origin)
+/datum/alarm_handler/proc/get_alarm_severity_for_origin(atom/origin)
if(!origin)
return
@@ -95,17 +95,17 @@
/turf/get_alarm_origin()
return get_area(src)
-/datum/alarm_handler/proc/register_alarm(var/object, var/procName)
+/datum/alarm_handler/proc/register_alarm(object, procName)
listeners[object] = procName
-/datum/alarm_handler/proc/unregister_alarm(var/object)
+/datum/alarm_handler/proc/unregister_alarm(object)
listeners -= object
-/datum/alarm_handler/proc/notify_listeners(var/alarm, var/was_raised)
+/datum/alarm_handler/proc/notify_listeners(alarm, was_raised)
for(var/listener in listeners)
call(listener, listeners[listener])(src, alarm, was_raised)
-/datum/alarm_handler/proc/visible_alarms(var/z)
+/datum/alarm_handler/proc/visible_alarms(z)
if(!LAZYLEN(alarms))
return list()
diff --git a/code/modules/alarm/atmosphere_alarm.dm b/code/modules/alarm/atmosphere_alarm.dm
index 18b260e9cf..c2a0eb13e1 100644
--- a/code/modules/alarm/atmosphere_alarm.dm
+++ b/code/modules/alarm/atmosphere_alarm.dm
@@ -1,7 +1,7 @@
/datum/alarm_handler/atmosphere
category = "Atmosphere Alarms"
-/datum/alarm_handler/atmosphere/major_alarms(var/z)
+/datum/alarm_handler/atmosphere/major_alarms(z)
var/list/major_alarms = new()
var/list/map_levels = using_map.get_map_levels(z)
for(var/datum/alarm/A in visible_alarms())
@@ -11,7 +11,7 @@
major_alarms.Add(A)
return major_alarms
-/datum/alarm_handler/atmosphere/minor_alarms(var/z)
+/datum/alarm_handler/atmosphere/minor_alarms(z)
var/list/minor_alarms = new()
var/list/map_levels = using_map.get_map_levels(z)
for(var/datum/alarm/A in visible_alarms())
diff --git a/code/modules/alarm/fire_alarm.dm b/code/modules/alarm/fire_alarm.dm
index 03cdadde04..3b05e95a29 100644
--- a/code/modules/alarm/fire_alarm.dm
+++ b/code/modules/alarm/fire_alarm.dm
@@ -1,7 +1,7 @@
/datum/alarm_handler/fire
category = "Fire Alarms"
-/datum/alarm_handler/fire/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
+/datum/alarm_handler/fire/on_alarm_change(datum/alarm/alarm, was_raised)
var/area/A = alarm.origin
if(istype(A))
if(was_raised)
diff --git a/code/modules/alarm/power_alarm.dm b/code/modules/alarm/power_alarm.dm
index 4a0947a8f9..bd330399bb 100644
--- a/code/modules/alarm/power_alarm.dm
+++ b/code/modules/alarm/power_alarm.dm
@@ -1,10 +1,10 @@
/datum/alarm_handler/power
category = "Power Alarms"
-/datum/alarm_handler/power/on_alarm_change(var/datum/alarm/alarm, var/was_raised)
+/datum/alarm_handler/power/on_alarm_change(datum/alarm/alarm, was_raised)
var/area/A = alarm.origin
if(istype(A))
A.power_alert(was_raised)
..()
-/area/proc/power_alert(var/alarming)
+/area/proc/power_alert(alarming)
diff --git a/code/modules/artifice/deadringer.dm b/code/modules/artifice/deadringer.dm
index 28313ad137..8c30da34bc 100644
--- a/code/modules/artifice/deadringer.dm
+++ b/code/modules/artifice/deadringer.dm
@@ -96,7 +96,7 @@
playsound(src, 'sound/effects/uncloak.ogg', 35, 1, -1)
return
-/obj/item/deadringer/proc/makeacorpse(var/mob/living/carbon/human/H)
+/obj/item/deadringer/proc/makeacorpse(mob/living/carbon/human/H)
if(H.isSynthetic())
return
corpse = new /mob/living/carbon/human(H.loc)
diff --git a/code/modules/artifice/telecube.dm b/code/modules/artifice/telecube.dm
index d2891ae023..e77fdfb601 100644
--- a/code/modules/artifice/telecube.dm
+++ b/code/modules/artifice/telecube.dm
@@ -117,7 +117,7 @@
. = ..()
update_icon()
-/obj/item/telecube/proc/pair_cube(var/obj/item/telecube/M)
+/obj/item/telecube/proc/pair_cube(obj/item/telecube/M)
if(mate)
return 0
else
@@ -125,7 +125,7 @@
update_icon()
return 1
-/obj/item/telecube/proc/teleport_to_mate(var/atom/movable/A, var/areaporting = FALSE)
+/obj/item/telecube/proc/teleport_to_mate(atom/movable/A, areaporting = FALSE)
. = FALSE
if(!istype(A))
@@ -189,7 +189,7 @@
. = TRUE
return .
-/obj/item/telecube/proc/cooldown(var/mate_too = FALSE)
+/obj/item/telecube/proc/cooldown(mate_too = FALSE)
if(!ready)
return
@@ -203,7 +203,7 @@
ready = TRUE
update_icon()
-/obj/item/telecube/proc/animate_out(var/atom/movable/AM)
+/obj/item/telecube/proc/animate_out(atom/movable/AM)
//See atom cloak/uncloak animations for comments
var/atom/movable/target = AM
var/our_filter_index = target.filters.len+1
@@ -214,7 +214,7 @@
sleep(5)
target.filters -= filter(type="blur", size = 2)
-/obj/item/telecube/proc/animate_in(var/atom/movable/AM)
+/obj/item/telecube/proc/animate_in(atom/movable/AM)
//See atom cloak/uncloak animations for comments
var/atom/movable/target = AM
var/our_filter_index = target.filters.len+1
@@ -233,12 +233,12 @@
if(Adjacent(user) && swap_with_mate())
cooldown(mate_too = TRUE)
-/obj/item/telecube/Bump(var/atom/movable/AM)
+/obj/item/telecube/Bump(atom/movable/AM)
if(teleport_to_mate(AM))
cooldown(mate_too = FALSE)
. = ..()
-/obj/item/telecube/Bumped(var/atom/movable/M)
+/obj/item/telecube/Bumped(atom/movable/M)
if(teleport_to_mate(M))
cooldown(mate_too = FALSE)
. = ..()
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index e7b2054358..45fc35a630 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -32,14 +32,14 @@
/obj/item/assembly/proc/holder_movement()
return
-/obj/item/assembly/proc/pulsed(var/radio = 0)
+/obj/item/assembly/proc/pulsed(radio = 0)
if(holder && (wires_type & WIRE_RECEIVE))
activate()
if(radio && (wires_type & WIRE_RADIO_RECEIVE))
activate()
return 1
-/obj/item/assembly/proc/pulse(var/radio = 0)
+/obj/item/assembly/proc/pulse(radio = 0)
if(holder && (wires_type & WIRE_PULSE))
holder.process_activation(src, 1, 0)
if(holder && (wires_type & WIRE_PULSE_SPECIAL))
@@ -57,7 +57,7 @@
update_icon()
return secured
-/obj/item/assembly/proc/attach_assembly(var/obj/item/assembly/A, var/mob/user)
+/obj/item/assembly/proc/attach_assembly(obj/item/assembly/A, mob/user)
holder = new/obj/item/assembly_holder(get_turf(src))
if(holder.attach(A,src,user))
to_chat(user, span_notice("You attach \the [A] to \the [src]!"))
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 22a9bf4a89..cf90493577 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -13,7 +13,7 @@
var/obj/item/assembly/a_right = null
var/obj/special_assembly = null
-/obj/item/assembly_holder/proc/attach(var/obj/item/assembly/D, var/obj/item/assembly/D2, var/mob/user)
+/obj/item/assembly_holder/proc/attach(obj/item/assembly/D, obj/item/assembly/D2, mob/user)
if(!D || !D2)
return FALSE
@@ -108,7 +108,7 @@
a_right.holder_movement()
..()
-/obj/item/assembly_holder/attackby(var/obj/item/W, var/mob/user)
+/obj/item/assembly_holder/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_SCREWDRIVER))
if(!a_left || !a_right)
to_chat(user, span_warning(" BUG:Assembly part missing, please report this!"))
@@ -156,7 +156,7 @@
a_right.forceMove(T)
qdel(src)
-/obj/item/assembly_holder/proc/process_activation(var/obj/D, var/normal = 1)
+/obj/item/assembly_holder/proc/process_activation(obj/D, normal = 1)
if(!D)
return 0
if(!secured)
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index b1f9a0a5bc..b0e00e8dba 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -32,7 +32,7 @@
update_icon()
return secured
-/obj/item/assembly/infra/proc/toggle_state(var/picked)
+/obj/item/assembly/infra/proc/toggle_state(picked)
if(!isnull(picked))
on = picked
else
@@ -63,7 +63,7 @@
if(!i_beams && secured && (istype(loc, /turf) || (holder && istype(holder.loc, /turf))))
create_beams()
-/obj/item/assembly/infra/proc/create_beams(var/limit = 8)
+/obj/item/assembly/infra/proc/create_beams(limit = 8)
var/current_spot = get_turf(src)
for(var/i = 1 to limit)
var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(current_spot)
@@ -170,7 +170,7 @@
/obj/effect/beam/i_beam/Bumped()
hit()
-/obj/effect/beam/i_beam/Crossed(var/atom/movable/AM)
+/obj/effect/beam/i_beam/Crossed(atom/movable/AM)
if(AM.is_incorporeal())
return
if(istype(AM, /obj/effect/beam))
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 640862d7ea..5b557463cb 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -7,7 +7,7 @@
special_handling = TRUE
-/obj/item/assembly/mousetrap/examine(var/mob/user)
+/obj/item/assembly/mousetrap/examine(mob/user)
. = ..(user)
if(armed)
. += "It looks like it's armed."
@@ -20,7 +20,7 @@
if(holder)
holder.update_icon()
-/obj/item/assembly/mousetrap/proc/triggered(var/mob/target, var/type = "feet")
+/obj/item/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
if(!armed)
return
var/obj/item/organ/external/affecting = null
@@ -70,7 +70,7 @@
update_icon()
playsound(user, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
-/obj/item/assembly/mousetrap/attack_hand(var/mob/living/user)
+/obj/item/assembly/mousetrap/attack_hand(mob/living/user)
if(armed)
if(CLUMSY_FAIL_CHANCE(user))
var/which_hand = BP_L_HAND
@@ -82,7 +82,7 @@
return
..()
-/obj/item/assembly/mousetrap/Crossed(var/atom/movable/AM)
+/obj/item/assembly/mousetrap/Crossed(atom/movable/AM)
if(AM.is_incorporeal())
return
if(armed)
@@ -96,7 +96,7 @@
triggered(AM)
..()
-/obj/item/assembly/mousetrap/on_found(var/mob/living/finder)
+/obj/item/assembly/mousetrap/on_found(mob/living/finder)
if(armed)
finder.visible_message(span_warning("[finder] accidentally sets off [src], breaking [p_their()] fingers."), \
span_warning("You accidentally trigger [src]!"))
@@ -104,7 +104,7 @@
return 1 //end the search!
return 0
-/obj/item/assembly/mousetrap/hitby(var/atom/movable/source, datum/thrownthing/throwingdatum)
+/obj/item/assembly/mousetrap/hitby(atom/movable/source, datum/thrownthing/throwingdatum)
if(!armed)
return ..()
visible_message(span_warning("[src] is triggered by [source]."))
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 49d64674a1..9ff6217ff3 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -14,7 +14,7 @@
..()
return
-/obj/item/assembly/shock_kit/attackby(var/obj/item/W, var/mob/user)
+/obj/item/assembly/shock_kit/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_WRENCH) && !status)
var/turf/T = loc
if(ismob(T))
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index fa94bb0aa9..41aeaff587 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -70,7 +70,7 @@
update_icon()
-/obj/item/assembly/signaler/attackby(var/obj/item/W, mob/user, params)
+/obj/item/assembly/signaler/attackby(obj/item/W, mob/user, params)
if(issignaler(W))
var/obj/item/assembly/signaler/signaler2 = W
if(secured && signaler2.secured)
@@ -95,7 +95,7 @@
radio_connection.post_signal(src, signal)
COOLDOWN_START(src, next_activate, activation_cooldown)
-/obj/item/assembly/signaler/pulse(var/radio = 0)
+/obj/item/assembly/signaler/pulse(radio = 0)
if(is_jammed(src))
return FALSE
if(connected && wires)
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index bab35f531d..de1ccb76f4 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -31,7 +31,7 @@
update_icon()
return secured
-/obj/item/assembly/timer/proc/set_state(var/state)
+/obj/item/assembly/timer/proc/set_state(state)
if(state && !timing) //Not running, starting though
START_PROCESSING(SSobj, src)
else if(timing && !state) //Running, stopping though
diff --git a/code/modules/autowiki/page/symptom.dm b/code/modules/autowiki/page/symptom.dm
index 29aedd3210..949bafc92c 100644
--- a/code/modules/autowiki/page/symptom.dm
+++ b/code/modules/autowiki/page/symptom.dm
@@ -25,7 +25,7 @@
return include_template("Autowiki/SymptomTableTemplate", list("content" = output))
-/datum/autowiki/symptom/proc/generate_thresholds(var/list/thresholds)
+/datum/autowiki/symptom/proc/generate_thresholds(list/thresholds)
var/compiled_thresholds = ""
for(var/threshold in thresholds)
diff --git a/code/modules/awaymissions/gateway_vr.dm b/code/modules/awaymissions/gateway_vr.dm
index 5840afb189..e49e04f876 100644
--- a/code/modules/awaymissions/gateway_vr.dm
+++ b/code/modules/awaymissions/gateway_vr.dm
@@ -75,5 +75,5 @@
icon = 'icons/obj/machines/gateway_vr.dmi'
//No, you can't digest the key to leave the gateway.
-/obj/item/mcguffin/digest_act(var/atom/movable/item_storage = null)
+/obj/item/mcguffin/digest_act(atom/movable/item_storage = null)
return FALSE
diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm
index 3ee4565334..64d387d5aa 100644
--- a/code/modules/awaymissions/redgate.dm
+++ b/code/modules/awaymissions/redgate.dm
@@ -28,7 +28,7 @@
return ..()
-/obj/structure/redgate/proc/teleport(var/mob/M as mob)
+/obj/structure/redgate/proc/teleport(mob/M as mob)
var/keycheck = TRUE
if (!isliving(M)) //We only want mob/living, no bullets or mechs or AI eyes or items
if(is_type_in_list(M, exceptions))
@@ -78,7 +78,7 @@
else
to_chat(M, span_notice("Something blocks your way."))
-/obj/structure/redgate/proc/find_our_turf(var/atom/movable/AM) //This finds the turf on the opposite side of the target gate from where you are
+/obj/structure/redgate/proc/find_our_turf(atom/movable/AM) //This finds the turf on the opposite side of the target gate from where you are
var/offset_x = x - AM.x //used for more smooth teleporting
var/offset_y = y - AM.y
@@ -132,7 +132,7 @@
to_chat(M, span_warning("The [src] remains off... seems like it doesn't have a destination."))
-/obj/structure/redgate/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/redgate/attack_ghost(mob/observer/dead/user)
if(target)
if(!(secret || target.secret) || check_rights_for(user?.client, R_HOLDER))
diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm
index 5b19deb456..78b538cde6 100644
--- a/code/modules/blob/blob.dm
+++ b/code/modules/blob/blob.dm
@@ -22,10 +22,10 @@
health = maxHealth
update_icon()
-/obj/effect/blob/CanPass(var/atom/movable/mover, var/turf/target)
+/obj/effect/blob/CanPass(atom/movable/mover, turf/target)
return FALSE
-/obj/effect/blob/ex_act(var/severity)
+/obj/effect/blob/ex_act(severity)
switch(severity)
if(1)
take_damage(rand(100, 120) / brute_resist)
@@ -40,7 +40,7 @@
else
icon_state = "blob_damaged"
-/obj/effect/blob/take_damage(var/damage) // VOREStation Edit
+/obj/effect/blob/take_damage(damage) // VOREStation Edit
health -= damage
if(health < 0)
playsound(src, 'sound/effects/splat.ogg', 50, 1)
@@ -52,7 +52,7 @@
health = min(health + 1, maxHealth)
update_icon()
-/obj/effect/blob/proc/expand(var/turf/T)
+/obj/effect/blob/proc/expand(turf/T)
if(istype(T, /turf/unsimulated/) || isopenturf(T) || (ismineralturf(T) && T.density))
return
if(istype(T, /turf/simulated/wall))
@@ -108,7 +108,7 @@
return
new expandType(T, min(health, 30))
-/obj/effect/blob/proc/pulse(var/forceLeft, var/list/dirs)
+/obj/effect/blob/proc/pulse(forceLeft, list/dirs)
regen()
animate(src, color = "#FF0000", time=1)
animate(color = "#FFFFFF", time=4, easing=ELASTIC_EASING)
@@ -122,7 +122,7 @@
return
B.pulse(forceLeft - 1, dirs)
-/obj/effect/blob/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/blob/bullet_act(obj/item/projectile/Proj)
if(!Proj)
return
@@ -133,7 +133,7 @@
take_damage(Proj.damage / fire_resist)
return 0
-/obj/effect/blob/attackby(var/obj/item/W, var/mob/user)
+/obj/effect/blob/attackby(obj/item/W, mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
visible_message(span_danger("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]"))
@@ -205,5 +205,5 @@
else
icon_state = "blob_damaged"
-/obj/effect/blob/shield/CanPass(var/atom/movable/mover, var/turf/target)
+/obj/effect/blob/shield/CanPass(atom/movable/mover, turf/target)
return !density
diff --git a/code/modules/blob2/blobs/base_blob.dm b/code/modules/blob2/blobs/base_blob.dm
index 6ca7f7e0f2..75bfbe0ee0 100644
--- a/code/modules/blob2/blobs/base_blob.dm
+++ b/code/modules/blob2/blobs/base_blob.dm
@@ -234,7 +234,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
qdel(src)
return B
-/obj/structure/blob/attack_generic(var/mob/user, var/damage, var/attack_verb)
+/obj/structure/blob/attack_generic(mob/user, damage, attack_verb)
visible_message(span_danger("[user] [attack_verb] the [src]!"))
playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
user.do_attack_animation(src)
@@ -318,7 +318,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
else
attack_generic(M, rand(1,10), "bashed")
-/obj/structure/blob/attackby(var/obj/item/W, var/mob/user)
+/obj/structure/blob/attackby(obj/item/W, mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
visible_message(span_danger("\The [src] has been attacked with \the [W][(user ? " by [user]." : ".")]"))
@@ -349,7 +349,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
adjust_integrity(-damage)
return
-/obj/structure/blob/bullet_act(var/obj/item/projectile/P)
+/obj/structure/blob/bullet_act(obj/item/projectile/P)
if(!P)
return
@@ -379,7 +379,7 @@ GLOBAL_LIST_EMPTY(all_blobs)
if(overmind)
overmind.blob_type.on_water(src, amount)
-/obj/structure/blob/blob_act(var/obj/structure/blob/B)
+/obj/structure/blob/blob_act(obj/structure/blob/B)
. = ..()
if(B)
diff --git a/code/modules/blob2/blobs/core.dm b/code/modules/blob2/blobs/core.dm
index c22e8ed7fb..8b8538603c 100644
--- a/code/modules/blob2/blobs/core.dm
+++ b/code/modules/blob2/blobs/core.dm
@@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(blob_cores)
-/obj/structure/blob/core/proc/overmind_creation(var/client/new_overmind)
+/obj/structure/blob/core/proc/overmind_creation(client/new_overmind)
if(new_overmind)
if(!desired_blob_type && !isnull(difficulty_threshold))
desired_blob_type = get_random_blob_type()
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 25a93435fa..b1ab5f211c 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -23,7 +23,7 @@
/obj/item/blobcore_chunk/is_open_container()
return 1
-/obj/item/blobcore_chunk/Initialize(mapload, var/datum/blob_type/parentblob = null)
+/obj/item/blobcore_chunk/Initialize(mapload, datum/blob_type/parentblob = null)
. = ..()
create_reagents(120)
@@ -36,7 +36,7 @@
. = ..()
-/obj/item/blobcore_chunk/proc/setup_blobtype(var/datum/blob_type/parentblob = null)
+/obj/item/blobcore_chunk/proc/setup_blobtype(datum/blob_type/parentblob = null)
if(!parentblob)
name = "inert [initial(name)]"
@@ -65,7 +65,7 @@
blob_type.chunk_unique(src, args)
return
-/obj/item/blobcore_chunk/proc/get_carrier(var/atom/target)
+/obj/item/blobcore_chunk/proc/get_carrier(atom/target)
var/atom/A = target ? target.loc : src
if(isturf(A) || isarea(A)) // Something has gone horribly wrong if the second is true.
@@ -107,7 +107,7 @@
else
to_chat(user, span_alien("\The [src] stills, returning to a death-like state."))
-/obj/item/blobcore_chunk/proc/regen(var/newfaction = null)
+/obj/item/blobcore_chunk/proc/regen(newfaction = null)
if(istype(blob_type))
if(newfaction)
blob_type.faction = newfaction
@@ -126,12 +126,12 @@
required_reagents = list(REAGENT_ID_PHORON = 60)
result_amount = 1
-/datum/decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/blob_reconstitution/can_happen(datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, /obj/item/blobcore_chunk))
return ..()
return FALSE
-/datum/decl/chemical_reaction/instant/blob_reconstitution/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/blob_reconstitution/on_reaction(datum/reagents/holder)
var/obj/item/blobcore_chunk/chunk = holder.my_atom
if(chunk.can_genesis && chunk.regen())
chunk.visible_message(span_notice("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!"))
@@ -146,7 +146,7 @@
required_reagents = list(REAGENT_ID_HYDROPHORON = 40, REAGENT_ID_PERIDAXON = 20, REAGENT_ID_MUTAGEN = 20)
result_amount = 1
-/datum/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(datum/reagents/holder)
var/obj/item/blobcore_chunk/chunk = holder.my_atom
if(chunk.can_genesis && chunk.regen("neutral"))
chunk.visible_message(span_notice("[chunk] bubbles, surrounding itself with a rapidly expanding mass of [chunk.blob_type.name]!"))
diff --git a/code/modules/blob2/mobs/spore.dm b/code/modules/blob2/mobs/spore.dm
index cb92011343..3fa15f1dbf 100644
--- a/code/modules/blob2/mobs/spore.dm
+++ b/code/modules/blob2/mobs/spore.dm
@@ -30,7 +30,7 @@
melee_damage_lower = 1
melee_damage_upper = 2
-/mob/living/simple_mob/hostile/blob/spore/Initialize(mapload, var/obj/structure/blob/factory/my_factory)
+/mob/living/simple_mob/hostile/blob/spore/Initialize(mapload, obj/structure/blob/factory/my_factory)
if(istype(my_factory))
factory = my_factory
factory.spores += src
diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm
index 0cc67b3161..d2fb263ac7 100644
--- a/code/modules/blob2/overmind/overmind.dm
+++ b/code/modules/blob2/overmind/overmind.dm
@@ -79,7 +79,7 @@ GLOBAL_LIST_EMPTY(overminds)
. += "Power Stored: [blob_points]/[max_blob_points]"
. += "Total Blobs: [GLOB.all_blobs.len]"
-/mob/observer/blob/Move(var/atom/NewLoc, Dir = 0)
+/mob/observer/blob/Move(atom/NewLoc, Dir = 0)
if(placed)
var/obj/structure/blob/B = (locate() in view("5x5", NewLoc))
if(B)
@@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(overminds)
if(!auto_factory() && !auto_resource())
auto_node()
-/mob/observer/blob/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/observer/blob/say(message, datum/language/speaking = null, whispering = 0)
message = sanitize(message)
if(!message)
diff --git a/code/modules/blob2/overmind/powers.dm b/code/modules/blob2/overmind/powers.dm
index 39cb7c5273..93eb3d13d2 100644
--- a/code/modules/blob2/overmind/powers.dm
+++ b/code/modules/blob2/overmind/powers.dm
@@ -230,7 +230,7 @@
var/turf/T = get_turf(victim)
expand_blob(T)
-/mob/observer/blob/proc/can_attack(var/mob/living/L)
+/mob/observer/blob/proc/can_attack(mob/living/L)
if(!istype(L))
return FALSE
if(L.faction == blob_type.faction)
diff --git a/code/modules/blob2/overmind/types.dm b/code/modules/blob2/overmind/types.dm
index 6b1e62144d..2034a096b8 100644
--- a/code/modules/blob2/overmind/types.dm
+++ b/code/modules/blob2/overmind/types.dm
@@ -53,31 +53,31 @@
var/chunk_passive_ability_cooldown = 5 SECONDS
// Called when a blob receives damage. This needs to return the final damage or blobs will be immortal.
-/datum/blob_type/proc/on_received_damage(var/obj/structure/blob/B, damage, damage_type)
+/datum/blob_type/proc/on_received_damage(obj/structure/blob/B, damage, damage_type)
return damage
// Called when a blob dies due to integrity depletion. Not called if deleted by other means.
-/datum/blob_type/proc/on_death(var/obj/structure/blob/B)
+/datum/blob_type/proc/on_death(obj/structure/blob/B)
return
// Called when a blob expands onto another tile.
-/datum/blob_type/proc/on_expand(var/obj/structure/blob/B, var/obj/structure/blob/new_B, var/turf/T, var/mob/observer/blob/O)
+/datum/blob_type/proc/on_expand(obj/structure/blob/B, obj/structure/blob/new_B, turf/T, mob/observer/blob/O)
return
// Called when blob_act() is called on a living mob.
-/datum/blob_type/proc/on_attack(var/obj/structure/blob/B, var/mob/living/victim, var/def_zone)
+/datum/blob_type/proc/on_attack(obj/structure/blob/B, mob/living/victim, def_zone)
return
// Called when the blob is pulsed by a node or the core.
-/datum/blob_type/proc/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/proc/on_pulse(obj/structure/blob/B)
return
// Called when the core processes.
-/datum/blob_type/proc/on_core_process(var/obj/structure/blob/B)
+/datum/blob_type/proc/on_core_process(obj/structure/blob/B)
return
// Called when a node processes.
-/datum/blob_type/proc/on_node_process(var/obj/structure/blob/B)
+/datum/blob_type/proc/on_node_process(obj/structure/blob/B)
return
// Called when hit by EMP.
@@ -105,7 +105,7 @@
return
// Proc that is unique to the blob type.
-/datum/blob_type/proc/chunk_unique(obj/item/blobcore_chunk/B, var/list/extra_args = null)
+/datum/blob_type/proc/chunk_unique(obj/item/blobcore_chunk/B, list/extra_args = null)
return
// Set up the blob type for the chunk.
diff --git a/code/modules/blob2/overmind/types/blazing_oil.dm b/code/modules/blob2/overmind/types/blazing_oil.dm
index 0f3020fe33..30cfe3e260 100644
--- a/code/modules/blob2/overmind/types/blazing_oil.dm
+++ b/code/modules/blob2/overmind/types/blazing_oil.dm
@@ -24,7 +24,7 @@
spawn(1)
B.adjust_integrity(-(amount * 5))
-/datum/blob_type/blazing_oil/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/blazing_oil/on_pulse(obj/structure/blob/B)
var/turf/T = get_turf(B)
if(!T)
return
diff --git a/code/modules/blob2/overmind/types/cryogenic_goo.dm b/code/modules/blob2/overmind/types/cryogenic_goo.dm
index 56d831db4d..c61cf1f30f 100644
--- a/code/modules/blob2/overmind/types/cryogenic_goo.dm
+++ b/code/modules/blob2/overmind/types/cryogenic_goo.dm
@@ -36,7 +36,7 @@
else // Just do some extra burn for mobs who don't process bodytemp
victim.adjustFireLoss(20)
-/datum/blob_type/cryogenic_goo/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/cryogenic_goo/on_pulse(obj/structure/blob/B)
var/turf/simulated/T = get_turf(B)
if(!istype(T))
return
diff --git a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm
index 45935cdffa..e04bd8a30a 100644
--- a/code/modules/blob2/overmind/types/ectoplasmic_horror.dm
+++ b/code/modules/blob2/overmind/types/ectoplasmic_horror.dm
@@ -25,7 +25,7 @@
var/list/active_beams = list()
-/datum/blob_type/ectoplasmic_horror/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/ectoplasmic_horror/on_pulse(obj/structure/blob/B)
if(B.type == /obj/structure/blob && (locate(/obj/structure/blob/node) in oview(2, get_turf(B))))
B.visible_message(span_alien("The [name] quakes, before hardening."))
new/obj/structure/blob/shield(get_turf(B), B.overmind)
@@ -58,7 +58,7 @@
if(!QDELETED(drain_beam))
qdel(drain_beam)
-/datum/blob_type/ectoplasmic_horror/on_received_damage(var/obj/structure/blob/B, damage, damage_type)
+/datum/blob_type/ectoplasmic_horror/on_received_damage(obj/structure/blob/B, damage, damage_type)
if(prob(round(damage * 0.5)))
B.visible_message(span_alien("\The [B] shimmers, distorting through some unseen dimension."))
var/initial_alpha = B.alpha
diff --git a/code/modules/blob2/overmind/types/fabrication_swarm.dm b/code/modules/blob2/overmind/types/fabrication_swarm.dm
index a9e1b3f3fc..2d98da4365 100644
--- a/code/modules/blob2/overmind/types/fabrication_swarm.dm
+++ b/code/modules/blob2/overmind/types/fabrication_swarm.dm
@@ -22,7 +22,7 @@
ai_aggressiveness = 50 //Really doesn't like you near it.
spore_type = /mob/living/simple_mob/mechanical/hivebot/swarm
-/datum/blob_type/fabrication_swarm/on_received_damage(var/obj/structure/blob/B, damage, damage_type, mob/living/attacker)
+/datum/blob_type/fabrication_swarm/on_received_damage(obj/structure/blob/B, damage, damage_type, mob/living/attacker)
if(istype(B, /obj/structure/blob/normal))
if(damage > 0)
var/reinforce_probability = min(damage, 70)
diff --git a/code/modules/blob2/overmind/types/fulminant_organism.dm b/code/modules/blob2/overmind/types/fulminant_organism.dm
index e95cb47d3b..39904d411e 100644
--- a/code/modules/blob2/overmind/types/fulminant_organism.dm
+++ b/code/modules/blob2/overmind/types/fulminant_organism.dm
@@ -19,7 +19,7 @@
spore_type = /mob/living/simple_mob/blob/spore/weak
chunk_active_ability_cooldown = 60 SECONDS
-/datum/blob_type/fulminant_organism/on_expand(var/obj/structure/blob/B, var/obj/structure/blob/new_B, var/turf/T, var/mob/observer/blob/O)
+/datum/blob_type/fulminant_organism/on_expand(obj/structure/blob/B, obj/structure/blob/new_B, turf/T, mob/observer/blob/O)
if(prob(10)) // 10% chance to make a weak spore when expanding.
var/mob/living/simple_mob/blob/spore/S = new spore_type(T)
if(istype(S))
diff --git a/code/modules/blob2/overmind/types/pressurized_slime.dm b/code/modules/blob2/overmind/types/pressurized_slime.dm
index 5ecba15b56..8ad017367a 100644
--- a/code/modules/blob2/overmind/types/pressurized_slime.dm
+++ b/code/modules/blob2/overmind/types/pressurized_slime.dm
@@ -26,11 +26,11 @@
if(T)
T.wet_floor()
-/datum/blob_type/pressurized_slime/on_received_damage(var/obj/structure/blob/B, damage, damage_type)
+/datum/blob_type/pressurized_slime/on_received_damage(obj/structure/blob/B, damage, damage_type)
wet_surroundings(B, damage)
return ..()
-/datum/blob_type/pressurized_slime/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/pressurized_slime/on_pulse(obj/structure/blob/B)
var/turf/simulated/T = get_turf(B)
if(!istype(T))
return
@@ -40,7 +40,7 @@
B.visible_message(span_danger("The blob ruptures, spraying the area with liquid!"))
wet_surroundings(B, 50)
-/datum/blob_type/pressurized_slime/proc/wet_surroundings(var/obj/structure/blob/B, var/probability = 50)
+/datum/blob_type/pressurized_slime/proc/wet_surroundings(obj/structure/blob/B, probability = 50)
for(var/turf/simulated/T in range(1, get_turf(B)))
if(prob(probability))
T.wet_floor()
diff --git a/code/modules/blob2/overmind/types/radioactive_ooze.dm b/code/modules/blob2/overmind/types/radioactive_ooze.dm
index 6ea00ca048..1dd1937bc3 100644
--- a/code/modules/blob2/overmind/types/radioactive_ooze.dm
+++ b/code/modules/blob2/overmind/types/radioactive_ooze.dm
@@ -20,7 +20,7 @@
attack_message_synth = ", and your internal systems are bombarded by ionizing radiation"
attack_verb = "splashes"
-/datum/blob_type/radioactive_ooze/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/radioactive_ooze/on_pulse(obj/structure/blob/B)
radiation_pulse(
src,
max_range = 5,
diff --git a/code/modules/blob2/overmind/types/ravenous_macrophage.dm b/code/modules/blob2/overmind/types/ravenous_macrophage.dm
index ca6b22a907..2f6097af0e 100644
--- a/code/modules/blob2/overmind/types/ravenous_macrophage.dm
+++ b/code/modules/blob2/overmind/types/ravenous_macrophage.dm
@@ -21,7 +21,7 @@
attack_message_synth = ", and your body begins to corrode"
attack_verb = "splashes"
-/datum/blob_type/ravenous_macrophage/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/ravenous_macrophage/on_pulse(obj/structure/blob/B)
var/mob/living/L = locate() in range(world.view, B)
if(L && prob(1) && L.mind && !L.stat) // There's some active living thing nearby, produce offgas.
var/turf/T = get_turf(B)
diff --git a/code/modules/blob2/overmind/types/reactive_spines.dm b/code/modules/blob2/overmind/types/reactive_spines.dm
index 93d730104f..6a6a9daad8 100644
--- a/code/modules/blob2/overmind/types/reactive_spines.dm
+++ b/code/modules/blob2/overmind/types/reactive_spines.dm
@@ -24,7 +24,7 @@
spore_projectile = /obj/item/projectile/bullet/thorn
// Even if the melee attack is enough to one-shot this blob, it gets to retaliate at least once.
-/datum/blob_type/reactive_spines/on_received_damage(var/obj/structure/blob/B, damage, damage_type, mob/living/attacker)
+/datum/blob_type/reactive_spines/on_received_damage(obj/structure/blob/B, damage, damage_type, mob/living/attacker)
if(damage > 0 && attacker && get_dist(B, attacker) <= 1)
B.visible_message(span_danger("The [name] retaliates, lashing out at \the [attacker]!"))
B.blob_attack_animation(attacker, B.overmind)
@@ -32,7 +32,7 @@
return ..()
// We're expecting 1 to be a target, 2 to be an old move loc, and 3 to be a new move loc.
-/datum/blob_type/reactive_spines/chunk_unique(obj/item/blobcore_chunk/B, var/list/extra_data = null)
+/datum/blob_type/reactive_spines/chunk_unique(obj/item/blobcore_chunk/B, list/extra_data = null)
if(!LAZYLEN(extra_data))
return
diff --git a/code/modules/blob2/overmind/types/roiling_mold.dm b/code/modules/blob2/overmind/types/roiling_mold.dm
index 6747ae91fe..3148450d14 100644
--- a/code/modules/blob2/overmind/types/roiling_mold.dm
+++ b/code/modules/blob2/overmind/types/roiling_mold.dm
@@ -23,7 +23,7 @@
spore_projectile = /obj/item/projectile/arc/spore
factory_type = /obj/structure/blob/factory/turret
-/datum/blob_type/roiling_mold/proc/find_target(var/obj/structure/blob/B, var/tries = 0, var/list/previous_targets = null)
+/datum/blob_type/roiling_mold/proc/find_target(obj/structure/blob/B, tries = 0, list/previous_targets = null)
if(tries > 3)
return
var/mob/living/L = locate() in (view(world.view + 3, get_turf(B)) - view(2,get_turf(B)) - previous_targets) // No adjacent mobs.
@@ -38,7 +38,7 @@
return L
-/datum/blob_type/roiling_mold/on_pulse(var/obj/structure/blob/B)
+/datum/blob_type/roiling_mold/on_pulse(obj/structure/blob/B)
var/mob/living/L = find_target(B)
if(!istype(L))
diff --git a/code/modules/blob2/overmind/types/shifting_fragments.dm b/code/modules/blob2/overmind/types/shifting_fragments.dm
index b149ae15db..250895e80c 100644
--- a/code/modules/blob2/overmind/types/shifting_fragments.dm
+++ b/code/modules/blob2/overmind/types/shifting_fragments.dm
@@ -17,7 +17,7 @@
attack_message = "A fragment strikes you"
attack_verb = "strikes"
-/datum/blob_type/shifting_fragments/on_received_damage(var/obj/structure/blob/B, damage, damage_type)
+/datum/blob_type/shifting_fragments/on_received_damage(obj/structure/blob/B, damage, damage_type)
if(damage > 0 && prob(60))
var/list/available_blobs = list()
for(var/obj/structure/blob/OB in orange(1, B))
@@ -30,7 +30,7 @@
B.forceMove(T) // Swap places.
return ..()
-/datum/blob_type/shifting_fragments/on_expand(var/obj/structure/blob/B, var/obj/structure/blob/new_B, var/turf/T, var/mob/observer/blob/O)
+/datum/blob_type/shifting_fragments/on_expand(obj/structure/blob/B, obj/structure/blob/new_B, turf/T, mob/observer/blob/O)
if(istype(B, /obj/structure/blob/normal) || (istype(B, /obj/structure/blob/shield) && prob(25)))
new_B.forceMove(get_turf(B))
B.forceMove(T)
diff --git a/code/modules/blob2/overmind/types/synchronous_mesh.dm b/code/modules/blob2/overmind/types/synchronous_mesh.dm
index 738703de56..3f5f1b31e8 100644
--- a/code/modules/blob2/overmind/types/synchronous_mesh.dm
+++ b/code/modules/blob2/overmind/types/synchronous_mesh.dm
@@ -28,7 +28,7 @@
victim.blob_act(C)
synchronously_attacking = FALSE
-/datum/blob_type/synchronous_mesh/on_received_damage(var/obj/structure/blob/B, damage, damage_type)
+/datum/blob_type/synchronous_mesh/on_received_damage(obj/structure/blob/B, damage, damage_type)
var/list/blobs_to_hurt = list() // Maximum split is 9, reducing the damage each blob takes to 11.1% but doing that damage to 9 blobs.
for(var/obj/structure/blob/C in range(1, B))
if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && (C.overmind == B.overmind) ) //if it doesn't have the same 'ownership' or is a core or node, don't split damage to it
diff --git a/code/modules/blob2/overmind/types/volatile_alluvium.dm b/code/modules/blob2/overmind/types/volatile_alluvium.dm
index 40c4f98cc2..1f51c4ad82 100644
--- a/code/modules/blob2/overmind/types/volatile_alluvium.dm
+++ b/code/modules/blob2/overmind/types/volatile_alluvium.dm
@@ -28,7 +28,7 @@
resource_type = /obj/structure/blob/resource/sluggish
chunk_active_ability_cooldown = 2 MINUTES
-/datum/blob_type/volatile_alluvium/on_received_damage(var/obj/structure/blob/B, damage, damage_type, mob/living/attacker)
+/datum/blob_type/volatile_alluvium/on_received_damage(obj/structure/blob/B, damage, damage_type, mob/living/attacker)
if(damage > 0 && attacker && get_dist(B, attacker) <= 2 && prob(min(damage, 70)) && ishuman(attacker)) // Melee weapons of any type carried by a human will have a high chance of being stolen.
var/mob/living/carbon/human/H = attacker
var/obj/item/I = H.get_active_hand()
diff --git a/code/modules/busy_space/atc_chatter.dm b/code/modules/busy_space/atc_chatter.dm
index a37916660b..599a27c2ab 100644
--- a/code/modules/busy_space/atc_chatter.dm
+++ b/code/modules/busy_space/atc_chatter.dm
@@ -41,7 +41,7 @@
VAR_PROTECTED/short_second_name = ""
VAR_PROTECTED/mission_noun = ""
-/datum/atc_chatter/New(var/datum/lore/organization/source, var/datum/lore/organization/secondary)
+/datum/atc_chatter/New(datum/lore/organization/source, datum/lore/organization/secondary)
if(source && secondary) // Evac shuttle atc passes nothing in and only uses map datum for names!
/////////////////////////////////////////////////////////////////////
// Get the docking bay or zone in space the ships are passing into
@@ -133,7 +133,7 @@
// calls acknowledge at each message phase until final, where it qdel(src)
return
-/datum/atc_chatter/proc/next(var/multiplier = 1,var/pr_ref = null)
+/datum/atc_chatter/proc/next(multiplier = 1,pr_ref = null)
SHOULD_NOT_OVERRIDE(TRUE)
PROTECTED_PROC(TRUE)
if(!pr_ref) // don't advance the section unless we actually call squak(), otherwise it's a submessage override
diff --git a/code/modules/busy_space/atc_chatter_type.dm b/code/modules/busy_space/atc_chatter_type.dm
index bd1585e892..9d10deb210 100644
--- a/code/modules/busy_space/atc_chatter_type.dm
+++ b/code/modules/busy_space/atc_chatter_type.dm
@@ -1,5 +1,5 @@
// Override/Replace me downstream if you need different chatter, call parent at end if you want this dialog too! Returns a subtype path of /datum/atc_chatter!
-/datum/atc_chatter_type/proc/chatter_box(var/org_type,var/org_type2)
+/datum/atc_chatter_type/proc/chatter_box(org_type,org_type2)
if((org_type == "government" || org_type == "neutral" || org_type == "military" || org_type == "corporate" || org_type == "system defense" || org_type == "spacer") && org_type2 == "pirate") //this is ugly but when I tried to do it with !='s it fired for pirate-v-pirate, still not sure why. might as well stick it up here so it takes priority over other combos.
return /datum/atc_chatter/distress
if(org_type == "corporate") //corporate-specific subset for the slogan event. despite the relatively high weight it was still quite rare in tests.
diff --git a/code/modules/casino/board_games/checkers.dm b/code/modules/casino/board_games/checkers.dm
index 5c9bdcd520..3ef4f13c9e 100644
--- a/code/modules/casino/board_games/checkers.dm
+++ b/code/modules/casino/board_games/checkers.dm
@@ -385,7 +385,7 @@
return TRUE
return FALSE
-/datum/board_game/checkers/proc/add_jumps(var/list/directions, start_x, start_y, list/jump_moves, list/visited = list())
+/datum/board_game/checkers/proc/add_jumps(list/directions, start_x, start_y, list/jump_moves, list/visited = list())
var/piece = current_board[start_y][start_x]
if(!piece)
return
diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm
index c218c27df0..0d5e08dec5 100644
--- a/code/modules/casino/casino.dm
+++ b/code/modules/casino/casino.dm
@@ -243,7 +243,7 @@
. += " with [trapped.name] trapped within"
return
-/obj/item/roulette_ball/hollow/attackby(var/obj/item/W, var/mob/user)
+/obj/item/roulette_ball/hollow/attackby(obj/item/W, mob/user)
if(trapped)
to_chat(user, span_notice("This ball already has something trapped in it!"))
return
@@ -482,7 +482,7 @@
var/obj/item/spacecasinocash/C = W
insert_chip(C, user)
-/obj/machinery/wheel_of_fortune/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user)
+/obj/machinery/wheel_of_fortune/proc/insert_chip(obj/item/spacecasinocash/cashmoney, mob/user)
if (busy)
to_chat(user,span_notice("The Wheel of Fortune is busy, wait for it to be done to buy a lottery ticket."))
return
@@ -503,7 +503,7 @@
lottery_tickets += "Number.[lottery_entries] [user.name]"
lottery_tickets_ckeys += user.client.ckey
-/obj/machinery/wheel_of_fortune/proc/spin_the_wheel(var/mode)
+/obj/machinery/wheel_of_fortune/proc/spin_the_wheel(mode)
var/result = 0
if(mode == "not_lottery")
@@ -749,7 +749,7 @@
if("Change Prize Value")
setprice(user)
-/obj/machinery/casinosentientprize_handler/proc/do_item_tf(mob/living/sentient_prize, var/target_item_name)
+/obj/machinery/casinosentientprize_handler/proc/do_item_tf(mob/living/sentient_prize, target_item_name)
var/item_type = GLOB.item_tf_options[target_item_name]
var/obj/item/newitem = new item_type(null) // Starts off in nullspace while we customize!
var/item_color = newitem.color
@@ -778,7 +778,7 @@
sentient_prize.tf_into(newitem, TRUE, item_name)
return newitem
-/obj/machinery/casinosentientprize_handler/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user, var/buystate)
+/obj/machinery/casinosentientprize_handler/proc/insert_chip(obj/item/spacecasinocash/cashmoney, mob/user, buystate)
if(cashmoney.worth < casinosentientprize_price)
to_chat(user,span_notice("You dont have enough chips to pay for the sentient prize!"))
return
diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm
index 0c82daa245..ad437153ab 100644
--- a/code/modules/casino/casino_prize_vendor.dm
+++ b/code/modules/casino/casino_prize_vendor.dm
@@ -262,7 +262,7 @@
return
..()
-/obj/machinery/casino_prize_dispenser/proc/pay_with_chips(var/obj/item/spacecasinocash/cashmoney, mob/user, var/price)
+/obj/machinery/casino_prize_dispenser/proc/pay_with_chips(obj/item/spacecasinocash/cashmoney, mob/user, price)
//"cashmoney_:[cashmoney] user:[user] currently_vending:[currently_vending]"
if(price > cashmoney.worth)
to_chat(user, "[icon2html(cashmoney, user.client)] " + span_warning("That is not enough chips."))
@@ -396,7 +396,7 @@
log[++log.len] = prize_log
//Currently doesnt have an ingame way to show. Can only be viewed through View-Variables, to ensure theres no chance of players ckeys exposed - Jack
-/obj/machinery/casino_prize_dispenser/proc/speak(var/message)
+/obj/machinery/casino_prize_dispenser/proc/speak(message)
if(stat & NOPOWER)
return
diff --git a/code/modules/casino/slots.dm b/code/modules/casino/slots.dm
index 02bd5d3590..582edce352 100644
--- a/code/modules/casino/slots.dm
+++ b/code/modules/casino/slots.dm
@@ -98,7 +98,7 @@
else if(isbroken)
return
-/obj/machinery/slot_machine/proc/insert_chip(var/obj/item/spacecasinocash/cashmoney, mob/user)
+/obj/machinery/slot_machine/proc/insert_chip(obj/item/spacecasinocash/cashmoney, mob/user)
if (ispowered == 0)
return
if (isbroken)
@@ -329,7 +329,7 @@
else if(isbroken)
return
-/obj/machinery/station_slot_machine/proc/insert_cash(var/obj/item/spacecash/cashmoney, mob/user)
+/obj/machinery/station_slot_machine/proc/insert_cash(obj/item/spacecash/cashmoney, mob/user)
if (ispowered == 0)
return
if (isbroken)
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 13f2e5edf6..3ab2926a09 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -715,7 +715,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
ip_reputation = score
return TRUE
-/client/proc/disconnect_with_message(var/message = "You have been intentionally disconnected by the server.
This may be for security or administrative reasons.")
+/client/proc/disconnect_with_message(message = "You have been intentionally disconnected by the server.
This may be for security or administrative reasons.")
message = "You Have Been Disconnected
" + span_bold("[message]") + "
If you feel this is in error, you can contact an administrator out-of-game (for example, on Discord)."
window_flash(src)
src << browse("[message]","window=dropmessage;size=480x360;can_close=1")
diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm
index 491ca9030a..8e29458572 100644
--- a/code/modules/client/preference_setup/general/01_basic.dm
+++ b/code/modules/client/preference_setup/general/01_basic.dm
@@ -6,7 +6,7 @@
var/vore_egg_type = "Egg" //The egg type they have.
var/autohiss = "Full" // VOREStation Add: Whether we have Autohiss on. I'm hijacking the egg panel bc this one has a shitton of unused space.
-/datum/preferences/proc/set_biological_gender(var/gender)
+/datum/preferences/proc/set_biological_gender(gender)
update_preference_by_type(/datum/preference/choiced/gender/biological, gender)
update_preference_by_type(/datum/preference/choiced/gender/identifying, gender)
@@ -27,7 +27,7 @@
pref.autohiss = sanitize_inlist(pref.autohiss, list("Off", "Basic", "Full"), initial(pref.autohiss))
// Moved from /datum/preferences/proc/copy_to()
-/datum/category_item/player_setup_item/general/basic/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/basic/copy_to_mob(mob/living/carbon/human/character)
var/char_real_name = pref.read_preference(/datum/preference/name/real_name)
var/char_bio_gender = pref.read_preference(/datum/preference/choiced/gender/biological)
var/char_id_gender = pref.read_preference(/datum/preference/choiced/gender/identifying)
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index e70c1d38b3..b1b049638e 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -48,7 +48,7 @@
if(tail_style && !(tail_style in get_available_styles(GLOB.tail_styles_list)))
tail_style = null
-/datum/preferences/proc/get_available_styles(var/style_list)
+/datum/preferences/proc/get_available_styles(style_list)
. = list("Normal" = null)
var/pref_species = read_preference(/datum/preference/choiced/species)
for(var/path in style_list)
@@ -65,7 +65,7 @@
continue
.[instance.name] = instance
-/datum/preferences/proc/mass_edit_marking_list(var/marking, var/change_on = TRUE, var/change_color = TRUE, var/marking_value = null, var/on = TRUE, var/color = "#000000")
+/datum/preferences/proc/mass_edit_marking_list(marking, change_on = TRUE, change_color = TRUE, marking_value = null, on = TRUE, color = "#000000")
var/datum/sprite_accessory/marking/mark_datum = GLOB.body_marking_styles_list[marking]
var/list/new_marking = marking_value||mark_datum.body_parts
for (var/NM in new_marking)
@@ -150,7 +150,7 @@
pref.sanitize_body_styles()
// Moved from /datum/preferences/proc/copy_to()
-/datum/category_item/player_setup_item/general/body/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/body/copy_to_mob(mob/living/carbon/human/character)
// Copy basic values
character.h_style = pref.h_style
character.f_style = pref.f_style
@@ -239,7 +239,7 @@
O.markings[M] = list("color" = pref.body_markings[M][BP]["color"], "datum" = mark_datum, "priority" = priority, "on" = pref.body_markings[M][BP]["on"])
character.markings_len = priority
-/datum/category_item/player_setup_item/general/body/proc/has_flag(var/datum/species/mob_species, var/flag)
+/datum/category_item/player_setup_item/general/body/proc/has_flag(datum/species/mob_species, flag)
return mob_species && (mob_species.appearance_flags & flag)
/datum/category_item/player_setup_item/general/body/proc/reset_limbs()
diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm
index 409b5f0ba7..66b0ff0e21 100644
--- a/code/modules/client/preference_setup/general/06_flavor.dm
+++ b/code/modules/client/preference_setup/general/06_flavor.dm
@@ -38,7 +38,7 @@
return
// Moved from /datum/preferences/proc/copy_to()
-/datum/category_item/player_setup_item/general/flavor/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/flavor/copy_to_mob(mob/living/carbon/human/character)
character.flavor_texts["general"] = pref.flavor_texts["general"]
character.flavor_texts["head"] = pref.flavor_texts["head"]
character.flavor_texts["face"] = pref.flavor_texts["face"]
@@ -81,7 +81,7 @@
log_admin("[user]/[user.ckey] set their custom link to [pref.custom_link]")
// README: This must stay for SetFlavorText to work!
-/datum/category_item/player_setup_item/general/flavor/OnTopic(var/href,var/list/href_list, var/mob/user)
+/datum/category_item/player_setup_item/general/flavor/OnTopic(href,list/href_list, mob/user)
if(href_list["flavor_text"])
switch(href_list["flavor_text"])
if("open")
diff --git a/code/modules/client/preference_setup/general/07_antagonism.dm b/code/modules/client/preference_setup/general/07_antagonism.dm
index cb05db0036..69160b178d 100644
--- a/code/modules/client/preference_setup/general/07_antagonism.dm
+++ b/code/modules/client/preference_setup/general/07_antagonism.dm
@@ -30,7 +30,7 @@
if(!pref.antag_vis) pref.antag_vis = "Hidden"
// Moved from /datum/preferences/proc/copy_to()
-/datum/category_item/player_setup_item/general/basic_antagonism/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/basic_antagonism/copy_to_mob(mob/living/carbon/human/character)
character.exploit_record = pref.exploit_record
character.antag_faction = pref.antag_faction
character.antag_vis = pref.antag_vis
diff --git a/code/modules/client/preference_setup/general/09_size.dm b/code/modules/client/preference_setup/general/09_size.dm
index ead12d734d..ea476f8adc 100644
--- a/code/modules/client/preference_setup/general/09_size.dm
+++ b/code/modules/client/preference_setup/general/09_size.dm
@@ -65,7 +65,7 @@
if(!(pref.species_sound))
pref.species_sound = "Unset"
-/datum/category_item/player_setup_item/general/size/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/size/copy_to_mob(mob/living/carbon/human/character)
character.weight = pref.weight_vr
character.weight_gain = pref.weight_gain
character.weight_loss = pref.weight_loss
diff --git a/code/modules/client/preference_setup/general/11_misc.dm b/code/modules/client/preference_setup/general/11_misc.dm
index 0119c5f682..e2e78aeea5 100644
--- a/code/modules/client/preference_setup/general/11_misc.dm
+++ b/code/modules/client/preference_setup/general/11_misc.dm
@@ -72,7 +72,7 @@
save_data["custom_heat"] = check_list_copy(pref.custom_heat)
save_data["custom_cold"] = check_list_copy(pref.custom_cold)
-/datum/category_item/player_setup_item/general/vore_misc/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/vore_misc/copy_to_mob(mob/living/carbon/human/character)
character.custom_species = pref.custom_species
character.custom_say = lowertext(trim(pref.custom_say))
diff --git a/code/modules/client/preference_setup/general/12_traits.dm b/code/modules/client/preference_setup/general/12_traits.dm
index 6db74d4310..bb226a7fd7 100644
--- a/code/modules/client/preference_setup/general/12_traits.dm
+++ b/code/modules/client/preference_setup/general/12_traits.dm
@@ -16,7 +16,7 @@
var/dirty_synth = 0 //Are you a synth
var/gross_meatbag = 0 //Where'd I leave my Voight-Kampff test kit?
-/datum/preferences/proc/get_custom_bases_for_species(var/new_species)
+/datum/preferences/proc/get_custom_bases_for_species(new_species)
if (!new_species)
new_species = read_preference(/datum/preference/choiced/species)
var/list/choices
@@ -33,7 +33,7 @@
choices = choices.Copy()
return choices
-/datum/category_item/player_setup_item/general/traits/proc/get_pref_choice_from_trait(var/mob/user, var/datum/trait/trait, var/preference)
+/datum/category_item/player_setup_item/general/traits/proc/get_pref_choice_from_trait(mob/user, datum/trait/trait, preference)
if (!trait || !preference)
return
var/list/trait_prefs
@@ -170,7 +170,7 @@
pref.custom_base = selected_species.default_custom_base
-/datum/category_item/player_setup_item/general/traits/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/traits/copy_to_mob(mob/living/carbon/human/character)
if(character.isSynthetic()) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1
pref.gross_meatbag = 0
diff --git a/code/modules/client/preference_setup/general/13_nif.dm b/code/modules/client/preference_setup/general/13_nif.dm
index d4ed4d4442..bacec76b5a 100644
--- a/code/modules/client/preference_setup/general/13_nif.dm
+++ b/code/modules/client/preference_setup/general/13_nif.dm
@@ -52,7 +52,7 @@
if(!islist(pref.nif_savedata))
pref.nif_savedata = list()
-/datum/category_item/player_setup_item/general/nif/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/nif/copy_to_mob(mob/living/carbon/human/character)
//If you had a NIF...
if(istype(character) && ispath(pref.nif_path) && pref.nif_durability && !ismannequin(character))
new pref.nif_path(character, pref.nif_durability, pref.nif_savedata)
diff --git a/code/modules/client/preference_setup/loadout/01_equipment.dm b/code/modules/client/preference_setup/loadout/01_equipment.dm
index 8891c8d4fa..9a261d6e7e 100644
--- a/code/modules/client/preference_setup/loadout/01_equipment.dm
+++ b/code/modules/client/preference_setup/loadout/01_equipment.dm
@@ -34,7 +34,7 @@
save_data["no_jacket"] = pref.no_jacket
// Moved from /datum/preferences/proc/copy_to()
-/datum/category_item/player_setup_item/loadout/equipment/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/loadout/equipment/copy_to_mob(mob/living/carbon/human/character)
character.all_underwear.Cut()
character.all_underwear_metadata.Cut()
@@ -138,7 +138,7 @@
return data
-/datum/category_item/player_setup_item/loadout/equipment/proc/get_metadata(var/underwear_category, var/datum/gear_tweak/gt)
+/datum/category_item/player_setup_item/loadout/equipment/proc/get_metadata(underwear_category, datum/gear_tweak/gt)
var/metadata = pref.all_underwear_metadata[underwear_category]
if(!metadata)
metadata = list()
@@ -150,7 +150,7 @@
metadata["[gt]"] = tweak_data
return tweak_data
-/datum/category_item/player_setup_item/loadout/equipment/proc/set_metadata(var/underwear_category, var/datum/gear_tweak/gt, var/new_metadata)
+/datum/category_item/player_setup_item/loadout/equipment/proc/set_metadata(underwear_category, datum/gear_tweak/gt, new_metadata)
var/list/metadata = pref.all_underwear_metadata[underwear_category]
metadata["[gt]"] = new_metadata
diff --git a/code/modules/client/preference_setup/loadout/02_loadout.dm b/code/modules/client/preference_setup/loadout/02_loadout.dm
index b9d86167e5..1cf9848b3d 100644
--- a/code/modules/client/preference_setup/loadout/02_loadout.dm
+++ b/code/modules/client/preference_setup/loadout/02_loadout.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
var/category = ""
var/list/gear = list()
-/datum/loadout_category/New(var/cat)
+/datum/loadout_category/New(cat)
category = cat
..()
@@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
return data
-/datum/category_item/player_setup_item/loadout/loadout/proc/get_gear_metadata(var/datum/gear/G)
+/datum/category_item/player_setup_item/loadout/loadout/proc/get_gear_metadata(datum/gear/G)
var/list/active_gear_list = LAZYACCESS(pref.gear_list, "[pref.gear_slot]")
// {"/datum/gear_tweak/custom_name": "" }
@@ -166,14 +166,14 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
if(!.)
. = list()
-/datum/category_item/player_setup_item/loadout/loadout/proc/get_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak)
+/datum/category_item/player_setup_item/loadout/loadout/proc/get_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak)
var/list/metadata = get_gear_metadata(G)
. = metadata["[tweak]"]
if(isnull(.))
. = tweak.get_default()
metadata["[tweak]"] = .
-/datum/category_item/player_setup_item/loadout/loadout/proc/set_tweak_metadata(var/datum/gear/G, var/datum/gear_tweak/tweak, var/new_metadata)
+/datum/category_item/player_setup_item/loadout/loadout/proc/set_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak, new_metadata)
var/list/metadata = get_gear_metadata(G)
metadata["[tweak]"] = new_metadata
@@ -281,11 +281,11 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums, /datum/gear)
var/path
var/location
-/datum/gear_data/New(var/path, var/location)
+/datum/gear_data/New(path, location)
src.path = path
src.location = location
-/datum/gear/proc/spawn_item(var/location, var/metadata)
+/datum/gear/proc/spawn_item(location, metadata)
var/datum/gear_data/gd = new(path, location)
if(length(gear_tweaks) && metadata)
for(var/datum/gear_tweak/gt in gear_tweaks)
diff --git a/code/modules/client/preference_setup/loadout/gear_tweaks.dm b/code/modules/client/preference_setup/loadout/gear_tweaks.dm
index 7d10a0784f..a0e64479a8 100644
--- a/code/modules/client/preference_setup/loadout/gear_tweaks.dm
+++ b/code/modules/client/preference_setup/loadout/gear_tweaks.dm
@@ -1,18 +1,18 @@
#define LOADOUT_BAN_STRING "Custom loadout"
-/datum/gear_tweak/proc/get_contents(var/metadata)
+/datum/gear_tweak/proc/get_contents(metadata)
return
-/datum/gear_tweak/proc/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/proc/get_metadata(user, metadata)
return
/datum/gear_tweak/proc/get_default()
return
-/datum/gear_tweak/proc/tweak_gear_data(var/metadata, var/datum/gear_data)
+/datum/gear_tweak/proc/tweak_gear_data(metadata, datum/gear_data)
return
-/datum/gear_tweak/proc/tweak_item(var/obj/item/I, var/metadata)
+/datum/gear_tweak/proc/tweak_item(obj/item/I, metadata)
return
/*
@@ -22,22 +22,22 @@
/datum/gear_tweak/color
var/list/valid_colors
-/datum/gear_tweak/color/New(var/list/valid_colors)
+/datum/gear_tweak/color/New(list/valid_colors)
src.valid_colors = valid_colors
..()
-/datum/gear_tweak/color/get_contents(var/metadata)
+/datum/gear_tweak/color/get_contents(metadata)
return "Color: ⬤"
/datum/gear_tweak/color/get_default()
return valid_colors ? valid_colors[1] : COLOR_GRAY
-/datum/gear_tweak/color/get_metadata(var/user, var/metadata, var/title = "Character Preference")
+/datum/gear_tweak/color/get_metadata(user, metadata, title = "Character Preference")
if(valid_colors)
return tgui_input_list(user, "Choose a color.", title, valid_colors, metadata)
return tgui_color_picker(user, "Choose a color.", title, metadata)
-/datum/gear_tweak/color/tweak_item(var/obj/item/I, var/metadata)
+/datum/gear_tweak/color/tweak_item(obj/item/I, metadata)
if(valid_colors && !(metadata in valid_colors))
return
if(!metadata || (metadata == "#ffffff"))
@@ -51,7 +51,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
/datum/gear_tweak/matrix_recolor
-/datum/gear_tweak/matrix_recolor/get_contents(var/metadata)
+/datum/gear_tweak/matrix_recolor/get_contents(metadata)
if(islist(metadata) && length(metadata))
return "Matrix Recolor: [english_list(metadata)]"
return "Matrix Recolor"
@@ -93,20 +93,20 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
/datum/gear_tweak/path
var/list/valid_paths
-/datum/gear_tweak/path/New(var/list/valid_paths)
+/datum/gear_tweak/path/New(list/valid_paths)
src.valid_paths = valid_paths
..()
-/datum/gear_tweak/path/get_contents(var/metadata)
+/datum/gear_tweak/path/get_contents(metadata)
return "Type: [metadata]"
/datum/gear_tweak/path/get_default()
return valid_paths[1]
-/datum/gear_tweak/path/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/path/get_metadata(user, metadata)
return tgui_input_list(user, "Choose a type.", "Character Preference", valid_paths, metadata)
-/datum/gear_tweak/path/tweak_gear_data(var/metadata, var/datum/gear_data/gear_data)
+/datum/gear_tweak/path/tweak_gear_data(metadata, datum/gear_data/gear_data)
if(!(metadata in valid_paths))
return
gear_data.path = valid_paths[metadata]
@@ -122,7 +122,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
valid_contents = args.Copy()
..()
-/datum/gear_tweak/contents/get_contents(var/metadata)
+/datum/gear_tweak/contents/get_contents(metadata)
return "Contents: [english_list(metadata, and_text = ", ")]"
/datum/gear_tweak/contents/get_default()
@@ -130,7 +130,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
for(var/i = 1 to valid_contents.len)
. += "Random"
-/datum/gear_tweak/contents/get_metadata(var/user, var/list/metadata)
+/datum/gear_tweak/contents/get_metadata(user, list/metadata)
. = list()
for(var/i = metadata.len to valid_contents.len)
metadata += "Random"
@@ -141,7 +141,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
else
return metadata
-/datum/gear_tweak/contents/tweak_item(var/obj/item/I, var/list/metadata)
+/datum/gear_tweak/contents/tweak_item(obj/item/I, list/metadata)
if(metadata.len != valid_contents.len)
return
for(var/i = 1 to valid_contents.len)
@@ -168,22 +168,22 @@ GLOBAL_DATUM_INIT(gear_tweak_free_matrix_recolor, /datum/gear_tweak/matrix_recol
/datum/gear_tweak/reagents
var/list/valid_reagents
-/datum/gear_tweak/reagents/New(var/list/reagents)
+/datum/gear_tweak/reagents/New(list/reagents)
valid_reagents = reagents.Copy()
..()
-/datum/gear_tweak/reagents/get_contents(var/metadata)
+/datum/gear_tweak/reagents/get_contents(metadata)
return "Reagents: [metadata]"
/datum/gear_tweak/reagents/get_default()
return "Random"
-/datum/gear_tweak/reagents/get_metadata(var/user, var/list/metadata)
+/datum/gear_tweak/reagents/get_metadata(user, list/metadata)
. = tgui_input_list(user, "Choose an entry.", "Character Preference", valid_reagents + list("Random", "None"), metadata)
if(!.)
return metadata
-/datum/gear_tweak/reagents/tweak_item(var/obj/item/I, var/list/metadata)
+/datum/gear_tweak/reagents/tweak_item(obj/item/I, list/metadata)
if(metadata == "None")
return
if(metadata == "Random")
@@ -205,17 +205,17 @@ GLOBAL_DATUM_INIT(gear_tweak_free_name, /datum/gear_tweak/custom_name, new)
/datum/gear_tweak/custom_name
var/list/valid_custom_names
-/datum/gear_tweak/custom_name/New(var/list/valid_custom_names)
+/datum/gear_tweak/custom_name/New(list/valid_custom_names)
src.valid_custom_names = valid_custom_names
..()
-/datum/gear_tweak/custom_name/get_contents(var/metadata)
+/datum/gear_tweak/custom_name/get_contents(metadata)
return "Name: [metadata]"
/datum/gear_tweak/custom_name/get_default()
return ""
-/datum/gear_tweak/custom_name/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/custom_name/get_metadata(user, metadata)
if(jobban_isbanned(user, LOADOUT_BAN_STRING))
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
@@ -229,7 +229,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_name, /datum/gear_tweak/custom_name, new)
return metadata
return san_input ? san_input : get_default()
-/datum/gear_tweak/custom_name/tweak_item(var/obj/item/I, var/metadata)
+/datum/gear_tweak/custom_name/tweak_item(obj/item/I, metadata)
if(!metadata)
return I.name
I.name = metadata
@@ -242,17 +242,17 @@ GLOBAL_DATUM_INIT(gear_tweak_free_desc, /datum/gear_tweak/custom_desc, new)
/datum/gear_tweak/custom_desc
var/list/valid_custom_desc
-/datum/gear_tweak/custom_desc/New(var/list/valid_custom_desc)
+/datum/gear_tweak/custom_desc/New(list/valid_custom_desc)
src.valid_custom_desc = valid_custom_desc
..()
-/datum/gear_tweak/custom_desc/get_contents(var/metadata)
+/datum/gear_tweak/custom_desc/get_contents(metadata)
return "Description: [metadata]"
/datum/gear_tweak/custom_desc/get_default()
return ""
-/datum/gear_tweak/custom_desc/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/custom_desc/get_metadata(user, metadata)
if(jobban_isbanned(user, LOADOUT_BAN_STRING))
to_chat(user, span_warning("You are banned from using custom loadout names/descriptions."))
return
@@ -266,7 +266,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_desc, /datum/gear_tweak/custom_desc, new)
return metadata
return san_input ? san_input : get_default()
-/datum/gear_tweak/custom_desc/tweak_item(var/obj/item/I, var/metadata)
+/datum/gear_tweak/custom_desc/tweak_item(obj/item/I, metadata)
if(!metadata)
return I.desc
I.desc = metadata
@@ -279,13 +279,13 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/toggle_digestable
-/datum/gear_tweak/toggle_digestable/get_contents(var/metadata)
+/datum/gear_tweak/toggle_digestable/get_contents(metadata)
return "Digestable: [metadata ? "Yes" : "No"]"
/datum/gear_tweak/toggle_digestable/get_default()
return TRUE
-/datum/gear_tweak/toggle_digestable/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/toggle_digestable/get_metadata(user, metadata)
var/san_input = tgui_alert(user, "Turn digestable on or off", "Toggle Digestable", list("Enable", "Disable", "Cancel"))
switch(san_input)
if("Enable")
@@ -294,7 +294,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
return FALSE
return metadata
-/datum/gear_tweak/toggle_digestable/tweak_item(var/obj/item/I, var/metadata)
+/datum/gear_tweak/toggle_digestable/tweak_item(obj/item/I, metadata)
if(isnull(metadata))
return I.digestable
I.digestable = metadata
@@ -310,7 +310,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot)
var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link)
-/datum/gear_tweak/tablet/get_contents(var/list/metadata)
+/datum/gear_tweak/tablet/get_contents(list/metadata)
var/list/names = list()
var/obj/O = ValidProcessors[metadata[1]]
if(O)
@@ -335,7 +335,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
names += initial(O.name)
return "[english_list(names, and_text = ", ")]"
-/datum/gear_tweak/tablet/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/tablet/get_metadata(user, metadata)
. = list()
var/list/names = list()
@@ -425,7 +425,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/tablet/get_default()
return list(1, 1, 1, 1, 1, 1, 1)
-/datum/gear_tweak/tablet/tweak_item(var/obj/item/modular_computer/tablet/I, var/list/metadata)
+/datum/gear_tweak/tablet/tweak_item(obj/item/modular_computer/tablet/I, list/metadata)
if(ValidProcessors[metadata[1]])
var/t = ValidProcessors[metadata[1]]
I.processor_unit = new t(I)
@@ -459,7 +459,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
var/list/ValidCardSlots = list(null, /obj/item/computer_hardware/card_slot)
var/list/ValidTeslaLinks = list(null, /obj/item/computer_hardware/tesla_link)
-/datum/gear_tweak/laptop/get_contents(var/list/metadata)
+/datum/gear_tweak/laptop/get_contents(list/metadata)
var/list/names = list()
var/obj/O = ValidProcessors[metadata[1]]
if(O)
@@ -484,7 +484,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
names += initial(O.name)
return "[english_list(names, and_text = ", ")]"
-/datum/gear_tweak/laptop/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/laptop/get_metadata(user, metadata)
. = list()
var/list/names = list()
@@ -574,7 +574,7 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/laptop/get_default()
return list(1, 1, 1, 1, 1, 1, 1)
-/datum/gear_tweak/laptop/tweak_item(var/obj/item/modular_computer/laptop/preset/I, var/list/metadata)
+/datum/gear_tweak/laptop/tweak_item(obj/item/modular_computer/laptop/preset/I, list/metadata)
if(ValidProcessors[metadata[1]])
var/t = ValidProcessors[metadata[1]]
I.processor_unit = new t(I)
@@ -630,32 +630,32 @@ GLOBAL_DATUM_INIT(gear_tweak_free_digestable, /datum/gear_tweak/toggle_digestabl
/datum/gear_tweak/implant_location/get_default()
return bodypart_names_to_tokens[1]
-/datum/gear_tweak/implant_location/tweak_item(var/obj/item/implant/I, var/metadata)
+/datum/gear_tweak/implant_location/tweak_item(obj/item/implant/I, metadata)
if(istype(I))
I.initialize_loc = bodypart_names_to_tokens[metadata] || BP_TORSO
-/datum/gear_tweak/implant_location/get_contents(var/metadata)
+/datum/gear_tweak/implant_location/get_contents(metadata)
return "Location: [metadata]"
-/datum/gear_tweak/implant_location/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/implant_location/get_metadata(user, metadata)
var/list_input = tgui_input_list(user, "Select a bodypart for the implant to be implanted inside.", "Implant Location", bodypart_names_to_tokens || bodypart_tokens_to_names[BP_TORSO])
if(isnull(list_input))
return metadata
return list_input
-/datum/gear_tweak/collar_tag/get_contents(var/metadata)
+/datum/gear_tweak/collar_tag/get_contents(metadata)
return "Tag: [metadata]"
/datum/gear_tweak/collar_tag/get_default()
return ""
-/datum/gear_tweak/collar_tag/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/collar_tag/get_metadata(user, metadata)
var/text_input = tgui_input_text(user, "Choose the tag text.", "Character Preference", metadata, MAX_NAME_LEN)
if(isnull(text_input))
return metadata
return text_input
-/datum/gear_tweak/collar_tag/tweak_item(var/obj/item/clothing/accessory/collar/C, var/metadata)
+/datum/gear_tweak/collar_tag/tweak_item(obj/item/clothing/accessory/collar/C, metadata)
if(metadata == "")
return ..()
else
diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
index 5c702d7c32..07b69f4232 100644
--- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
@@ -29,7 +29,7 @@
// can't set description, it'll look funny
gear_tweaks = list(GLOB.gear_tweak_free_color_choice, GLOB.gear_tweak_free_name)
-/datum/gear/cosmetic/nailpolish/spawn_item(var/location, var/metadata)
+/datum/gear/cosmetic/nailpolish/spawn_item(location, metadata)
var/obj/item/nailpolish/polish = ..()
polish.set_colour(polish.color)
polish.color = null
diff --git a/code/modules/client/preference_setup/loadout/loadout_item_tf.dm b/code/modules/client/preference_setup/loadout/loadout_item_tf.dm
index b2ddbc1b3e..6a03fc8c17 100644
--- a/code/modules/client/preference_setup/loadout/loadout_item_tf.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_item_tf.dm
@@ -2,7 +2,7 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
/datum/gear_tweak/item_tf_spawn
-/datum/gear_tweak/item_tf_spawn/get_contents(var/metadata)
+/datum/gear_tweak/item_tf_spawn/get_contents(metadata)
if(!islist(metadata) || metadata["state"] == "Not Enabled")
return "Item TF spawnpoint: Not Enabled"
else if(metadata["state"] == "Anyone")
@@ -15,7 +15,7 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
.["state"] = "Not Enabled"
.["valid"] = list()
-/datum/gear_tweak/item_tf_spawn/get_metadata(var/user, var/list/metadata)
+/datum/gear_tweak/item_tf_spawn/get_metadata(user, list/metadata)
. = get_default()
metadata = islist(metadata) ? metadata : .
var/entry = tgui_input_list(user, "Choose an entry.", "Character Preference", list("Not Enabled", "Anyone", "Only Specific Players"), metadata["state"])
@@ -29,7 +29,7 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
else
return metadata
-/datum/gear_tweak/item_tf_spawn/tweak_item(var/obj/item/I, var/metadata)
+/datum/gear_tweak/item_tf_spawn/tweak_item(obj/item/I, metadata)
if(!islist(metadata))
return
if(metadata["state"] == "Not Enabled")
@@ -43,20 +43,20 @@ GLOBAL_DATUM_INIT(gear_tweak_item_tf_spawn, /datum/gear_tweak/item_tf_spawn, new
/datum/gear_tweak/simplemob_picker
var/list/simplemob_list
-/datum/gear_tweak/simplemob_picker/New(var/list/valid_simplemobs)
+/datum/gear_tweak/simplemob_picker/New(list/valid_simplemobs)
src.simplemob_list = valid_simplemobs
..()
-/datum/gear_tweak/simplemob_picker/get_contents(var/metadata)
+/datum/gear_tweak/simplemob_picker/get_contents(metadata)
return "Type: [metadata]"
/datum/gear_tweak/simplemob_picker/get_default()
return simplemob_list[1]
-/datum/gear_tweak/simplemob_picker/get_metadata(var/user, var/metadata)
+/datum/gear_tweak/simplemob_picker/get_metadata(user, metadata)
return tgui_input_list(user, "Choose a type.", "Character Preference", simplemob_list, metadata)
-/datum/gear_tweak/simplemob_picker/tweak_item(var/obj/item/capture_crystal/I, var/metadata)
+/datum/gear_tweak/simplemob_picker/tweak_item(obj/item/capture_crystal/I, metadata)
if(!(metadata in simplemob_list))
return
if(!istype(I))
diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm
index a59d10949a..a195e76b3b 100644
--- a/code/modules/client/preference_setup/preference_setup.dm
+++ b/code/modules/client/preference_setup/preference_setup.dm
@@ -37,7 +37,7 @@
var/datum/preferences/preferences
var/datum/category_group/player_setup_category/selected_category = null
-/datum/category_collection/player_setup_collection/New(var/datum/preferences/preferences)
+/datum/category_collection/player_setup_collection/New(datum/preferences/preferences)
src.preferences = preferences
..()
selected_category = categories[1]
@@ -67,7 +67,7 @@
for(var/datum/category_group/player_setup_category/PS in categories)
PS.save_preferences(savefile)
-/datum/category_collection/player_setup_collection/proc/copy_to_mob(var/mob/living/carbon/human/C)
+/datum/category_collection/player_setup_collection/proc/copy_to_mob(mob/living/carbon/human/C)
for(var/datum/category_group/player_setup_category/PS in categories)
PS.copy_to_mob(C)
@@ -81,7 +81,7 @@
dat += "Game Options"
return dat
-/datum/category_collection/player_setup_collection/Topic(var/href,var/list/href_list)
+/datum/category_collection/player_setup_collection/Topic(href,list/href_list)
if(..())
return 1
var/mob/user = usr
@@ -139,7 +139,7 @@
for(var/datum/category_item/player_setup_item/PI in items)
PI.save_preferences(savefile)
-/datum/category_group/player_setup_category/proc/copy_to_mob(var/mob/living/carbon/human/C)
+/datum/category_group/player_setup_category/proc/copy_to_mob(mob/living/carbon/human/C)
for(var/datum/category_item/player_setup_item/PI in items)
PI.copy_to_mob(C)
@@ -189,7 +189,7 @@
/*
* Called when the item is asked to apply its per character settings to a new mob.
*/
-/datum/category_item/player_setup_item/proc/copy_to_mob(var/mob/living/carbon/human/C)
+/datum/category_item/player_setup_item/proc/copy_to_mob(mob/living/carbon/human/C)
return
/datum/category_item/player_setup_item/proc/sanitize_character()
@@ -198,7 +198,7 @@
/datum/category_item/player_setup_item/proc/sanitize_preferences()
return
-/datum/category_item/player_setup_item/Topic(var/href,var/list/href_list)
+/datum/category_item/player_setup_item/Topic(href,list/href_list)
if(..())
return 1
var/mob/pref_mob = preference_mob()
@@ -215,10 +215,10 @@
if(. & TOPIC_REFRESH)
pref_mob.client.prefs.ShowChoices(usr)
-/datum/category_item/player_setup_item/CanUseTopic(var/mob/user)
+/datum/category_item/player_setup_item/CanUseTopic(mob/user)
return 1
-/datum/category_item/player_setup_item/proc/OnTopic(var/href,var/list/href_list, var/mob/user)
+/datum/category_item/player_setup_item/proc/OnTopic(href,list/href_list, mob/user)
return TOPIC_NOACTION
/datum/category_item/player_setup_item/proc/preference_mob()
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 9eb6e977c1..bc2610641e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -161,7 +161,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
update_tgui_static_data(user)
tgui_interact(user)
-/datum/preferences/proc/update_character_previews(var/mob/living/carbon/human/mannequin)
+/datum/preferences/proc/update_character_previews(mob/living/carbon/human/mannequin)
if(!client)
return
@@ -378,7 +378,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
user.client?.prefs_vr.load_vore()
ShowChoices(user)
-/datum/preferences/proc/vanity_copy_to(var/mob/living/carbon/human/character, var/copy_name, var/copy_flavour = TRUE, var/copy_ooc_notes = FALSE, var/convert_to_prosthetics = FALSE, var/apply_bloodtype = TRUE)
+/datum/preferences/proc/vanity_copy_to(mob/living/carbon/human/character, copy_name, copy_flavour = TRUE, copy_ooc_notes = FALSE, convert_to_prosthetics = FALSE, apply_bloodtype = TRUE)
//snowflake copy_to, does not copy anything but the vanity things
//does not check if the name is the same, do that in any proc that calls this proc
/*
diff --git a/code/modules/client/preferences/types/character/background.dm b/code/modules/client/preferences/types/character/background.dm
index 2d80c36aee..99d4aa7845 100644
--- a/code/modules/client/preferences/types/character/background.dm
+++ b/code/modules/client/preferences/types/character/background.dm
@@ -123,7 +123,7 @@
/datum/category_item/player_setup_item/general/background/sanitize_character()
return
-/datum/category_item/player_setup_item/general/background/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/background/copy_to_mob(mob/living/carbon/human/character)
return
/datum/category_item/player_setup_item/general/background/tgui_data(mob/user)
diff --git a/code/modules/client/preferences/types/character/occupation.dm b/code/modules/client/preferences/types/character/occupation.dm
index 5ef0f5a0ea..99b2609eb8 100644
--- a/code/modules/client/preferences/types/character/occupation.dm
+++ b/code/modules/client/preferences/types/character/occupation.dm
@@ -480,7 +480,7 @@
pref.write_preference_by_type(/datum/preference/numeric/human/job_other_high, 0) //CHOMPStation Add
// Level is equal to the desired new level of the job. So for a value of 4, we want to disable the job.
-/datum/category_item/player_setup_item/occupation/proc/SetJobDepartment(var/datum/job/job, var/level)
+/datum/category_item/player_setup_item/occupation/proc/SetJobDepartment(datum/job/job, level)
if(!job || !level)
return 0
@@ -557,7 +557,7 @@
var/list/alt_titles = read_preference(/datum/preference/player_alt_titles)
return (islist(alt_titles) && (job.title in alt_titles)) ? alt_titles[job.title] : job.title
-/datum/preferences/proc/GetJobDepartment(var/datum/job/job, var/level)
+/datum/preferences/proc/GetJobDepartment(datum/job/job, level)
if(!job || !level) return 0
switch(job.department_flag)
if(CIVILIAN)
diff --git a/code/modules/client/preferences/types/character/records.dm b/code/modules/client/preferences/types/character/records.dm
index 65e2d87434..d8e03bd835 100644
--- a/code/modules/client/preferences/types/character/records.dm
+++ b/code/modules/client/preferences/types/character/records.dm
@@ -44,7 +44,7 @@
/datum/category_item/player_setup_item/general/records/sanitize_character()
return
-/datum/category_item/player_setup_item/general/records/copy_to_mob(var/mob/living/carbon/human/character)
+/datum/category_item/player_setup_item/general/records/copy_to_mob(mob/living/carbon/human/character)
return
/datum/category_item/player_setup_item/general/records/tgui_data(mob/user)
diff --git a/code/modules/client/record_updater.dm b/code/modules/client/record_updater.dm
index ce5b1895d5..e113a0ab8f 100644
--- a/code/modules/client/record_updater.dm
+++ b/code/modules/client/record_updater.dm
@@ -1,7 +1,7 @@
GLOBAL_VAR_INIT(client_record_update_lock, FALSE)
// Manually updating records from medical console to a player's save.
-/proc/get_current_mob_from_record(var/datum/data/record/active)
+/proc/get_current_mob_from_record(datum/data/record/active)
var/datum/transcore_db/db = SStranscore.db_by_mind_name(active.fields["name"])
if(db)
var/datum/transhuman/mind_record/record = db.backed_up[active.fields["name"]]
@@ -15,7 +15,7 @@ GLOBAL_VAR_INIT(client_record_update_lock, FALSE)
return null
-/proc/client_update_record(var/obj/machinery/computer/COM, var/user)
+/proc/client_update_record(obj/machinery/computer/COM, user)
if(!COM || QDELETED(COM))
return "Invalid console"
diff --git a/code/modules/client/spam_prevention.dm b/code/modules/client/spam_prevention.dm
index 6cdab34798..8531661691 100644
--- a/code/modules/client/spam_prevention.dm
+++ b/code/modules/client/spam_prevention.dm
@@ -3,7 +3,7 @@
var/last_message_time = 0
var/spam_alert = 0
-/client/proc/handle_spam_prevention(var/mute_type = MUTE_ALL, var/spam_delay = 0.5 SECONDS)
+/client/proc/handle_spam_prevention(mute_type = MUTE_ALL, spam_delay = 0.5 SECONDS)
if(world.time - last_message_time < spam_delay)
spam_alert++
if(spam_alert > 5)
diff --git a/code/modules/client/verbs/ignore.dm b/code/modules/client/verbs/ignore.dm
index ac1461ff64..124c47bb7a 100644
--- a/code/modules/client/verbs/ignore.dm
+++ b/code/modules/client/verbs/ignore.dm
@@ -42,12 +42,12 @@
prefs.write_preference_by_type(/datum/preference/ignored_players, ignored_players)
to_chat(usr, span_notice("Reverted ignore on [key_to_unignore]."))
-/mob/proc/is_key_ignored(var/key_to_check)
+/mob/proc/is_key_ignored(key_to_check)
if(client)
return client.is_key_ignored(key_to_check)
return 0
-/client/proc/is_key_ignored(var/key_to_check)
+/client/proc/is_key_ignored(key_to_check)
key_to_check = ckey(key_to_check)
var/list/ignored_players = prefs?.read_preference(/datum/preference/ignored_players)
if(key_to_check in ignored_players)
diff --git a/code/modules/clothing/accessories/accessory.dm b/code/modules/clothing/accessories/accessory.dm
index 84b51d8240..ab1116fa28 100644
--- a/code/modules/clothing/accessories/accessory.dm
+++ b/code/modules/clothing/accessories/accessory.dm
@@ -82,7 +82,7 @@
return mob_overlay
//when user attached an accessory to S
-/obj/item/clothing/accessory/proc/on_attached(var/obj/item/clothing/S, var/mob/user)
+/obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/S, mob/user)
if(!istype(S))
return
has_suit = S
@@ -98,7 +98,7 @@
to_chat(user, span_notice("You attach \the [src] to \the [has_suit]."))
add_fingerprint(user)
-/obj/item/clothing/accessory/proc/on_removed(var/mob/user)
+/obj/item/clothing/accessory/proc/on_removed(mob/user)
if(!has_suit)
return
has_suit.cut_overlay(get_inv_overlay())
diff --git a/code/modules/clothing/accessories/accessory_vr.dm b/code/modules/clothing/accessories/accessory_vr.dm
index 5a815fcf90..8a661aa1c1 100644
--- a/code/modules/clothing/accessories/accessory_vr.dm
+++ b/code/modules/clothing/accessories/accessory_vr.dm
@@ -29,7 +29,7 @@
icon_override = sprite_sheets[H.species.get_bodytype(H)]
update_clothing_icon()
-/obj/item/clothing/accessory/choker/on_attached(var/obj/item/clothing/S, var/mob/user)
+/obj/item/clothing/accessory/choker/on_attached(obj/item/clothing/S, mob/user)
if(!istype(S))
return
has_suit = S
@@ -67,7 +67,7 @@
icon_override = sprite_sheets[H.species.get_bodytype(H)]
update_clothing_icon()
-/obj/item/clothing/accessory/collar/on_attached(var/obj/item/clothing/S, var/mob/user)
+/obj/item/clothing/accessory/collar/on_attached(obj/item/clothing/S, mob/user)
if(!istype(S))
return
has_suit = S
@@ -87,7 +87,7 @@
..()
setUniqueSpeciesSprite()
-/obj/item/clothing/accessory/collar/on_attached(var/obj/item/clothing/S, var/mob/user)
+/obj/item/clothing/accessory/collar/on_attached(obj/item/clothing/S, mob/user)
if(!istype(S))
return
has_suit = S
@@ -286,7 +286,7 @@
/obj/item/clothing/accessory/collar/holo/indigestible
desc = "A special variety of the holo-collar that seems to be made of a very durable fabric that fits around the neck."
//Make indigestible
-/obj/item/clothing/accessory/collar/holo/indigestible/digest_act(var/atom/movable/item_storage = null)
+/obj/item/clothing/accessory/collar/holo/indigestible/digest_act(atom/movable/item_storage = null)
return FALSE
/obj/item/clothing/accessory/collar/attack_self(mob/user)
@@ -313,12 +313,12 @@
to_chat(user,span_notice("You set the [name]'s tag to '[str]'."))
initialize_tag(str)
-/obj/item/clothing/accessory/collar/proc/initialize_tag(var/tag)
+/obj/item/clothing/accessory/collar/proc/initialize_tag(tag)
name = initial(name) + " ([tag])"
desc = initial(desc) + " \"[tag]\" has been engraved on the tag."
writtenon = 1
-/obj/item/clothing/accessory/collar/holo/initialize_tag(var/tag)
+/obj/item/clothing/accessory/collar/holo/initialize_tag(tag)
..()
desc = initial(desc) + " The tag says \"[tag]\"."
@@ -336,7 +336,7 @@
to_chat(user,span_notice("You need a pen or a screwdriver to edit the tag on this collar."))
-/obj/item/clothing/accessory/collar/proc/update_collartag(mob/user, obj/item/I, var/erasemethod, var/erasing, var/writemethod)
+/obj/item/clothing/accessory/collar/proc/update_collartag(mob/user, obj/item/I, erasemethod, erasing, writemethod)
if(!(istype(user.get_active_hand(),I)) || !(istype(user.get_inactive_hand(),src)) || (user.stat))
return
@@ -437,10 +437,10 @@
s.start()
return
-/obj/item/clothing/accessory/collar/shock/bluespace/relaymove(var/mob/living/user,var/direction)
+/obj/item/clothing/accessory/collar/shock/bluespace/relaymove(mob/living/user,direction)
return //For some reason equipping this item was triggering this proc, putting the wearer inside of the collars belly for some reason.
-/obj/item/clothing/accessory/collar/shock/bluespace/attackby(var/obj/item/component, mob/user as mob)
+/obj/item/clothing/accessory/collar/shock/bluespace/attackby(obj/item/component, mob/user as mob)
if (component.has_tool_quality(TOOL_WRENCH))
to_chat(user, span_notice("You crack the bluespace crystal [src]."))
var/turf/T = get_turf(src)
@@ -471,7 +471,7 @@
target_size = 1
on = 1
-/obj/item/clothing/accessory/collar/shock/bluespace/modified/attackby(var/obj/item/component, mob/user as mob)
+/obj/item/clothing/accessory/collar/shock/bluespace/modified/attackby(obj/item/component, mob/user as mob)
if (component.has_tool_quality(TOOL_WRENCH))
to_chat(user, span_notice("You crack the bluespace crystal [src], the attached signaler disconnects."))
var/turf/T = get_turf(src)
@@ -550,7 +550,7 @@
on = 1
var/currently_shrinking = 0
-/obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning/attackby(var/obj/item/component, mob/user as mob)
+/obj/item/clothing/accessory/collar/shock/bluespace/malfunctioning/attackby(obj/item/component, mob/user as mob)
if (!istype(component,/obj/item/assembly/signaler))
..()
return
diff --git a/code/modules/clothing/accessories/armor.dm b/code/modules/clothing/accessories/armor.dm
index f0f186bc42..4eec0d7a64 100644
--- a/code/modules/clothing/accessories/armor.dm
+++ b/code/modules/clothing/accessories/armor.dm
@@ -10,7 +10,7 @@
icon_state = "pouches"
w_class = ITEMSIZE_NORMAL
-/obj/item/clothing/accessory/armor/on_attached(var/obj/item/clothing/S, var/mob/user)
+/obj/item/clothing/accessory/armor/on_attached(obj/item/clothing/S, mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.wear_suit == S)
@@ -153,7 +153,7 @@
armor = list(melee = 10, bullet = 10, laser = 70, energy = 50, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.1
-/obj/item/clothing/accessory/armor/armorplate/ablative/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/accessory/armor/armorplate/ablative/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(istype(damage_source, /obj/item/projectile/energy) || istype(damage_source, /obj/item/projectile/beam))
var/obj/item/projectile/P = damage_source
diff --git a/code/modules/clothing/accessories/badges.dm b/code/modules/clothing/accessories/badges.dm
index 2e01faaed2..0405ab73c6 100644
--- a/code/modules/clothing/accessories/badges.dm
+++ b/code/modules/clothing/accessories/badges.dm
@@ -20,11 +20,11 @@
var/fluff_badge = FALSE
var/holo = FALSE
-/obj/item/clothing/accessory/badge/proc/set_name(var/new_name)
+/obj/item/clothing/accessory/badge/proc/set_name(new_name)
stored_name = new_name
name = "[initial(name)] ([stored_name])"
-/obj/item/clothing/accessory/badge/proc/set_desc(var/mob/living/carbon/human/H)
+/obj/item/clothing/accessory/badge/proc/set_desc(mob/living/carbon/human/H)
/obj/item/clothing/accessory/badge/attack_self(mob/user)
. = ..(user)
@@ -104,7 +104,7 @@
icon_state = "holobadge-cord"
slot_flags = SLOT_MASK | SLOT_TIE | SLOT_BELT
-/obj/item/clothing/accessory/badge/holo/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/clothing/accessory/badge/holo/emag_act(remaining_charges, mob/user)
if (emagged)
to_chat(user, span_danger("\The [src] is already cracked."))
return
@@ -113,7 +113,7 @@
to_chat(user, span_danger("You crack the holobadge security checks."))
return 1
-/obj/item/clothing/accessory/badge/holo/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/clothing/accessory/badge/holo/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/card/id) || istype(O, /obj/item/pda))
var/obj/item/card/id/id_card = null
diff --git a/code/modules/clothing/accessories/badges_vr.dm b/code/modules/clothing/accessories/badges_vr.dm
index 940eabcedb..46ff5da6e7 100644
--- a/code/modules/clothing/accessories/badges_vr.dm
+++ b/code/modules/clothing/accessories/badges_vr.dm
@@ -68,7 +68,7 @@
update_state(2)
desc = "This seems like a dosimeter, but the film has turned black."
-/obj/item/clothing/accessory/dosimeter/proc/update_state(var/tostate)
+/obj/item/clothing/accessory/dosimeter/proc/update_state(tostate)
if(current_film)
current_film.state = tostate
icon_state = "[initial(icon_state)][tostate]"
@@ -85,7 +85,7 @@
icon_state = "dosimeter_film0"
var/state = 0 //0 - White, 1 - Darker, 2 - Black (same as iconstates)
-/obj/item/dosimeter_film/proc/update_state(var/tostate)
+/obj/item/dosimeter_film/proc/update_state(tostate)
icon_state = tostate
update_icon()
diff --git a/code/modules/clothing/accessories/hands.dm b/code/modules/clothing/accessories/hands.dm
index a15a441da0..04cac8e0ac 100644
--- a/code/modules/clothing/accessories/hands.dm
+++ b/code/modules/clothing/accessories/hands.dm
@@ -54,7 +54,7 @@
material_slowdown_multiplier = 0
slowdown = 0
-/obj/item/clothing/accessory/bracelet/material/Initialize(mapload, var/new_material)
+/obj/item/clothing/accessory/bracelet/material/Initialize(mapload, new_material)
. = ..()
if(!new_material)
new_material = MAT_STEEL
diff --git a/code/modules/clothing/accessories/holster.dm b/code/modules/clothing/accessories/holster.dm
index 358e798c01..4fa875e392 100644
--- a/code/modules/clothing/accessories/holster.dm
+++ b/code/modules/clothing/accessories/holster.dm
@@ -10,7 +10,7 @@
var/holster_out = 'sound/items/holsterout.ogg'
w_class = ITEMSIZE_NORMAL
-/obj/item/clothing/accessory/holster/proc/holster(var/obj/item/I, var/mob/living/user)
+/obj/item/clothing/accessory/holster/proc/holster(obj/item/I, mob/living/user)
if(holstered && istype(user))
to_chat(user, span_warning("There is already \a [holstered] holstered here!"))
return
diff --git a/code/modules/clothing/accessories/holster_vr.dm b/code/modules/clothing/accessories/holster_vr.dm
index 4cebfdda02..4862e71521 100644
--- a/code/modules/clothing/accessories/holster_vr.dm
+++ b/code/modules/clothing/accessories/holster_vr.dm
@@ -51,13 +51,13 @@
else
overlay_state = initial(overlay_state)
-/obj/item/clothing/accessory/holster/machete/rapier/holster(var/obj/item/I, var/mob/living/user)
+/obj/item/clothing/accessory/holster/machete/rapier/holster(obj/item/I, mob/living/user)
..()
occupied()
if(has_suit)
has_suit.update_clothing_icon()
-/obj/item/clothing/accessory/holster/machete/rapier/unholster(var/obj/item/I, var/mob/living/user)
+/obj/item/clothing/accessory/holster/machete/rapier/unholster(obj/item/I, mob/living/user)
..()
occupied()
if(has_suit)
diff --git a/code/modules/clothing/accessories/lockets.dm b/code/modules/clothing/accessories/lockets.dm
index 28344f3195..9770637599 100644
--- a/code/modules/clothing/accessories/lockets.dm
+++ b/code/modules/clothing/accessories/lockets.dm
@@ -34,7 +34,7 @@
else
icon_state = "[base_icon]"
-/obj/item/clothing/accessory/locket/attackby(var/obj/item/O, mob/user)
+/obj/item/clothing/accessory/locket/attackby(obj/item/O, mob/user)
if(!open)
to_chat(user, "You have to open it first.")
return
diff --git a/code/modules/clothing/accessories/permits.dm b/code/modules/clothing/accessories/permits.dm
index 59f33fef4d..f090431ddf 100644
--- a/code/modules/clothing/accessories/permits.dm
+++ b/code/modules/clothing/accessories/permits.dm
@@ -21,13 +21,13 @@
else
to_chat(user, "[src] already has an owner!")
-/obj/item/clothing/accessory/permit/proc/set_name(var/new_name)
+/obj/item/clothing/accessory/permit/proc/set_name(new_name)
owner = 1
if(new_name)
src.name += " ([new_name])"
desc += " It belongs to [new_name]."
-/obj/item/clothing/accessory/permit/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/clothing/accessory/permit/emag_act(remaining_charges, mob/user)
to_chat(user, "You reset the naming locks on [src]!")
owner = 0
diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm
index cf77fc2324..c44115ad37 100644
--- a/code/modules/clothing/accessories/rings.dm
+++ b/code/modules/clothing/accessories/rings.dm
@@ -56,7 +56,7 @@
. = ..()
create_reagents(15)
-/obj/item/clothing/accessory/ring/reagent/equipped(var/mob/living/carbon/human/H)
+/obj/item/clothing/accessory/ring/reagent/equipped(mob/living/carbon/human/H)
..()
if(istype(H) && H.gloves==src)
@@ -113,7 +113,7 @@
change_name(user)
nameset = TRUE
-/obj/item/clothing/accessory/ring/seal/signet/proc/change_name(var/signet_name = "Unknown")
+/obj/item/clothing/accessory/ring/seal/signet/proc/change_name(signet_name = "Unknown")
name = "[signet_name]'s signet ring"
desc = "A signet ring belonging to [signet_name], for when you're too sophisticated to sign letters."
@@ -149,7 +149,7 @@
icon_state = "material"
material_slowdown_multiplier = 0 //it's a ring, it's never gonna be heavy enough to matter
-/obj/item/clothing/accessory/ring/material/Initialize(mapload, var/new_material)
+/obj/item/clothing/accessory/ring/material/Initialize(mapload, new_material)
. = ..()
if(!new_material)
new_material = MAT_STEEL
diff --git a/code/modules/clothing/accessories/torch.dm b/code/modules/clothing/accessories/torch.dm
index 845410859f..62754aebd7 100644
--- a/code/modules/clothing/accessories/torch.dm
+++ b/code/modules/clothing/accessories/torch.dm
@@ -220,7 +220,7 @@ badges
set_name(H.real_name)
set_desc(H)
-/obj/item/clothing/accessory/badge/solgov/tags/set_desc(var/mob/living/carbon/human/H)
+/obj/item/clothing/accessory/badge/solgov/tags/set_desc(mob/living/carbon/human/H)
if(!istype(H))
return
var/religion = "Unset"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index c5c14c10e4..b83753f247 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -2,7 +2,7 @@
//**Cham Jumpsuit**
//*****************
-/obj/item/proc/disguise(var/newtype)
+/obj/item/proc/disguise(newtype)
//this is necessary, unfortunately, as initial() does not play well with list vars
var/obj/item/copy = new newtype(null) //so that it is GCed once we exit
@@ -20,7 +20,7 @@
return copy //for inheritance
-/proc/generate_chameleon_choices(var/basetype, var/blacklist=list())
+/proc/generate_chameleon_choices(basetype, blacklist=list())
. = list()
var/i = 1 //in case there is a collision with both name AND icon_state
@@ -468,7 +468,7 @@
M.update_inv_r_hand()
M.update_inv_l_hand()
-/obj/item/gun/energy/chameleon/disguise(var/newtype)
+/obj/item/gun/energy/chameleon/disguise(newtype)
var/obj/item/gun/copy = ..()
flags_inv = copy.flags_inv
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 54cc2c9983..0d20c16e62 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -54,7 +54,7 @@
add_blood()
. = ..()
-/obj/item/clothing/equipped(var/mob/user,var/slot)
+/obj/item/clothing/equipped(mob/user,slot)
..()
if(enables_planes)
user.recalculate_vis()
@@ -112,7 +112,7 @@
return FALSE
return TRUE
-/obj/item/clothing/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
. = ..()
if((. == 0) && LAZYLEN(accessories))
for(var/obj/item/I in accessories)
@@ -123,7 +123,7 @@
break
// For now, these two temp procs only return TRUE or FALSE if they can provide resistance to a given temperature.
-/obj/item/clothing/proc/handle_low_temperature(var/tempcheck = T20C)
+/obj/item/clothing/proc/handle_low_temperature(tempcheck = T20C)
. = FALSE
if(LAZYLEN(accessories))
for(var/obj/item/clothing/C in accessories)
@@ -133,7 +133,7 @@
if(min_cold_protection_temperature && min_cold_protection_temperature <= tempcheck)
. = TRUE
-/obj/item/clothing/proc/handle_high_temperature(var/tempcheck = T20C)
+/obj/item/clothing/proc/handle_high_temperature(tempcheck = T20C)
. = FALSE
if(LAZYLEN(accessories))
for(var/obj/item/clothing/C in accessories)
@@ -158,7 +158,7 @@
for(var/obj/item/clothing/C in accessories)
. |= C.get_heat_protection_flags()
-/obj/item/clothing/proc/refit_for_species(var/target_species)
+/obj/item/clothing/proc/refit_for_species(target_species)
if(!species_restricted)
return //this item doesn't use the species_restricted system
@@ -257,7 +257,7 @@
var/mob/M = src.loc
M.update_inv_ears()
-/obj/item/clothing/ears/MouseDrop(var/obj/over_object)
+/obj/item/clothing/ears/MouseDrop(obj/over_object)
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
// If this covers both ears, we want to return the result of unequipping the primary object, and kill the off-ear one
@@ -352,7 +352,7 @@
M.update_inv_gloves()
// Called just before an attack_hand(), in mob/UnarmedAttack()
-/obj/item/clothing/gloves/proc/Touch(var/atom/A, var/proximity)
+/obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
return 0 // return 1 to cancel attack_hand()
/*/obj/item/clothing/gloves/attackby(obj/item/W, mob/user)
@@ -514,7 +514,7 @@
update_flashlight(user)
to_chat(user, "You [light_on ? "enable" : "disable"] the helmet light.")
-/obj/item/clothing/head/proc/update_flashlight(var/mob/user = null)
+/obj/item/clothing/head/proc/update_flashlight(mob/user = null)
set_light_on(!light_on)
if(light_system == STATIC_LIGHT)
@@ -523,15 +523,15 @@
update_icon(user)
user.update_mob_action_buttons()
-/obj/item/clothing/head/attack_ai(var/mob/user)
+/obj/item/clothing/head/attack_ai(mob/user)
if(!mob_wear_hat(user))
return ..()
-/obj/item/clothing/head/attack_generic(var/mob/user)
+/obj/item/clothing/head/attack_generic(mob/user)
if(!mob_wear_hat(user))
return ..()
-/obj/item/clothing/head/proc/mob_wear_hat(var/mob/user)
+/obj/item/clothing/head/proc/mob_wear_hat(mob/user)
if(!Adjacent(user))
return 0
var/success
@@ -558,7 +558,7 @@
to_chat(user, span_notice("You crawl under \the [src]."))
return 1
-/obj/item/clothing/head/update_icon(var/mob/user)
+/obj/item/clothing/head/update_icon(mob/user)
var/mob/living/carbon/human/H
if(ishuman(user))
H = user
@@ -732,13 +732,13 @@
update_icon()
return
-/obj/item/clothing/shoes/attack_hand(var/mob/living/M)
+/obj/item/clothing/shoes/attack_hand(mob/living/M)
if(can_hold_knife == 1 && holding && src.loc == M)
draw_knife(M)
return
..()
-/obj/item/clothing/shoes/attackby(var/obj/item/I, var/mob/user)
+/obj/item/clothing/shoes/attackby(obj/item/I, mob/user)
if((can_hold_knife == 1) && (istype(I, /obj/item/material/shard) || \
istype(I, /obj/item/material/butterfly) || \
istype(I, /obj/item/material/kitchen/utensil) || \
@@ -784,7 +784,7 @@
track_blood = 0
update_icon()
-/obj/item/clothing/shoes/proc/handle_movement(var/turf/walking, var/running, var/mob/living/carbon/human/pred)
+/obj/item/clothing/shoes/proc/handle_movement(turf/walking, running, mob/living/carbon/human/pred)
if(!recent_squish && istype(pred))
recent_squish = 1
VARSET_IN(src, recent_squish, FALSE, 4 SECONDS) // Reset the recent squish timer
@@ -797,7 +797,7 @@
return
//In shoe steppies!
-/obj/item/clothing/shoes/proc/handle_inshoe_stepping(var/mob/living/carbon/human/pred, var/mob/living/carbon/human/prey)
+/obj/item/clothing/shoes/proc/handle_inshoe_stepping(mob/living/carbon/human/pred, mob/living/carbon/human/prey)
if(!istype(pred)) return //Sorry, inshoe steppies only for carbon/human/ for now. Based on the regular stepping mechanics
if(!istype(prey)) return
if(!pred.canmove || pred.buckled) return //We can't be stepping on anyone if buckled or incapable of moving
@@ -1060,7 +1060,7 @@
var/mob/M = src.loc
M.update_inv_wear_suit()
-/obj/item/clothing/suit/equipped(var/mob/user, var/slot)
+/obj/item/clothing/suit/equipped(mob/user, slot)
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/taurtail = istaurtail(H.tail_style)
@@ -1069,7 +1069,7 @@
return ..()
-/obj/item/clothing/suit/proc/taurize(var/mob/living/carbon/human/taur, has_taur_tail = FALSE)
+/obj/item/clothing/suit/proc/taurize(mob/living/carbon/human/taur, has_taur_tail = FALSE)
if(has_taur_tail)
var/datum/sprite_accessory/tail/taur/taurtail = taur.tail_style
if(taurtail.suit_sprites && (icon_exists(taurtail.suit_sprites, get_worn_icon_state(slot_wear_suit_str))))
@@ -1086,14 +1086,14 @@
taurized = FALSE
// Taur suits need to be shifted so its centered on their taur half.
-/obj/item/clothing/suit/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask)
+/obj/item/clothing/suit/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer = 0,icon/clip_mask)
var/image/standing = ..()
if(taurized) //Special snowflake var on suits
standing.pixel_x = -16
standing.layer = BODY_LAYER + TAIL_UPPER_LAYER + 1
return standing
-/obj/item/clothing/suit/apply_accessories(var/image/standing)
+/obj/item/clothing/suit/apply_accessories(image/standing)
if(LAZYLEN(accessories) && taurized)
for(var/obj/item/clothing/accessory/A in accessories)
var/image/I = new(A.get_mob_overlay())
@@ -1172,7 +1172,7 @@
update_icon_define_digi = "icons/inventory/uniform/mob_digi.dmi"
-/obj/item/clothing/under/attack_hand(var/mob/user)
+/obj/item/clothing/under/attack_hand(mob/user)
if(LAZYLEN(accessories))
..()
if ((ishuman(user) || issmall(user)) && src.loc == user)
@@ -1414,7 +1414,7 @@
wearer = null
return ..()
-/obj/item/clothing/proc/handle_digitigrade(var/mob/user)
+/obj/item/clothing/proc/handle_digitigrade(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -1448,15 +1448,15 @@
else
update_icon_define = null
-/obj/item/clothing/shoes/equipped(var/mob/user, var/slot)
+/obj/item/clothing/shoes/equipped(mob/user, slot)
. = ..()
handle_digitigrade(user)
-/obj/item/clothing/suit/equipped(var/mob/user, var/slot)
+/obj/item/clothing/suit/equipped(mob/user, slot)
. = ..()
handle_digitigrade(user)
-/obj/item/clothing/under/equipped(var/mob/user, var/slot)
+/obj/item/clothing/under/equipped(mob/user, slot)
. = ..()
handle_digitigrade(user)
diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm
index 9e5a73e736..510874f076 100644
--- a/code/modules/clothing/clothing_accessories.dm
+++ b/code/modules/clothing/clothing_accessories.dm
@@ -21,7 +21,7 @@
return TRUE
-/obj/item/clothing/attackby(var/obj/item/I, var/mob/user)
+/obj/item/clothing/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/clothing/accessory))
var/obj/item/clothing/accessory/A = I
if(attempt_attach_accessory(A, user))
@@ -34,7 +34,7 @@
..()
-/obj/item/clothing/attack_hand(var/mob/user)
+/obj/item/clothing/attack_hand(mob/user)
//only forward to the attached accessory if the clothing is equipped (not in a storage)
if(LAZYLEN(accessories) && src.loc == user)
for(var/obj/item/clothing/accessory/A in accessories)
@@ -46,7 +46,7 @@
return
return ..()
-/obj/item/clothing/MouseDrop(var/obj/over_object)
+/obj/item/clothing/MouseDrop(obj/over_object)
if (over_object && (ishuman(usr) || issmall(usr)))
//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
if (!(src.loc == usr))
diff --git a/code/modules/clothing/clothing_icons.dm b/code/modules/clothing/clothing_icons.dm
index 95c9c257d1..59483df42e 100644
--- a/code/modules/clothing/clothing_icons.dm
+++ b/code/modules/clothing/clothing_icons.dm
@@ -1,9 +1,9 @@
-/obj/item/clothing/apply_accessories(var/image/standing)
+/obj/item/clothing/apply_accessories(image/standing)
if(LAZYLEN(accessories))
for(var/obj/item/clothing/accessory/A in accessories)
standing.add_overlay(A.get_mob_overlay())
-/obj/item/clothing/apply_blood(var/image/standing)
+/obj/item/clothing/apply_blood(image/standing)
if(forensic_data?.has_blooddna() && blood_sprite_state && ishuman(loc))
var/mob/living/carbon/human/H = loc
var/image/bloodsies = image(icon = H.species.get_blood_mask(H), icon_state = blood_sprite_state)
@@ -11,7 +11,7 @@
standing.add_overlay(bloodsies)
//HELMET: May have a lighting overlay
-/obj/item/clothing/head/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask = null)
+/obj/item/clothing/head/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer = 0,icon/clip_mask = null)
var/image/standing = ..()
if(light_on && slot_name == slot_head_str)
var/cache_key = "[light_overlay][LAZYACCESS(sprite_sheets, body_type) ? "_[body_type]" : ""]"
@@ -20,7 +20,7 @@
return standing
//SUIT: Blood state is slightly different
-/obj/item/clothing/suit/apply_blood(var/image/standing)
+/obj/item/clothing/suit/apply_blood(image/standing)
if(forensic_data?.has_blooddna() && blood_sprite_state && ishuman(loc))
var/mob/living/carbon/human/H = loc
blood_sprite_state = "[blood_overlay_type]blood"
diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm
index c777e89564..2de923422d 100644
--- a/code/modules/clothing/clothing_vr.dm
+++ b/code/modules/clothing/clothing_vr.dm
@@ -2,7 +2,7 @@
var/recent_struggle = 0
//This is a crazy 'sideways' override.
-/obj/item/clothing/shoes/attackby(var/obj/item/I, var/mob/user)
+/obj/item/clothing/shoes/attackby(obj/item/I, mob/user)
if(istype(I,/obj/item/holder/micro))
var/full = 0
for(var/mob/M in src)
@@ -28,7 +28,7 @@
SPECIES_VOX = 'icons/inventory/hands/mob_vox.dmi',
SPECIES_WEREBEAST = 'icons/inventory/hands/mob_werebeast.dmi')
-/obj/item/clothing/relaymove(var/mob/living/user,var/direction)
+/obj/item/clothing/relaymove(mob/living/user,direction)
if(recent_struggle)
return
diff --git a/code/modules/clothing/glasses/glasses_vr.dm b/code/modules/clothing/glasses/glasses_vr.dm
index de94191fbd..5d502c053d 100644
--- a/code/modules/clothing/glasses/glasses_vr.dm
+++ b/code/modules/clothing/glasses/glasses_vr.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/glasses/proc/prescribe(var/mob/user)
+/obj/item/clothing/glasses/proc/prescribe(mob/user)
prescription = !prescription
//Look it's really not that fancy. It's not ACTUALLY unique scrip data.
@@ -19,7 +19,7 @@
icon_state = "modkit"
var/scrip_loaded = 0
-/obj/item/glasses_kit/afterattack(var/target, var/mob/living/carbon/human/user, var/proximity)
+/obj/item/glasses_kit/afterattack(target, mob/living/carbon/human/user, proximity)
if(!proximity)
return
if(!istype(user))
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 6cd830df8b..7631a70a52 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -119,7 +119,7 @@
if(flash_prot && ishuman(loc))
to_chat(loc, span_warning("Your [src.name] darken to try and protect your eyes!"))
-/obj/item/clothing/glasses/omnihud/prescribe(var/mob/user)
+/obj/item/clothing/glasses/omnihud/prescribe(mob/user)
prescription = !prescription
playsound(src,'sound/items/screwdriver.ogg', 50, 1)
if(prescription)
@@ -214,7 +214,7 @@
-/obj/item/clothing/glasses/omnihud/proc/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/proc/ar_interact(mob/living/carbon/human/user)
return 0 //The base models do nothing.
/obj/item/clothing/glasses/omnihud/visor
@@ -236,7 +236,7 @@
tgarscreen_path = /datum/tgui_module/crew_monitor/glasses
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED)
-/obj/item/clothing/glasses/omnihud/med/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/med/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -252,7 +252,7 @@
tgarscreen_path = /datum/tgui_module/alarm_monitor/security/glasses
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED)
-/obj/item/clothing/glasses/omnihud/sec/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/sec/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -267,7 +267,7 @@
actions_types = list(/datum/action/item_action/ar_console_station_alerts)
tgarscreen_path = /datum/tgui_module/alarm_monitor/engineering/glasses
-/obj/item/clothing/glasses/omnihud/eng/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/eng/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -332,7 +332,7 @@
actions_types = list(/datum/action/item_action/ar_console_all_alerts)
tgarscreen_path = /datum/tgui_module/alarm_monitor/all/glasses
-/obj/item/clothing/glasses/omnihud/all/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/all/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -459,7 +459,7 @@
flags_inv = HIDEFACE
can_shade = FALSE
-/obj/item/clothing/glasses/omnihud/mantle/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/mantle/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -486,7 +486,7 @@
tgarscreen_path = /datum/tgui_module/alarm_monitor/security/glasses
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_WANTED,VIS_AUGMENTED)
-/obj/item/clothing/glasses/omnihud/mantle/sec/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/mantle/sec/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -499,7 +499,7 @@
tgarscreen_path = /datum/tgui_module/crew_monitor/glasses
enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_AUGMENTED)
-/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -512,7 +512,7 @@
actions_types = list(/datum/action/item_action/ar_console_station_alerts)
tgarscreen_path = /datum/tgui_module/alarm_monitor/engineering/glasses
-/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/mantle/med/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
@@ -526,7 +526,7 @@
actions_types = list(/datum/action/item_action/ar_console_all_alerts)
tgarscreen_path = /datum/tgui_module/alarm_monitor/all/glasses
-/obj/item/clothing/glasses/omnihud/mantle/cmd/ar_interact(var/mob/living/carbon/human/user)
+/obj/item/clothing/glasses/omnihud/mantle/cmd/ar_interact(mob/living/carbon/human/user)
if(tgarscreen)
tgarscreen.tgui_interact(user)
return 1
diff --git a/code/modules/clothing/gloves/antagonist.dm b/code/modules/clothing/gloves/antagonist.dm
index 8978bf33ad..70d8520211 100644
--- a/code/modules/clothing/gloves/antagonist.dm
+++ b/code/modules/clothing/gloves/antagonist.dm
@@ -17,7 +17,7 @@
germ_level = 0
fingerprint_chance = 10 // They're thieves' gloves. What do you think?
-/obj/item/clothing/gloves/sterile/thieves/proc/pickpocket(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/proximity)
+/obj/item/clothing/gloves/sterile/thieves/proc/pickpocket(mob/living/carbon/human/user, mob/living/carbon/human/target, proximity)
if(!proximity || !user || !target)
return 0
@@ -84,7 +84,7 @@
return 1
-/obj/item/clothing/gloves/sterile/thieves/Touch(var/atom/A, var/proximity)
+/obj/item/clothing/gloves/sterile/thieves/Touch(atom/A, proximity)
if(proximity && ishuman(usr) && ishuman(A) && do_after(usr, 1 SECOND, target = A))
return pickpocket(usr, A, proximity)
return 0
diff --git a/code/modules/clothing/gloves/telekinetic.dm b/code/modules/clothing/gloves/telekinetic.dm
index 55f8173ab6..fc1894b364 100644
--- a/code/modules/clothing/gloves/telekinetic.dm
+++ b/code/modules/clothing/gloves/telekinetic.dm
@@ -15,7 +15,7 @@
return TRUE
return FALSE
-/obj/item/clothing/gloves/telekinetic/proc/use_grip_power(var/mob/user,var/play_sound)
+/obj/item/clothing/gloves/telekinetic/proc/use_grip_power(mob/user,play_sound)
if(cell)
cell.checked_use(use_power_amount)
if(play_sound)
diff --git a/code/modules/clothing/head/misc_ch.dm b/code/modules/clothing/head/misc_ch.dm
index dd4ea29e0a..cfd7610c70 100644
--- a/code/modules/clothing/head/misc_ch.dm
+++ b/code/modules/clothing/head/misc_ch.dm
@@ -7,7 +7,7 @@
desc = "It's a hat, it flails."
body_parts_covered = 0
-/obj/item/clothing/head/wiggler/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
+/obj/item/clothing/head/wiggler/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer,icon/clip_mask = null)
var/image/so_far = ..()
so_far.pixel_y += 16
so_far.pixel_x += 0
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 36444379f6..884aedb320 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -224,7 +224,7 @@
siemens_coefficient = 1.5
item_icons = null
-/obj/item/clothing/head/kitty/update_icon(var/mob/living/carbon/human/user)
+/obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user)
if(!istype(user)) return
var/icon/ears = new/icon("icon" = 'icons/inventory/head/mob.dmi', "icon_state" = "kitty")
ears.Blend(rgb(user.r_hair, user.g_hair, user.b_hair), ICON_ADD)
@@ -272,7 +272,7 @@
var/flavor_activate = null // Ditto, for but activating.
var/brainloss_cost = 3 // Whenever it activates, inflict this much brainloss on the wearer, as its not good for the mind to wear things that manipulate it.
-/obj/item/clothing/head/psy_crown/proc/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/head/psy_crown/proc/activate_ability(mob/living/wearer)
cooldown = world.time + cooldown_duration
if(flavor_activate)
to_chat(wearer, flavor_activate)
@@ -320,7 +320,7 @@
flavor_drop = span_notice("You feel much calmer after letting go of the crown.")
flavor_activate = span_danger("An otherworldly feeling seems to enter your mind, and it ignites your mind in fury!")
-/obj/item/clothing/head/psy_crown/wrath/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/head/psy_crown/wrath/activate_ability(mob/living/wearer)
..()
wearer.add_modifier(/datum/modifier/berserk, 30 SECONDS)
@@ -334,7 +334,7 @@
flavor_drop = span_notice("You feel much more sated after letting go of the crown.")
flavor_activate = span_danger("An otherworldly feeling seems to enter your mind, and it drives your mind into gluttony!")
-/obj/item/clothing/head/psy_crown/gluttony/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/head/psy_crown/gluttony/activate_ability(mob/living/wearer)
..()
wearer.add_modifier(/datum/modifier/gluttonyregeneration, 45 SECONDS)
diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm
index a2606383d6..e452f29ea0 100644
--- a/code/modules/clothing/head/pilot_helmet.dm
+++ b/code/modules/clothing/head/pilot_helmet.dm
@@ -86,7 +86,7 @@
images["horizon"] = I
raw_images += I
-/obj/item/clothing/head/pilot/proc/update_hud(var/status)
+/obj/item/clothing/head/pilot/proc/update_hud(status)
if(last_status == status)
return
@@ -171,7 +171,7 @@
qdel(pilot_hud)
return ..()
-/obj/item/clothing/head/pilot/equipped(var/mob/user,var/slot)
+/obj/item/clothing/head/pilot/equipped(mob/user,slot)
. = ..()
if(slot == slot_head && user.client)
user.client.screen |= pilot_hud
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 51f2a94408..14cafdafa8 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -236,7 +236,7 @@
. = ..()
eye = new(src)
-/obj/item/clothing/mask/ai/equipped(var/mob/user, var/slot)
+/obj/item/clothing/mask/ai/equipped(mob/user, slot)
..(user, slot)
if(slot == slot_wear_mask)
eye.owner = user
@@ -265,7 +265,7 @@
icon_state = "bandblack"
item_state_slots = list(slot_r_hand_str = "bandblack", slot_l_hand_str = "bandblack")
-/obj/item/clothing/mask/bandana/equipped(var/mob/user, var/slot)
+/obj/item/clothing/mask/bandana/equipped(mob/user, slot)
switch(slot)
if(slot_wear_mask) //Mask is the default for all the settings
flags_inv = initial(flags_inv)
diff --git a/code/modules/clothing/masks/monitor.dm b/code/modules/clothing/masks/monitor.dm
index b06b994938..7280e501da 100644
--- a/code/modules/clothing/masks/monitor.dm
+++ b/code/modules/clothing/masks/monitor.dm
@@ -34,7 +34,7 @@
canremove = TRUE
return ..()
-/obj/item/clothing/mask/monitor/mob_can_equip(var/mob/living/carbon/human/user, var/slot, disable_warning = FALSE)
+/obj/item/clothing/mask/monitor/mob_can_equip(mob/living/carbon/human/user, slot, disable_warning = FALSE)
if (!..())
return 0
if(istype(user))
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 6f5b1f3c6b..4b2f236f34 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -92,7 +92,7 @@
icon_state = "orange"
var/obj/item/handcuffs/chained = null
-/obj/item/clothing/shoes/orange/proc/attach_cuffs(var/obj/item/handcuffs/cuffs, mob/user as mob)
+/obj/item/clothing/shoes/orange/proc/attach_cuffs(obj/item/handcuffs/cuffs, mob/user as mob)
if (chained) return
user.drop_item()
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 6223d3ecb0..d0d0f0c7e8 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -102,7 +102,7 @@
species_restricted = null
/* CHOMPEdit - Replaced with squeak component
-/obj/item/clothing/shoes/clown_shoes/handle_movement(var/turf/walking, var/running)
+/obj/item/clothing/shoes/clown_shoes/handle_movement(turf/walking, running)
if(running)
if(footstep >= 2)
footstep = 0
diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm
index 40089d44a9..ee81cd2c8b 100644
--- a/code/modules/clothing/spacesuits/breaches.dm
+++ b/code/modules/clothing/spacesuits/breaches.dm
@@ -35,7 +35,7 @@
descriptor = GLOB.breach_brute_descriptors[class]
//Repair a certain amount of brute or burn damage to the suit.
-/obj/item/clothing/suit/space/proc/repair_breaches(var/damtype, var/amount, var/mob/user)
+/obj/item/clothing/suit/space/proc/repair_breaches(damtype, amount, mob/user)
if(!can_breach || !breaches || !breaches.len || !damage)
to_chat(user, "There are no breaches to repair on \the [src].")
@@ -67,7 +67,7 @@
user.visible_message(span_infoplain(span_bold("[user]") + " patches some of the damage on \the [src]."))
calc_breach_damage()
-/obj/item/clothing/suit/space/proc/create_breaches(var/damtype, var/amount)
+/obj/item/clothing/suit/space/proc/create_breaches(damtype, amount)
amount -= src.breach_threshold
amount *= src.resilience
diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm
index 07ef7ce2df..22d0617fb9 100644
--- a/code/modules/clothing/spacesuits/rig/modules/modules.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm
@@ -143,7 +143,7 @@
// Called when the module is installed into a suit.
-/obj/item/rig_module/proc/installed(var/obj/item/rig/new_holder)
+/obj/item/rig_module/proc/installed(obj/item/rig/new_holder)
holder = new_holder
return
@@ -182,7 +182,7 @@
return 1
// Proc for toggling on active abilities.
-/obj/item/rig_module/proc/activate(var/skip_engage = 0) //VOREStation Edit - Allow us to skip the engage call.
+/obj/item/rig_module/proc/activate(skip_engage = 0) //VOREStation Edit - Allow us to skip the engage call.
//VOREStation Edit - Allow us to skip the engage call
if(active)
return 0
@@ -233,7 +233,7 @@
// Called by holder rigsuit attackby()
// Checks if an item is usable with this module and handles it if it is
-/obj/item/rig_module/proc/accepts_item(var/obj/item/input_device)
+/obj/item/rig_module/proc/accepts_item(obj/item/input_device)
return 0
/atom/movable/stat_rig_module
@@ -250,7 +250,7 @@
module = null
. = ..()
-/atom/movable/stat_rig_module/proc/AddHref(var/list/href_list)
+/atom/movable/stat_rig_module/proc/AddHref(list/href_list)
return
/atom/movable/stat_rig_module/proc/CanUse()
@@ -332,7 +332,7 @@
name = "Change Charge"
module_mode = "select_charge_type"
-/atom/movable/stat_rig_module/charge/AddHref(var/list/href_list)
+/atom/movable/stat_rig_module/charge/AddHref(list/href_list)
var/charge_index = module.charges.Find(module.charge_selected)
if(!charge_index)
charge_index = 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
index a6d583fc04..f8025d971c 100644
--- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
@@ -77,7 +77,7 @@
interface_name = "VOID-shift phase projector"
interface_desc = "An advanced teleportation system. It is capable of pinpoint precision or random leaps forward."
-/obj/item/rig_module/teleporter/proc/phase_in(var/mob/M,var/turf/T)
+/obj/item/rig_module/teleporter/proc/phase_in(mob/M,turf/T)
if(!M || !T)
return
@@ -87,7 +87,7 @@
playsound(src, 'sound/effects/sparks2.ogg', 50, 1)
anim(T,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
-/obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T)
+/obj/item/rig_module/teleporter/proc/phase_out(mob/M,turf/T)
if(!M || !T)
return
@@ -95,7 +95,7 @@
playsound(T, "sparks", 50, 1)
anim(T,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
-/obj/item/rig_module/teleporter/engage(var/atom/target, var/notify_ai)
+/obj/item/rig_module/teleporter/engage(atom/target, notify_ai)
var/mob/living/carbon/human/H = holder.wearer
@@ -208,7 +208,7 @@
if(holder.wearer.stat == 2)
engage(1)
-/obj/item/rig_module/self_destruct/engage(var/skip_check)
+/obj/item/rig_module/self_destruct/engage(skip_check)
if(!skip_check && usr && tgui_alert(usr, "Are you sure you want to push that button?", "Self-destruct", list("No", "Yes")) != "Yes")
return
if(holder && holder.wearer)
diff --git a/code/modules/clothing/spacesuits/rig/modules/protean.dm b/code/modules/clothing/spacesuits/rig/modules/protean.dm
index f6a31c4774..f8439bf0a9 100644
--- a/code/modules/clothing/spacesuits/rig/modules/protean.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/protean.dm
@@ -31,7 +31,7 @@ These should come standard with the Protean rigsuit, unless you want them to wor
else
return 0
-/obj/item/rig_module/protean/syphon/deactivate(var/forced)
+/obj/item/rig_module/protean/syphon/deactivate(forced)
if(!..())
return 0
if(forced)
@@ -106,7 +106,7 @@ These should come standard with the Protean rigsuit, unless you want them to wor
else
return 0
-/obj/item/rig_module/protean/armor/deactivate(var/forced)
+/obj/item/rig_module/protean/armor/deactivate(forced)
if(!..(1))
return 0
if(forced)
@@ -201,7 +201,7 @@ These should come standard with the Protean rigsuit, unless you want them to wor
deactivate()
return
-/obj/item/rig_module/protean/healing/accepts_item(var/obj/item/stack/material/steel/S, var/mob/living/user)
+/obj/item/rig_module/protean/healing/accepts_item(obj/item/stack/material/steel/S, mob/living/user)
if(!istype(S) || !istype(user))
return 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm b/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm
index 53946f786d..9756de60f1 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/ai_container.dm
@@ -54,7 +54,7 @@
else
verb_holder.forceMove(src)
-/obj/item/rig_module/ai_container/accepts_item(var/obj/item/input_device, var/mob/living/user)
+/obj/item/rig_module/ai_container/accepts_item(obj/item/input_device, mob/living/user)
// Check if there's actually an AI to deal with.
var/mob/living/silicon/ai/target_ai
@@ -142,7 +142,7 @@
eject_ai()
..()
-/obj/item/rig_module/ai_container/proc/eject_ai(var/mob/user)
+/obj/item/rig_module/ai_container/proc/eject_ai(mob/user)
if(ai_card)
if(istype(ai_card, /obj/item/aicard))
@@ -166,7 +166,7 @@
integrated_ai = null
update_verb_holder()
-/obj/item/rig_module/ai_container/proc/integrate_ai(var/obj/item/ai,var/mob/user)
+/obj/item/rig_module/ai_container/proc/integrate_ai(obj/item/ai,mob/user)
if(!ai) return
// The ONLY THING all the different AI systems have in common is that they all store the mob inside an item.
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
index 3a2d29c9e3..cbba13af7b 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
@@ -43,7 +43,7 @@
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
-/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
+/obj/item/rig_module/chem_dispenser/accepts_item(obj/item/input_item, mob/living/user)
if(!input_item.is_open_container())
return 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm
index 80e48a0d55..4fb3d458d6 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/cleaner_launcher.dm
@@ -15,7 +15,7 @@
list("cleaner grenade", "cleaner grenade", /obj/item/grenade/chem_grenade/cleaner, 9),
)
-/obj/item/rig_module/cleaner_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user)
+/obj/item/rig_module/cleaner_launcher/accepts_item(obj/item/input_device, mob/living/user)
if(!istype(input_device) || !istype(user))
return 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm b/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm
index 40db272409..550083dd62 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/datajack.dm
@@ -29,7 +29,7 @@
return 0
return 1
-/obj/item/rig_module/datajack/accepts_item(var/obj/item/input_device, var/mob/living/user)
+/obj/item/rig_module/datajack/accepts_item(obj/item/input_device, mob/living/user)
// if(istype(input_device,/obj/item/disk/tech_disk))
// to_chat(user, "You slot the disk into [src].")
@@ -64,7 +64,7 @@
// return 1
return 0
-/obj/item/rig_module/datajack/proc/load_data(var/incoming_data)
+/obj/item/rig_module/datajack/proc/load_data(incoming_data)
if(islist(incoming_data))
for(var/entry in incoming_data)
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm b/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm
index d7ae54ce07..d38edba70e 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/grenade_launcher.dm
@@ -17,7 +17,7 @@
list("EMP grenade", "EMP grenade", /obj/item/grenade/empgrenade, 3),
)
-/obj/item/rig_module/grenade_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user)
+/obj/item/rig_module/grenade_launcher/accepts_item(obj/item/input_device, mob/living/user)
if(!istype(input_device) || !istype(user))
return 0
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm
index 957376e72d..475437af5c 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/pat_module_vr.dm
@@ -49,7 +49,7 @@
to_chat(H,span_notice("Your disable the P.A.T. module."))
UnregisterSignal(H, COMSIG_MOVABLE_ATTEMPTED_MOVE)
-/obj/item/rig_module/pat_module/proc/boop(var/mob/living/carbon/human/user,var/turf/To,var/turf/Tn)
+/obj/item/rig_module/pat_module/proc/boop(mob/living/carbon/human/user,turf/To,turf/Tn)
SIGNAL_HANDLER
if(!istype(user) || !istype(To) || !istype(Tn))
deactivate() //They were picked up or something, or put themselves in a locker, who knows. Just turn off.
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm b/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm
index 3b166f5915..7083094dc4 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/powersink.dm
@@ -61,7 +61,7 @@
return 1
-/obj/item/rig_module/power_sink/accepts_item(var/obj/item/input_device, var/mob/living/user)
+/obj/item/rig_module/power_sink/accepts_item(obj/item/input_device, mob/living/user)
var/can_drain = input_device.drain_power(1)
if(can_drain > 0)
engage(input_device)
@@ -114,7 +114,7 @@
return
-/obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M)
+/obj/item/rig_module/power_sink/proc/drain_complete(mob/living/M)
if(!interfaced_with)
if(M)
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/self_destruct.dm b/code/modules/clothing/spacesuits/rig/modules/specific/self_destruct.dm
index 94d9dcb7d0..69477134b2 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/self_destruct.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/self_destruct.dm
@@ -40,7 +40,7 @@
if(holder.wearer.stat == 2)
engage(1)
-/obj/item/rig_module/self_destruct/engage(var/skip_check)
+/obj/item/rig_module/self_destruct/engage(skip_check)
if(!skip_check && usr && tgui_alert(usr, "Are you sure you want to push that button?", "Self-destruct", list("No", "Yes")) != "Yes")
return
if(holder && holder.wearer)
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm b/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm
index 373f525b3f..3fa9f07f5f 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/teleporter.dm
@@ -13,7 +13,7 @@
interface_name = "VOID-shift phase projector"
interface_desc = "An advanced teleportation system. It is capable of pinpoint precision or random leaps forward."
-/obj/item/rig_module/teleporter/proc/phase_in(var/mob/M,var/turf/T)
+/obj/item/rig_module/teleporter/proc/phase_in(mob/M,turf/T)
if(!M || !T)
return
@@ -23,7 +23,7 @@
playsound(T, 'sound/effects/sparks2.ogg', 50, 1)
anim(T,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
-/obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T)
+/obj/item/rig_module/teleporter/proc/phase_out(mob/M,turf/T)
if(!M || !T)
return
@@ -31,7 +31,7 @@
playsound(T, "sparks", 50, 1)
anim(T,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
-/obj/item/rig_module/teleporter/engage(var/atom/target, var/notify_ai)
+/obj/item/rig_module/teleporter/engage(atom/target, notify_ai)
var/mob/living/carbon/human/H = holder.wearer
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 9bcc1bdbbb..c01fa6f06a 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -173,7 +173,7 @@
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
-/obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user)
+/obj/item/rig_module/chem_dispenser/accepts_item(obj/item/input_item, mob/living/user)
if(!input_item.is_open_container())
return 0
@@ -489,7 +489,7 @@
list("cleaner grenade", "cleaner grenade", /obj/item/grenade/chem_grenade/cleaner, 9),
)
-/obj/item/rig_module/cleaner_launcher/accepts_item(var/obj/item/input_device, var/mob/living/user)
+/obj/item/rig_module/cleaner_launcher/accepts_item(obj/item/input_device, mob/living/user)
if(!istype(input_device) || !istype(user))
return 0
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 70c188da04..9f783af279 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -224,7 +224,7 @@
M.unEquip(piece)
piece.forceMove(src)
-/obj/item/rig/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
+/obj/item/rig/get_worn_icon_file(body_type,slot_name,default_icon,inhands)
if(!inhands && (slot_name == slot_back_str || slot_name == slot_belt_str))
if(body_type == SPECIES_TESHARI || body_type == SPECIES_WEREBEAST) //Until teshari get proper sprites for rigs, they can default to not having the sprite.
return null //All other species are 'humanoid enough' to wear the default rig sprite.
@@ -251,7 +251,7 @@
// Updates pressure protection
// Seal = 1 sets protection
// Seal = 0 unsets protection
-/obj/item/rig/proc/update_airtight(var/obj/item/piece, var/seal = 0)
+/obj/item/rig/proc/update_airtight(obj/item/piece, seal = 0)
if(seal == 1)
piece.min_pressure_protection = rigsuit_min_pressure
piece.max_pressure_protection = rigsuit_max_pressure
@@ -425,13 +425,13 @@
else
update_airtight(piece, 1) // Seal
-/obj/item/rig/proc/toggle_cooling(var/mob/user)
+/obj/item/rig/proc/toggle_cooling(mob/user)
if(cooling_on)
turn_cooling_off(user)
else
turn_cooling_on(user)
-/obj/item/rig/proc/turn_cooling_on(var/mob/user)
+/obj/item/rig/proc/turn_cooling_on(mob/user)
if(!cell)
return
if(cell.charge <= 0)
@@ -445,7 +445,7 @@
to_chat(user, span_notice("You switch \the [src]'s cooling system on."))
-/obj/item/rig/proc/turn_cooling_off(var/mob/user, var/failed)
+/obj/item/rig/proc/turn_cooling_off(mob/user, failed)
if(failed)
visible_message("\The [src]'s cooling system clicks and whines as it powers down.")
else
@@ -581,7 +581,7 @@
for(var/obj/item/rig_module/module in installed_modules)
cell.use(module.process()*10)
-/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai)
+/obj/item/rig/proc/check_power_cost(mob/living/user, cost, use_unconcious, obj/item/rig_module/mod, user_is_ai)
if(!istype(user))
return 0
@@ -617,7 +617,7 @@
cell.use(cost*10)
return 1
-/obj/item/rig/update_icon(var/update_mob_icon)
+/obj/item/rig/update_icon(update_mob_icon)
cut_overlays()
if(!mob_icon || update_mob_icon)
@@ -642,7 +642,7 @@
wearer.update_inv_back()
return
-/obj/item/rig/proc/check_suit_access(var/mob/living/carbon/human/user, var/do_message = TRUE)
+/obj/item/rig/proc/check_suit_access(mob/living/carbon/human/user, do_message = TRUE)
if(!security_check_enabled)
return 1
@@ -666,7 +666,7 @@
return 1
-/obj/item/rig/proc/notify_ai(var/message)
+/obj/item/rig/proc/notify_ai(message)
for(var/obj/item/rig_module/ai_container/module in installed_modules)
if(module.integrated_ai && module.integrated_ai.client && !module.integrated_ai.stat)
to_chat(module.integrated_ai, "[message]")
@@ -698,7 +698,7 @@
wearer.wearing_rig = src
update_icon()
-/obj/item/rig/proc/toggle_piece(var/piece, var/mob/living/carbon/human/H, var/deploy_mode, var/forced = FALSE)
+/obj/item/rig/proc/toggle_piece(piece, mob/living/carbon/human/H, deploy_mode, forced = FALSE)
if((sealing || !cell || !cell.charge) && !forced)
return
@@ -888,7 +888,7 @@
to_chat(wearer, span_warning("The [source] has damaged your [dam_module.interface_name]!"))
dam_module.deactivate()
-/obj/item/rig/proc/malfunction_check(var/mob/living/carbon/human/user)
+/obj/item/rig/proc/malfunction_check(mob/living/carbon/human/user)
if(malfunction_delay)
if(offline)
to_chat(user, span_danger("The suit is completely unresponsive."))
@@ -897,7 +897,7 @@
return 1
return 0
-/obj/item/rig/proc/ai_can_move_suit(var/mob/user, var/check_user_module = 0, var/check_for_ai = 0)
+/obj/item/rig/proc/ai_can_move_suit(mob/user, check_user_module = 0, check_for_ai = 0)
if(check_for_ai)
if(!(locate(/obj/item/rig_module/ai_container) in contents))
@@ -934,13 +934,13 @@
return 0
return 1
-/obj/item/rig/proc/force_rest(var/mob/user)
+/obj/item/rig/proc/force_rest(mob/user)
if(!ai_can_move_suit(user, check_user_module = 1))
return
wearer.lay_down()
to_chat(user, span_notice("\The [wearer] is now [wearer.resting ? "resting" : "getting up"]."))
-/obj/item/rig/proc/forced_move(var/direction, var/mob/user, var/ai_moving = TRUE)
+/obj/item/rig/proc/forced_move(direction, mob/user, ai_moving = TRUE)
// Why is all this shit in client/Move()? Who knows?
if(world.time < wearer_move_delay)
diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
index 3bd01a5b14..12d1ccbd5c 100644
--- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
@@ -181,14 +181,14 @@
..()
-/obj/item/rig/attack_hand(var/mob/user)
+/obj/item/rig/attack_hand(mob/user)
if(electrified != 0)
if(shock(user)) //Handles removing charge from the cell, as well. No need to do that here.
return
..()
-/obj/item/rig/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/rig/emag_act(remaining_charges, mob/user)
if(!subverted)
LAZYCLEARLIST(req_access)
LAZYCLEARLIST(req_one_access)
diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
index d3b9faa19d..d869d6e9f9 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm
@@ -77,7 +77,7 @@
min_pressure_protection = null
resistance_flags = FIRE_PROOF | ACID_PROOF
-/obj/item/clothing/suit/space/rig/attack_hand(var/mob/living/M)
+/obj/item/clothing/suit/space/rig/attack_hand(mob/living/M)
if(tacknife)
tacknife.loc = get_turf(src)
if(M.put_in_active_hand(tacknife))
@@ -88,7 +88,7 @@
return
..()
-/obj/item/clothing/suit/space/rig/attackby(var/obj/item/I, var/mob/living/M)
+/obj/item/clothing/suit/space/rig/attackby(obj/item/I, mob/living/M)
if(istype(I, /obj/item/material/knife/tacknife))
if(tacknife)
return
@@ -104,7 +104,7 @@
/obj/item/clothing/head/helmet/space/rig/proc/prevent_track()
return 0
-/obj/item/clothing/gloves/gauntlets/rig/Touch(var/atom/A, var/proximity)
+/obj/item/clothing/gloves/gauntlets/rig/Touch(atom/A, proximity)
if(!A || !proximity)
return 0
diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm
index 628444d8d2..280622ac33 100644
--- a/code/modules/clothing/spacesuits/spacesuits.dm
+++ b/code/modules/clothing/spacesuits/spacesuits.dm
@@ -112,7 +112,7 @@
// broken limbs - at the time of writing, only the ninja suit, but
// I can see it being useful for other suits as we expand them. ~ Z
// The actual splinting occurs in /obj/item/organ/external/proc/fracture()
-/obj/item/clothing/suit/space/proc/check_limb_support(var/mob/living/carbon/human/user)
+/obj/item/clothing/suit/space/proc/check_limb_support(mob/living/carbon/human/user)
// If this isn't set, then we don't need to care.
if(!istype(user) || isnull(supporting_limbs))
@@ -130,7 +130,7 @@
to_chat(user, "\The [src] stops supporting your [E.name].")
supporting_limbs.Cut()
-/obj/item/clothing/suit/space/proc/handle_fracture(var/mob/living/carbon/human/user, var/obj/item/organ/external/E)
+/obj/item/clothing/suit/space/proc/handle_fracture(mob/living/carbon/human/user, obj/item/organ/external/E)
if(!istype(user) || isnull(supporting_limbs))
return
if(E.is_broken() && E.apply_splint(src))
diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm
index 3856a58389..f0482200ef 100644
--- a/code/modules/clothing/spacesuits/void/void.dm
+++ b/code/modules/clothing/spacesuits/void/void.dm
@@ -68,7 +68,7 @@
if(tank && in_range(src,user))
. += span_notice("The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank].")
-/obj/item/clothing/suit/space/void/refit_for_species(var/target_species)
+/obj/item/clothing/suit/space/void/refit_for_species(target_species)
..()
if(istype(hood))
hood.refit_for_species(target_species)
@@ -132,7 +132,7 @@
cooler.canremove = TRUE
cooler.forceMove(src)
-/obj/item/clothing/suit/space/void/proc/attach_helmet(var/obj/item/clothing/head/helmet/space/void/helm)
+/obj/item/clothing/suit/space/void/proc/attach_helmet(obj/item/clothing/head/helmet/space/void/helm)
if(!istype(helm) || hood)
return
diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm
index 615b4cc1ef..247d9a8edd 100644
--- a/code/modules/clothing/spacesuits/void/void_vr.dm
+++ b/code/modules/clothing/spacesuits/void/void_vr.dm
@@ -24,7 +24,7 @@
glass_overlay.appearance_flags = RESET_COLOR
add_overlay(glass_overlay)
-/obj/item/clothing/head/helmet/space/void/heck/apply_accessories(var/image/standing)
+/obj/item/clothing/head/helmet/space/void/heck/apply_accessories(image/standing)
. = ..()
var/mutable_appearance/glass_overlay = mutable_appearance(icon_override, "hostile_env_glass")
glass_overlay.appearance_flags = KEEP_APART|RESET_COLOR
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 7827fc7ca9..d1cfd999be 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -77,7 +77,7 @@
armor = list(melee = 10, bullet = 10, laser = 80, energy = 50, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.1
-/obj/item/clothing/suit/armor/laserproof/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/laserproof/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(istype(damage_source, /obj/item/projectile/energy) || istype(damage_source, /obj/item/projectile/beam))
var/obj/item/projectile/P = damage_source
@@ -176,7 +176,7 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
special_handling = TRUE
-/obj/item/clothing/suit/armor/reactive/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/reactive/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(50))
user.visible_message(span_danger("The reactive teleport system flings [user] clear of the attack!"))
var/list/turfs = new/list()
@@ -242,7 +242,7 @@
armor = list(melee = 70, bullet = 70, laser = 70, energy = 70, bomb = 70, bio = 0, rad = 40)
block_chance = 40
-/obj/item/clothing/suit/armor/alien/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/alien/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
return TRUE
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index cf3de57ef6..6d258c2bfc 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -270,7 +270,7 @@
return
..()
-/obj/item/clothing/suit/straight_jacket/equipped(var/mob/living/user,var/slot)
+/obj/item/clothing/suit/straight_jacket/equipped(mob/living/user,slot)
. = ..()
if(slot == slot_wear_suit)
user.drop_l_hand()
diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm
index 360dada40f..2f832baf6c 100644
--- a/code/modules/clothing/suits/reactive_armour.dm
+++ b/code/modules/clothing/suits/reactive_armour.dm
@@ -75,7 +75,7 @@
else
return reactive_activation(user, damage_source, attack_text, damage)
-/obj/item/clothing/suit/armor/reactive/proc/cooldown_activation(var/mob/living/carbon/human/owner)
+/obj/item/clothing/suit/armor/reactive/proc/cooldown_activation(mob/living/carbon/human/owner)
owner.visible_message(cooldown_message)
/obj/item/clothing/suit/armor/reactive/proc/reactive_activation(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0)
diff --git a/code/modules/clothing/suits/shibari.dm b/code/modules/clothing/suits/shibari.dm
index 64db279ef7..372ecc7128 100644
--- a/code/modules/clothing/suits/shibari.dm
+++ b/code/modules/clothing/suits/shibari.dm
@@ -36,7 +36,7 @@
else
icon_state = "shibari_[rope_mode]"
-/obj/item/clothing/suit/shibari/equipped(var/mob/living/user,var/slot)
+/obj/item/clothing/suit/shibari/equipped(mob/living/user,slot)
. = ..()
if((rope_mode == SHIBARI_ARMS) || (rope_mode == SHIBARI_BOTH))
if(slot == slot_wear_suit)
diff --git a/code/modules/clothing/under/extrauniforms_yw.dm b/code/modules/clothing/under/extrauniforms_yw.dm
index 02d6e56a64..435b6849e5 100644
--- a/code/modules/clothing/under/extrauniforms_yw.dm
+++ b/code/modules/clothing/under/extrauniforms_yw.dm
@@ -260,7 +260,7 @@
icon_state = "victorianredvest"
item_state = "victorianredvest"
-/obj/item/clothing/under/yw/victsuit/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
+/obj/item/clothing/under/yw/victsuit/get_worn_icon_file(body_type,slot_name,default_icon,inhands)
if(body_type == SPECIES_GREY_YW)
if(!inhands)
return 'icons/mob/species/grey/uniform.dmi'
diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index ba8652660d..8bc75e2118 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -158,7 +158,7 @@
log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.")
to_chat(M, span_warning("\The [src] flickers. It is now recharging and will be ready again in thirty seconds."))
-/obj/item/clothing/gloves/bluespace/examine(var/mob/user)
+/obj/item/clothing/gloves/bluespace/examine(mob/user)
. = ..()
var/cooldowntime = round((10 SECONDS - (world.time - last_activated)) * 0.1)
if(Adjacent(user))
@@ -167,7 +167,7 @@
if(emagged)
. += span_warning("The crystal is flickering.")
-/obj/item/clothing/gloves/bluespace/emag_act(R_charges, var/mob/user, emag_source)
+/obj/item/clothing/gloves/bluespace/emag_act(R_charges, mob/user, emag_source)
. = ..()
if(!emagged)
emagged = TRUE
diff --git a/code/modules/compass/compass_holder.dm b/code/modules/compass/compass_holder.dm
index fa8e9c3e80..e3cb7f9aae 100644
--- a/code/modules/compass/compass_holder.dm
+++ b/code/modules/compass/compass_holder.dm
@@ -77,11 +77,11 @@
set_overlays |= compass_heading_marker
overlays = set_overlays // ???
-/obj/compass_holder/proc/clear_waypoint(var/id)
+/obj/compass_holder/proc/clear_waypoint(id)
LAZYREMOVE(compass_waypoints, id)
rebuild_overlay_lists(TRUE)
-/obj/compass_holder/proc/set_waypoint(var/id, var/label, var/heading_x, var/heading_y, var/heading_z, var/label_color)
+/obj/compass_holder/proc/set_waypoint(id, label, heading_x, heading_y, heading_z, label_color)
var/datum/compass_waypoint/wp = LAZYACCESS(compass_waypoints, id)
if(!wp)
wp = new /datum/compass_waypoint()
@@ -89,7 +89,7 @@
LAZYSET(compass_waypoints, id, wp)
rebuild_overlay_lists(TRUE)
-/obj/compass_holder/proc/recalculate_heading(var/rebuild_icon = TRUE)
+/obj/compass_holder/proc/recalculate_heading(rebuild_icon = TRUE)
if(show_heading)
var/matrix/M = matrix()
M.Translate(0, round(COMPASS_LABEL_OFFSET - 35))
@@ -98,21 +98,21 @@
if(rebuild_icon)
update_icon()
-/obj/compass_holder/proc/show_waypoint(var/id)
+/obj/compass_holder/proc/show_waypoint(id)
var/datum/compass_waypoint/wp = compass_waypoints[id]
wp.hidden = FALSE
-/obj/compass_holder/proc/hide_waypoint(var/id)
+/obj/compass_holder/proc/hide_waypoint(id)
var/datum/compass_waypoint/wp = compass_waypoints[id]
wp.hidden = TRUE
-/obj/compass_holder/proc/hide_waypoints(var/rebuild_overlays = FALSE)
+/obj/compass_holder/proc/hide_waypoints(rebuild_overlays = FALSE)
for(var/id in compass_waypoints)
hide_waypoint(id)
if(rebuild_overlays)
rebuild_overlay_lists(TRUE)
-/obj/compass_holder/proc/rebuild_overlay_lists(var/update_icon = FALSE)
+/obj/compass_holder/proc/rebuild_overlay_lists(update_icon = FALSE)
compass_waypoint_markers = null
var/turf/T = get_turf(src)
if(istype(T))
diff --git a/code/modules/compass/compass_waypoint.dm b/code/modules/compass/compass_waypoint.dm
index 1e611ea854..68aeffe777 100644
--- a/code/modules/compass/compass_waypoint.dm
+++ b/code/modules/compass/compass_waypoint.dm
@@ -7,7 +7,7 @@
var/hidden = FALSE
var/image/compass_overlay
-/datum/compass_waypoint/proc/set_values(var/_name, var/_x, var/_y, var/_z, var/_color)
+/datum/compass_waypoint/proc/set_values(_name, _x, _y, _z, _color)
name = _name
x = _x
y = _y
@@ -20,7 +20,7 @@
compass_overlay.layer = LAYER_HUD_UNDER
compass_overlay.plane = PLANE_PLAYER_HUD
-/datum/compass_waypoint/proc/recalculate_heading(var/cx, var/cy)
+/datum/compass_waypoint/proc/recalculate_heading(cx, cy)
var/matrix/M = matrix()
M.Translate(0, (name ? COMPASS_LABEL_OFFSET-4 : COMPASS_LABEL_OFFSET))
M.Turn(ATAN2(cy-y, cx-x)+180)
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 52abb728f2..fe75a98639 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -34,12 +34,12 @@ GLOBAL_LIST_INIT(custom_items, load_custom_items())
var/kit_icon
var/additional_data //for modular modkits, item path; for mech modkits, allowed mechs; for voidsuit modkits, light overlays
-/datum/custom_item/proc/spawn_item(var/newloc)
+/datum/custom_item/proc/spawn_item(newloc)
var/obj/item/citem = new item_path(newloc)
apply_to_item(citem)
return citem
-/datum/custom_item/proc/apply_to_item(var/obj/item/item)
+/datum/custom_item/proc/apply_to_item(obj/item/item)
if(!item)
return
if(name)
@@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(custom_items, load_custom_items())
K.set_info(kit_name, kit_desc, kit_icon, additional_data = additional_data)
return item
-/datum/custom_item/proc/apply_inherit_inhands(var/obj/item/item)
+/datum/custom_item/proc/apply_inherit_inhands(obj/item/item)
var/list/new_item_icons = list()
var/list/new_item_state_slots = list()
@@ -94,7 +94,7 @@ GLOBAL_LIST_INIT(custom_items, load_custom_items())
item.item_icons = new_item_icons
//this has to mirror the way update_inv_*_hand() selects the state
-/datum/custom_item/proc/get_state(var/obj/item/item, var/slot_str, var/hand_str)
+/datum/custom_item/proc/get_state(obj/item/item, slot_str, hand_str)
var/t_state
if(LAZYACCESS(item.item_state_slots, slot_str))
t_state = item.item_state_slots[slot_str]
@@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(custom_items, load_custom_items())
return t_state
//this has to mirror the way update_inv_*_hand() selects the icon
-/datum/custom_item/proc/get_icon(var/obj/item/item, var/slot_str, var/icon/hand_icon)
+/datum/custom_item/proc/get_icon(obj/item/item, slot_str, icon/hand_icon)
var/icon/t_icon
if(item.icon_override)
t_icon = item.icon_override
@@ -223,7 +223,7 @@ GLOBAL_LIST_INIT(custom_items, load_custom_items())
place_custom_item(M,citem)
// Places the item on the target mob.
-/proc/place_custom_item(mob/living/carbon/human/M, var/datum/custom_item/citem)
+/proc/place_custom_item(mob/living/carbon/human/M, datum/custom_item/citem)
if(!citem) return
var/obj/item/newitem = citem.spawn_item()
diff --git a/code/modules/detectivework/forensics.dm b/code/modules/detectivework/forensics.dm
index 7f79017fd3..04fdde6ec9 100644
--- a/code/modules/detectivework/forensics.dm
+++ b/code/modules/detectivework/forensics.dm
@@ -4,7 +4,7 @@
//This is the output of the stringpercent(print) proc, and means about 80% of
//the print must be there for it to be complete. (Prints are 32 digits)
-/proc/is_complete_print(var/print)
+/proc/is_complete_print(print)
return stringpercent(print) <= FINGERPRINT_COMPLETE
/// Forensics: Returns the object's forensic information datum. If none exists, it makes it.
@@ -78,12 +78,12 @@
init_forensic_data().add_hiddenprints(M)
/// Forensics: Adds blood dna to an object, this also usually gives the object a bloody overlay, but that is handled by the object itself. Returns true if this is the first time this dna is being added to this object.
-/atom/proc/add_blooddna(var/datum/dna/dna_data,var/mob/M)
+/atom/proc/add_blooddna(datum/dna/dna_data,mob/M)
SHOULD_NOT_OVERRIDE(TRUE)
return init_forensic_data().add_blooddna(dna_data,M)
/// Forensics: Adds blood dna to an object, this version uses an organ's more restricted dna datum, but it still has all the information needed. Returns true if this is the first time this dna is being added to this object.
-/atom/proc/add_blooddna_organ(var/datum/organ_data/dna_data)
+/atom/proc/add_blooddna_organ(datum/organ_data/dna_data)
SHOULD_NOT_OVERRIDE(TRUE)
return init_forensic_data().add_blooddna_organ(dna_data)
@@ -93,7 +93,7 @@
init_forensic_data().add_fibres(M)
/// Forensics: Transfers both our normal and hidden fingerprints to the specified object, handles the forensics datum creation itself.
-/atom/proc/transfer_fingerprints_to(var/atom/transfer_to)
+/atom/proc/transfer_fingerprints_to(atom/transfer_to)
SHOULD_NOT_OVERRIDE(TRUE)
if(!forensic_data)
return
@@ -102,20 +102,20 @@
C.merge_hiddenprints(forensic_data)
/// Forensics: Transfers our blood dna to the specified object, handles the forensics datum creation itself.
-/atom/proc/transfer_blooddna_to(var/atom/transfer_to)
+/atom/proc/transfer_blooddna_to(atom/transfer_to)
if(!forensic_data)
return
transfer_to.init_forensic_data().merge_blooddna(forensic_data)
/// Forensics: Transfers our stray fibers to the specified object, handles the forensics datum creation itself.
-/atom/proc/transfer_fibres_to(var/atom/transfer_to)
+/atom/proc/transfer_fibres_to(atom/transfer_to)
SHOULD_NOT_OVERRIDE(TRUE)
if(!forensic_data)
return
transfer_to.init_forensic_data().merge_fibres(forensic_data)
/// Forensics: Adds gunshot residue from firing boolets
-/atom/proc/add_gunshotresidue(var/obj/item/ammo_casing/shell)
+/atom/proc/add_gunshotresidue(obj/item/ammo_casing/shell)
init_forensic_data().add_gunshotresidue(shell.caliber)
@@ -123,7 +123,7 @@
name = "forensic data"
var/uid
-/datum/data/record/forensic/New(var/atom/A)
+/datum/data/record/forensic/New(atom/A)
uid = "\ref [A]"
fields["name"] = sanitize(A.name)
fields["area"] = sanitize("[get_area(A)]")
@@ -132,7 +132,7 @@
fields["blood"] = A.forensic_data?.get_blooddna().Copy()
fields["time"] = world.time
-/datum/data/record/forensic/proc/merge(var/datum/data/record/other)
+/datum/data/record/forensic/proc/merge(datum/data/record/other)
var/list/prints = fields["fprints"]
var/list/o_prints = other.fields["fprints"]
for(var/print in o_prints)
@@ -155,7 +155,7 @@
fields["area"] = other.fields["area"]
fields["time"] = other.fields["time"]
-/datum/data/record/forensic/proc/update_prints(var/list/o_prints)
+/datum/data/record/forensic/proc/update_prints(list/o_prints)
var/list/prints = fields["fprints"]
for(var/print in o_prints)
if(prints[print])
diff --git a/code/modules/detectivework/microscope/microscope.dm b/code/modules/detectivework/microscope/microscope.dm
index 8f11bffc58..abc8d6e177 100644
--- a/code/modules/detectivework/microscope/microscope.dm
+++ b/code/modules/detectivework/microscope/microscope.dm
@@ -85,7 +85,7 @@
to_chat(user,report.info)
return
-/obj/machinery/microscope/proc/remove_sample(var/mob/living/remover)
+/obj/machinery/microscope/proc/remove_sample(mob/living/remover)
if(!istype(remover) || remover.incapacitated() || !Adjacent(remover))
return
if(!sample)
@@ -100,7 +100,7 @@
/obj/machinery/microscope/click_alt()
remove_sample(usr)
-/obj/machinery/microscope/MouseDrop(var/atom/other)
+/obj/machinery/microscope/MouseDrop(atom/other)
if(usr == other)
remove_sample(usr)
else
diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm
index d906c5b122..096ed63185 100644
--- a/code/modules/detectivework/tools/evidencebag.dm
+++ b/code/modules/detectivework/tools/evidencebag.dm
@@ -10,7 +10,7 @@
var/obj/item/stored_item = null
-/obj/item/evidencebag/MouseDrop(var/obj/item/I)
+/obj/item/evidencebag/MouseDrop(obj/item/I)
if (!ishuman(usr))
return
if(!istype(I) || I.anchored)
diff --git a/code/modules/detectivework/tools/sample_kits.dm b/code/modules/detectivework/tools/sample_kits.dm
index 6423e520be..a45b1218e3 100644
--- a/code/modules/detectivework/tools/sample_kits.dm
+++ b/code/modules/detectivework/tools/sample_kits.dm
@@ -4,7 +4,7 @@
w_class = ITEMSIZE_TINY
var/list/evidence = list()
-/obj/item/sample/Initialize(mapload, var/atom/supplied)
+/obj/item/sample/Initialize(mapload, atom/supplied)
. = ..()
if(supplied && supplied.forensic_data)
copy_evidence(supplied)
@@ -15,13 +15,13 @@
if(evidence && evidence.len)
icon_state = "fingerprint1"
-/obj/item/sample/proc/copy_evidence(var/atom/supplied)
+/obj/item/sample/proc/copy_evidence(atom/supplied)
var/list/fibre_data = supplied.forensic_data.get_fibres()
if(fibre_data && fibre_data.len)
evidence = fibre_data.Copy()
supplied.forensic_data.clear_fibres()
-/obj/item/sample/proc/merge_evidence(var/obj/item/sample/supplied, var/mob/user)
+/obj/item/sample/proc/merge_evidence(obj/item/sample/supplied, mob/user)
if(!supplied.evidence || !supplied.evidence.len)
return 0
evidence |= supplied.evidence
@@ -29,7 +29,7 @@
to_chat(user, span_notice("You transfer the contents of \the [supplied] into \the [src]."))
return 1
-/obj/item/sample/print/merge_evidence(var/obj/item/sample/supplied, var/mob/user)
+/obj/item/sample/print/merge_evidence(obj/item/sample/supplied, mob/user)
if(!supplied.evidence || !supplied.evidence.len)
return 0
for(var/print in supplied.evidence)
@@ -41,7 +41,7 @@
to_chat(user, span_notice("You overlay \the [src] and \the [supplied], combining the print records."))
return 1
-/obj/item/sample/attackby(var/obj/O, var/mob/user)
+/obj/item/sample/attackby(obj/O, mob/user)
if(O.type == src.type)
user.unEquip(O)
if(merge_evidence(O, user))
@@ -119,7 +119,7 @@
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_FAILURE
-/obj/item/sample/print/copy_evidence(var/atom/supplied)
+/obj/item/sample/print/copy_evidence(atom/supplied)
var/list/print_data = supplied.forensic_data.get_prints()
if(print_data && print_data.len)
for(var/print in print_data)
@@ -134,15 +134,15 @@
var/evidence_type = "fiber"
var/evidence_path = /obj/item/sample/fibers
-/obj/item/forensics/sample_kit/proc/can_take_sample(var/mob/user, var/atom/supplied)
+/obj/item/forensics/sample_kit/proc/can_take_sample(mob/user, atom/supplied)
return supplied.forensic_data?.has_fibres()
-/obj/item/forensics/sample_kit/proc/take_sample(var/mob/user, var/atom/supplied)
+/obj/item/forensics/sample_kit/proc/take_sample(mob/user, atom/supplied)
var/obj/item/sample/S = new evidence_path(get_turf(user), supplied)
to_chat(user, span_notice("You transfer [S.evidence.len] [S.evidence.len > 1 ? "[evidence_type]s" : "[evidence_type]"] to \the [S]."))
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FORENSICS_COLLECTED, supplied, user)
-/obj/item/forensics/sample_kit/afterattack(var/atom/A, var/mob/user, var/proximity)
+/obj/item/forensics/sample_kit/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
add_fingerprint(user)
@@ -160,5 +160,5 @@
evidence_type = "fingerprint"
evidence_path = /obj/item/sample/print
-/obj/item/forensics/sample_kit/powder/can_take_sample(var/mob/user, var/atom/supplied)
+/obj/item/forensics/sample_kit/powder/can_take_sample(mob/user, atom/supplied)
return supplied.forensic_data?.has_prints()
diff --git a/code/modules/detectivework/tools/scanner.dm b/code/modules/detectivework/tools/scanner.dm
index 16bc75d5f8..f58e09b6b6 100644
--- a/code/modules/detectivework/tools/scanner.dm
+++ b/code/modules/detectivework/tools/scanner.dm
@@ -150,7 +150,7 @@
//to_world("usr is [usr]") //why was this a thing? -KK.
display_data(usr)
-/obj/item/detective_scanner/proc/display_data(var/mob/user)
+/obj/item/detective_scanner/proc/display_data(mob/user)
if(user && stored && stored.len)
for(var/objref in stored)
if(!do_after(user, 1 SECOND, target = src)) // So people can move and stop the spam, if they refuse to wipe data.
diff --git a/code/modules/detectivework/tools/swabs.dm b/code/modules/detectivework/tools/swabs.dm
index 3c26c1ae57..fa3a5574d4 100644
--- a/code/modules/detectivework/tools/swabs.dm
+++ b/code/modules/detectivework/tools/swabs.dm
@@ -68,7 +68,7 @@
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_FAILURE
-/obj/item/forensics/swab/afterattack(var/atom/A, var/mob/user, var/proximity)
+/obj/item/forensics/swab/afterattack(atom/A, mob/user, proximity)
if(!proximity || istype(A, /obj/machinery/dnaforensics))
return
@@ -116,7 +116,7 @@
set_used(sample_type, A)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FORENSICS_COLLECTED, A, user)
-/obj/item/forensics/swab/proc/set_used(var/sample_str, var/atom/source)
+/obj/item/forensics/swab/proc/set_used(sample_str, atom/source)
name = "[initial(name)] ([sample_str] - [source])"
desc = "[initial(desc)] The label on the vial reads 'Sample of [sample_str] from [source].'."
icon_state = "swab_used"
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 8b2a232833..73c56a2fd0 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -64,7 +64,7 @@ log transactions
playsound(src, 'sound/items/polaroid2.ogg', 50, 1)
break
-/obj/machinery/atm/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/atm/emag_act(remaining_charges, mob/user)
if(emagged)
return
@@ -472,7 +472,7 @@ log transactions
held_card = null
-/obj/machinery/atm/proc/spawn_ewallet(var/sum, loc, mob/living/carbon/human/human_user as mob)
+/obj/machinery/atm/proc/spawn_ewallet(sum, loc, mob/living/carbon/human/human_user as mob)
var/obj/item/spacecash/ewallet/E = new /obj/item/spacecash/ewallet(loc)
if(ishuman(human_user) && !human_user.get_active_hand())
human_user.put_in_hands(E)
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 1732940911..b6871adf5f 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -19,7 +19,7 @@
var/time = ""
var/source_terminal = ""
-/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/obj/machinery/account_database/source_db, var/offmap = FALSE)
+/proc/create_account(new_owner_name = "Default user", starting_funds = 0, obj/machinery/account_database/source_db, offmap = FALSE)
//create a new account
var/datum/money_account/M = new()
@@ -78,7 +78,7 @@
return M
-/proc/charge_to_account(var/attempt_account_number, var/source_name, var/purpose, var/terminal_id, var/amount)
+/proc/charge_to_account(attempt_account_number, source_name, purpose, terminal_id, amount)
for(var/datum/money_account/D in GLOB.all_money_accounts)
if(D.account_number == attempt_account_number && !D.suspended)
D.money += amount
@@ -101,20 +101,20 @@
return 0
//this returns the first account datum that matches the supplied accnum/pin combination, it returns null if the combination did not match any account
-/proc/attempt_account_access(var/attempt_account_number, var/attempt_pin_number, var/security_level_passed = 0)
+/proc/attempt_account_access(attempt_account_number, attempt_pin_number, security_level_passed = 0)
for(var/datum/money_account/D in GLOB.all_money_accounts)
if(D.account_number == attempt_account_number)
if( D.security_level <= security_level_passed && (!D.security_level || D.remote_access_pin == attempt_pin_number) )
return D
break
-/proc/get_account(var/account_number)
+/proc/get_account(account_number)
for(var/datum/money_account/D in GLOB.all_money_accounts)
if(D.account_number == account_number)
return D
//Performing purchases by ID card
-/proc/purchase_with_id_card(obj/item/card/id/I, mob/M, var/purchase_title = "Company", var/purchase_terminal = "Terminal", var/purchase_desc = "Purchase of Something", var/price = 0)
+/proc/purchase_with_id_card(obj/item/card/id/I, mob/M, purchase_title = "Company", purchase_terminal = "Terminal", purchase_desc = "Purchase of Something", price = 0)
// Check if account can pay at all
var/datum/money_account/customer_account = get_account(I.associated_account_number)
if(!customer_account)
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index 5cb147633a..dd7bc62198 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -146,7 +146,7 @@
else
..()
-/obj/item/eftpos/Topic(var/href, var/href_list)
+/obj/item/eftpos/Topic(href, href_list)
if(href_list["choice"])
switch(href_list["choice"])
if("change_code")
@@ -222,7 +222,7 @@
src.attack_self(usr)
-/obj/item/eftpos/proc/scan_card(var/obj/item/card/I, var/obj/item/ID_container)
+/obj/item/eftpos/proc/scan_card(obj/item/card/I, obj/item/ID_container)
if (istype(I, /obj/item/card/id))
var/obj/item/card/id/C = I
if(I==ID_container || ID_container == null)
diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm
index fcb822073e..9cb2f4cad2 100644
--- a/code/modules/economy/TradeDestinations.dm
+++ b/code/modules/economy/TradeDestinations.dm
@@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
var/list/temp_price_change[BIOMEDICAL]
var/mundane_probability = 0
-/datum/trade_destination/proc/get_custom_eventstring(var/event_type)
+/datum/trade_destination/proc/get_custom_eventstring(event_type)
return null
//distance is measured in Arbitrary and corelates to travel time, like, I guess
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index 15e13f86dc..5a2457c989 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -69,7 +69,7 @@
add_overlay(banknote)
src.desc = "They are worth [worth] [initial_name]s."
-/obj/item/spacecash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1)
+/obj/item/spacecash/proc/adjust_worth(adjust_worth = 0, update = 1)
worth += adjust_worth
if(worth > 0)
if(update)
@@ -79,7 +79,7 @@
qdel(src)
return 0
-/obj/item/spacecash/proc/set_worth(var/new_worth = 0, var/update = 1)
+/obj/item/spacecash/proc/set_worth(new_worth = 0, update = 1)
worth = max(0, new_worth)
if(update)
update_icon()
@@ -156,7 +156,7 @@
desc = "It's worth 1000 Thalers."
worth = 1000
-/proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
+/proc/spawn_money(sum, spawnloc, mob/living/carbon/human/human_user as mob)
var/obj/item/spacecash/SC = new (spawnloc)
SC.set_worth(sum)
diff --git a/code/modules/economy/casinocash.dm b/code/modules/economy/casinocash.dm
index 8a4943ad98..c924f00cf0 100644
--- a/code/modules/economy/casinocash.dm
+++ b/code/modules/economy/casinocash.dm
@@ -95,7 +95,7 @@
src.overlays += banknote
src.desc = "They are worth [worth] casino credits."
-/obj/item/spacecasinocash/proc/adjust_worth(var/adjust_worth = 0, var/update = 1)
+/obj/item/spacecasinocash/proc/adjust_worth(adjust_worth = 0, update = 1)
worth += adjust_worth
if(worth > 0)
if(update)
@@ -105,7 +105,7 @@
qdel(src)
return 0
-/obj/item/spacecasinocash/proc/set_worth(var/new_worth = 0, var/update = 1)
+/obj/item/spacecasinocash/proc/set_worth(new_worth = 0, update = 1)
worth = max(0, new_worth)
if(update)
update_icon()
@@ -176,7 +176,7 @@
desc = "It's worth 1000 credits."
worth = 1000
-/proc/spawn_casinochips(var/sum, spawnloc, mob/living/carbon/human/human_user as mob)
+/proc/spawn_casinochips(sum, spawnloc, mob/living/carbon/human/human_user as mob)
var/obj/item/spacecasinocash/SC = new (spawnloc)
SC.set_worth(sum, TRUE)
@@ -276,7 +276,7 @@
src.overlays += banknote
src.desc = "They are worth [worth] replica casino credits."
-/obj/item/spacecasinocash_fake/proc/adjust_worth(var/adjust_worth = 0, var/update = 1)
+/obj/item/spacecasinocash_fake/proc/adjust_worth(adjust_worth = 0, update = 1)
worth += adjust_worth
if(worth > 0)
if(update)
@@ -286,7 +286,7 @@
qdel(src)
return 0
-/obj/item/spacecasinocash_fake/proc/set_worth(var/new_worth = 0, var/update = 1)
+/obj/item/spacecasinocash_fake/proc/set_worth(new_worth = 0, update = 1)
worth = max(0, new_worth)
if(update)
update_icon()
diff --git a/code/modules/economy/coins_vr.dm b/code/modules/economy/coins_vr.dm
index f4326d18a0..27bd9109d4 100644
--- a/code/modules/economy/coins_vr.dm
+++ b/code/modules/economy/coins_vr.dm
@@ -55,7 +55,7 @@
user.visible_message(span_notice("[user] fumbled the [src]!"), runemessage = "fumbles [src]")
user.remove_from_mob(src)
-/obj/item/aliencoin/examine(var/mob/user)
+/obj/item/aliencoin/examine(mob/user)
. = ..()
if(Adjacent(user))
. += span_notice("It has some writing along its edge that seems to be some language that you are not familiar with. The face of the coin is very smooth, with what appears to be some kind of angular logo along the left side, and a couple of lines of the alien text along the opposite side. The reverse side is similarly smooth, the top of it features what appears to be some kind of vortex, surrounded by six stars, three on either side, with further swirls and intricate patterns along the bottom sections of this face. Looking closely, you can see that there is more text hidden among the swirls.")
diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm
index d1a77b6e7a..547de5b0b2 100644
--- a/code/modules/economy/vending.dm
+++ b/code/modules/economy/vending.dm
@@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(vending_products)
return
return
-/obj/machinery/vending/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/vending/emag_act(remaining_charges, mob/user)
if(!emagged)
emagged = 1
to_chat(user, span_filter_notice("You short out \the [src]'s product lock."))
@@ -269,7 +269,7 @@ GLOBAL_LIST_EMPTY(vending_products)
*
* user is the mob who gets the change.
*/
-/obj/machinery/vending/proc/pay_with_cash(var/obj/item/spacecash/cashmoney, mob/user)
+/obj/machinery/vending/proc/pay_with_cash(obj/item/spacecash/cashmoney, mob/user)
if(currently_vending.price > cashmoney.worth)
// This is not a status display message, since it's something the character
@@ -298,7 +298,7 @@ GLOBAL_LIST_EMPTY(vending_products)
* Takes payment for whatever is the currently_vending item. Returns 1 if
* successful, 0 if failed.
*/
-/obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/spacecash/ewallet/wallet, mob/user)
+/obj/machinery/vending/proc/pay_with_ewallet(obj/item/spacecash/ewallet/wallet, mob/user)
visible_message(span_info("\The [user] swipes \the [wallet] through \the [src]."))
playsound(src, 'sound/machines/id_swipe.ogg', 50, 1)
if(currently_vending.price > wallet.worth)
@@ -332,7 +332,7 @@ GLOBAL_LIST_EMPTY(vending_products)
*
* Called after the money has already been taken from the customer.
*/
-/obj/machinery/vending/proc/credit_purchase(var/target as text)
+/obj/machinery/vending/proc/credit_purchase(target as text)
GLOB.vendor_account.money += currently_vending.price
var/datum/transaction/T = new()
@@ -612,7 +612,7 @@ GLOBAL_LIST_EMPTY(vending_products)
SStgui.update_uis(src)
-/obj/machinery/vending/proc/do_logging(datum/stored_item/vending_product/R, mob/user, var/vending = 0)
+/obj/machinery/vending/proc/do_logging(datum/stored_item/vending_product/R, mob/user, vending = 0)
if(user.GetIdCard())
var/obj/item/card/id/tempid = user.GetIdCard()
var/list/list_item = list()
@@ -655,7 +655,7 @@ GLOBAL_LIST_EMPTY(vending_products)
* Checks if item is vendable in this machine should be performed before
* calling. W is the item being inserted, R is the associated vending_product entry.
*/
-/obj/machinery/vending/proc/stock(obj/item/W, var/datum/stored_item/vending_product/R, var/mob/user)
+/obj/machinery/vending/proc/stock(obj/item/W, datum/stored_item/vending_product/R, mob/user)
if(!user.unEquip(W))
return
@@ -687,7 +687,7 @@ GLOBAL_LIST_EMPTY(vending_products)
return
-/obj/machinery/vending/proc/speak(var/message)
+/obj/machinery/vending/proc/speak(message)
if(stat & NOPOWER)
return
diff --git a/code/modules/emotes/custom_emote.dm b/code/modules/emotes/custom_emote.dm
index 91086a8194..2a97876e71 100644
--- a/code/modules/emotes/custom_emote.dm
+++ b/code/modules/emotes/custom_emote.dm
@@ -1,6 +1,6 @@
/// This is the custom_emote that you'll want to use if you want the mob to be able to input their emote.
-/mob/proc/custom_emote(var/m_type = VISIBLE_MESSAGE, var/message, var/range = world.view, var/check_stat = TRUE)
+/mob/proc/custom_emote(m_type = VISIBLE_MESSAGE, message, range = world.view, check_stat = TRUE)
if((check_stat && (src && stat)) || is_paralyzed() || (!use_me && usr == src))
to_chat(src, "You are unable to emote.")
@@ -15,14 +15,14 @@
/// This is the custom_emote that you'll want to use if you're forcing something to custom emote with no input from the mob.
/// By default, we have a visible message, our range is world.view, and we do NOT check the stat.
-/mob/proc/automatic_custom_emote(var/m_type = VISIBLE_MESSAGE, var/message, var/range = world.view, var/check_stat = FALSE)
+/mob/proc/automatic_custom_emote(m_type = VISIBLE_MESSAGE, message, range = world.view, check_stat = FALSE)
if(check_stat && (src && stat) || is_paralyzed())
return
var/input = message
process_automatic_emote(m_type, message, input, range)
//The actual meat and potatoes of the emote processing.
-/mob/proc/process_normal_emote(var/m_type = VISIBLE_MESSAGE, var/message, var/input, var/range = world.view)
+/mob/proc/process_normal_emote(m_type = VISIBLE_MESSAGE, message, input, range = world.view)
var/list/formatted
var/runemessage
if(input)
@@ -38,7 +38,7 @@
log_the_emote(m_type, message, input, range, runemessage)
-/mob/proc/process_automatic_emote(var/m_type = VISIBLE_MESSAGE, var/message, var/input, var/range = world.view)
+/mob/proc/process_automatic_emote(m_type = VISIBLE_MESSAGE, message, input, range = world.view)
var/list/formatted
var/runemessage
if(input)
diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
index 11c2dcdf83..7eddee5f53 100644
--- a/code/modules/emotes/definitions/audible.dm
+++ b/code/modules/emotes/definitions/audible.dm
@@ -24,7 +24,7 @@
emote_message_3p = "gasps."
conscious = FALSE
-/datum/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/gasp/get_emote_sound(atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -338,7 +338,7 @@
key = "goodripsound"
emote_message_3p = "drips goo."
-/datum/decl/emote/audible/goodripsound/do_extra(var/mob/user)
+/datum/decl/emote/audible/goodripsound/do_extra(mob/user)
..()
var/goo_sounds = list (
'sound/mob/spooky/decay1.ogg',
diff --git a/code/modules/emotes/definitions/audible_belch.dm b/code/modules/emotes/definitions/audible_belch.dm
index 268e98916c..126312c585 100644
--- a/code/modules/emotes/definitions/audible_belch.dm
+++ b/code/modules/emotes/definitions/audible_belch.dm
@@ -4,7 +4,7 @@
message_type = AUDIBLE_MESSAGE
sound_preferences = list(/datum/preference/toggle/emote_noises, /datum/preference/toggle/belch_noises)
-/datum/decl/emote/audible/belch/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/belch/get_emote_sound(atom/user)
return list(
"sound" = sound(get_sfx("belches")),
"vol" = emote_volume / 2
diff --git a/code/modules/emotes/definitions/audible_cough.dm b/code/modules/emotes/definitions/audible_cough.dm
index 44d5f0b3e5..700df8c409 100644
--- a/code/modules/emotes/definitions/audible_cough.dm
+++ b/code/modules/emotes/definitions/audible_cough.dm
@@ -14,7 +14,7 @@
conscious = FALSE
// emote_sound_synthetic = list()
-/datum/decl/emote/audible/cough/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/cough/get_emote_sound(atom/user)
if(ishuman(user) && !check_synthetic(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.cough_volume
diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
index 479f91cde0..3fc35c968c 100644
--- a/code/modules/emotes/definitions/audible_furry_vr.dm
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -167,7 +167,7 @@
var/list/bigsound = list('sound/voice/teppi/gyooh1.ogg', 'sound/voice/teppi/gyooh2.ogg', 'sound/voice/teppi/gyooh3.ogg', 'sound/voice/teppi/gyooh4.ogg', 'sound/voice/teppi/gyooh5.ogg','sound/voice/teppi/gyooh6.ogg')
var/list/smolsound = list('sound/voice/teppi/whine1.ogg', 'sound/voice/teppi/whine2.ogg')
-/datum/decl/emote/audible/gyoh/get_emote_sound(var/mob/living/user)
+/datum/decl/emote/audible/gyoh/get_emote_sound(mob/living/user)
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
emote_sound = pick(smolsound)
@@ -194,7 +194,7 @@
var/list/bigsound = list('sound/voice/teppi/rumble.ogg')
var/list/smolsound = list('sound/voice/teppi/cute_rumble.ogg')
-/datum/decl/emote/audible/rumble/get_emote_sound(var/mob/living/user)
+/datum/decl/emote/audible/rumble/get_emote_sound(mob/living/user)
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi))
if(istype(user, /mob/living/simple_mob/vore/alienanimals/teppi/baby))
emote_sound = pick(smolsound)
diff --git a/code/modules/emotes/definitions/audible_pain.dm b/code/modules/emotes/definitions/audible_pain.dm
index 2735f2ee08..287f3162f4 100644
--- a/code/modules/emotes/definitions/audible_pain.dm
+++ b/code/modules/emotes/definitions/audible_pain.dm
@@ -3,7 +3,7 @@
emote_message_1p = "You yell in pain!"
emote_message_3p = "yells in pain!"
-/datum/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_1p(atom/user, atom/target, extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "You [pick(H.species.pain_verb_1p)] in pain!"
@@ -13,7 +13,7 @@
return "You [pick(M.pain_emote_1p)]!"
. = ..()
-/datum/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_3p(atom/user, atom/target, extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "[pick(H.species.pain_verb_3p)] in pain!"
@@ -23,7 +23,7 @@
return "[pick(M.pain_emote_3p)]!"
. = ..()
-/datum/decl/emote/audible/pain/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/pain/get_emote_sound(atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/emotes/definitions/audible_scream.dm b/code/modules/emotes/definitions/audible_scream.dm
index c0295a9177..2ad9ceb782 100644
--- a/code/modules/emotes/definitions/audible_scream.dm
+++ b/code/modules/emotes/definitions/audible_scream.dm
@@ -3,7 +3,7 @@
emote_message_1p = "You scream!"
emote_message_3p = "screams!"
-/datum/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scream/get_emote_sound(atom/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.scream_volume
@@ -14,13 +14,13 @@
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)
-/datum/decl/emote/audible/scream/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/scream/get_emote_message_1p(atom/user, atom/target, extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "You [H.species.scream_verb_1p]!"
. = ..()
-/datum/decl/emote/audible/scream/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/scream/get_emote_message_3p(atom/user, atom/target, extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "[H.species.scream_verb_3p]!"
diff --git a/code/modules/emotes/definitions/audible_scream_ch.dm b/code/modules/emotes/definitions/audible_scream_ch.dm
index f71bd65342..d2407a30c6 100644
--- a/code/modules/emotes/definitions/audible_scream_ch.dm
+++ b/code/modules/emotes/definitions/audible_scream_ch.dm
@@ -1,4 +1,4 @@
-/datum/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scream/get_emote_sound(atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/emotes/definitions/audible_scream_vr.dm b/code/modules/emotes/definitions/audible_scream_vr.dm
index 5696a5e8f3..c89952790c 100644
--- a/code/modules/emotes/definitions/audible_scream_vr.dm
+++ b/code/modules/emotes/definitions/audible_scream_vr.dm
@@ -1,4 +1,4 @@
-/datum/decl/emote/audible/scream/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scream/get_emote_sound(atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/emotes/definitions/audible_slap.dm b/code/modules/emotes/definitions/audible_slap.dm
index 3876d7cc72..462e7b1b5d 100644
--- a/code/modules/emotes/definitions/audible_slap.dm
+++ b/code/modules/emotes/definitions/audible_slap.dm
@@ -15,7 +15,7 @@
emote_message_3p_target = span_danger(emote_message_3p_target)
emote_message_3p = span_danger(emote_message_3p)
-/datum/decl/emote/audible/slap/do_extra(var/atom/user, var/atom/target)
+/datum/decl/emote/audible/slap/do_extra(atom/user, atom/target)
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/H = target
diff --git a/code/modules/emotes/definitions/audible_snap.dm b/code/modules/emotes/definitions/audible_snap.dm
index d14d141c19..a979d8b176 100644
--- a/code/modules/emotes/definitions/audible_snap.dm
+++ b/code/modules/emotes/definitions/audible_snap.dm
@@ -6,7 +6,7 @@
emote_message_3p_target = "snaps USER_THEIR fingers at TARGET."
emote_sound = 'sound/effects/fingersnap.ogg'
-/datum/decl/emote/audible/snap/proc/can_snap(var/atom/user)
+/datum/decl/emote/audible/snap/proc/can_snap(atom/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
for(var/limb in list(BP_L_HAND, BP_R_HAND))
@@ -22,7 +22,7 @@
else //VOREStation Addition End
return FALSE
-/datum/decl/emote/audible/snap/do_emote(var/atom/user, var/extra_params)
+/datum/decl/emote/audible/snap/do_emote(atom/user, extra_params)
if(!can_snap(user))
to_chat(user, span_warning("You need at least one working hand to snap your fingers."))
return FALSE
diff --git a/code/modules/emotes/definitions/audible_sneeze.dm b/code/modules/emotes/definitions/audible_sneeze.dm
index 96a0ff4dba..d84c2aa226 100644
--- a/code/modules/emotes/definitions/audible_sneeze.dm
+++ b/code/modules/emotes/definitions/audible_sneeze.dm
@@ -7,7 +7,7 @@
emote_message_synthetic_3p = "emits a robotic sneeze."
emote_message_synthetic_3p_target = "emits a robotic sneeze towards TARGET."
-/datum/decl/emote/audible/sneeze/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/sneeze/get_emote_sound(atom/user)
if(ishuman(user) && !check_synthetic(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.sneeze_volume
diff --git a/code/modules/emotes/definitions/belly_rub.dm b/code/modules/emotes/definitions/belly_rub.dm
index fbcf2d6040..c0cbd6e48d 100644
--- a/code/modules/emotes/definitions/belly_rub.dm
+++ b/code/modules/emotes/definitions/belly_rub.dm
@@ -8,7 +8,7 @@
emote_message_3p = "rubs their belly!"
emote_message_3p_target = "rubs TARGET's belly!"
-/datum/decl/emote/visible/bellyrub/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/bellyrub/get_emote_message_1p(atom/user, atom/target, extra_params)
if(!target && isliving(user)) //We shouldn't NEED an isliving check here but...Whatever, safety first.
var/mob/living/U = user
U.vore_bellyrub(U)
@@ -23,5 +23,5 @@
to_chat(user, "You can not rub [target]'s belly.")
return
-/datum/decl/emote/visible/bellyrub/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/bellyrub/get_emote_message_3p(atom/user, atom/target, extra_params)
return
diff --git a/code/modules/emotes/definitions/helpers_vr.dm b/code/modules/emotes/definitions/helpers_vr.dm
index 266634764a..8d1de4b81c 100644
--- a/code/modules/emotes/definitions/helpers_vr.dm
+++ b/code/modules/emotes/definitions/helpers_vr.dm
@@ -8,11 +8,11 @@
return FALSE
return ..()
-/datum/decl/emote/helper/vwag/do_emote(var/mob/living/carbon/human/user, var/extra_params)
+/datum/decl/emote/helper/vwag/do_emote(mob/living/carbon/human/user, extra_params)
if(user.toggle_tail(message = 1))
return ..()
-/datum/decl/emote/helper/vwag/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
+/datum/decl/emote/helper/vwag/get_emote_message_3p(mob/living/carbon/human/user, atom/target, extra_params)
return "[user.wagging ? "starts" : "stops"] wagging USER_THEIR tail."
@@ -25,9 +25,9 @@
return FALSE
return ..()
-/datum/decl/emote/helper/vflap/do_emote(var/mob/living/carbon/human/user, var/extra_params)
+/datum/decl/emote/helper/vflap/do_emote(mob/living/carbon/human/user, extra_params)
if(user.toggle_wing(message = 1))
return ..()
-/datum/decl/emote/helper/vflap/get_emote_message_3p(var/mob/living/carbon/human/user, var/atom/target, var/extra_params)
+/datum/decl/emote/helper/vflap/get_emote_message_3p(mob/living/carbon/human/user, atom/target, extra_params)
return "[user.flapping ? "starts" : "stops"] flapping USER_THEIR wings."
diff --git a/code/modules/emotes/definitions/human.dm b/code/modules/emotes/definitions/human.dm
index 024e426397..1d540964d9 100644
--- a/code/modules/emotes/definitions/human.dm
+++ b/code/modules/emotes/definitions/human.dm
@@ -1,4 +1,4 @@
-/datum/decl/emote/human/mob_can_use(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/mob_can_use(mob/living/carbon/human/user)
return ..() && (istype(user))//What does a mouth have to do with wagging?? && user.check_has_mouth() && !user.isSynthetic())
/datum/decl/emote/human/deathgasp
@@ -19,47 +19,47 @@
return
. = ..()
-/datum/decl/emote/human/deathgasp/get_emote_message_3p(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/deathgasp/get_emote_message_3p(mob/living/carbon/human/user)
return "[user.species.get_death_message(user)]"
/datum/decl/emote/human/swish
key = "swish"
-/datum/decl/emote/human/swish/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/swish/do_emote(mob/living/carbon/human/user)
user.animate_tail_once()
/datum/decl/emote/human/wag
key = "wag"
-/datum/decl/emote/human/wag/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/wag/do_emote(mob/living/carbon/human/user)
user.animate_tail_start()
/datum/decl/emote/human/sway
key = "sway"
-/datum/decl/emote/human/sway/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/sway/do_emote(mob/living/carbon/human/user)
user.animate_tail_start()
/datum/decl/emote/human/qwag
key = "qwag"
-/datum/decl/emote/human/qwag/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/qwag/do_emote(mob/living/carbon/human/user)
user.animate_tail_fast()
/datum/decl/emote/human/fastsway
key = "fastsway"
-/datum/decl/emote/human/fastsway/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/fastsway/do_emote(mob/living/carbon/human/user)
user.animate_tail_fast()
/datum/decl/emote/human/swag
key = "swag"
-/datum/decl/emote/human/swag/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/swag/do_emote(mob/living/carbon/human/user)
user.animate_tail_stop()
/datum/decl/emote/human/stopsway
key = "stopsway"
-/datum/decl/emote/human/stopsway/do_emote(var/mob/living/carbon/human/user)
+/datum/decl/emote/human/stopsway/do_emote(mob/living/carbon/human/user)
user.animate_tail_stop()
diff --git a/code/modules/emotes/definitions/slimes.dm b/code/modules/emotes/definitions/slimes.dm
index f61bd09183..0f6ee7ea63 100644
--- a/code/modules/emotes/definitions/slimes.dm
+++ b/code/modules/emotes/definitions/slimes.dm
@@ -2,13 +2,13 @@
key = "nomood"
var/mood
-/datum/decl/emote/slime/do_extra(var/mob/living/simple_mob/slime/user)
+/datum/decl/emote/slime/do_extra(mob/living/simple_mob/slime/user)
. = ..()
if(istype(user))
user.mood = mood
user.update_icon()
-/datum/decl/emote/slime/mob_can_use(var/atom/user)
+/datum/decl/emote/slime/mob_can_use(atom/user)
return ..() && isslime(user)
/datum/decl/emote/slime/pout
diff --git a/code/modules/emotes/definitions/synthetics.dm b/code/modules/emotes/definitions/synthetics.dm
index 5258861c88..3829c66262 100644
--- a/code/modules/emotes/definitions/synthetics.dm
+++ b/code/modules/emotes/definitions/synthetics.dm
@@ -3,7 +3,7 @@
emote_message_3p = "pings."
emote_sound = 'sound/machines/ping.ogg'
-/datum/decl/emote/audible/synth/mob_can_use(var/mob/living/user)
+/datum/decl/emote/audible/synth/mob_can_use(mob/living/user)
if(istype(user) && user.isSynthetic())
return ..()
return FALSE
@@ -45,7 +45,7 @@
emote_message_3p_target = "shows TARGET USER_THEIR legal authorization barcode."
emote_sound = 'sound/voice/biamthelaw.ogg'
-/datum/decl/emote/audible/synth/security/mob_can_use(var/mob/living/silicon/robot/user)
+/datum/decl/emote/audible/synth/security/mob_can_use(mob/living/silicon/robot/user)
return ..() && (istype(user) && (istype(user.module, /obj/item/robot_module/robot/security)))
/datum/decl/emote/audible/synth/security/halt
diff --git a/code/modules/emotes/definitions/visible.dm b/code/modules/emotes/definitions/visible.dm
index 1af40c3a97..ff9ca23888 100644
--- a/code/modules/emotes/definitions/visible.dm
+++ b/code/modules/emotes/definitions/visible.dm
@@ -53,7 +53,7 @@
key = "collapse"
emote_message_3p = "collapses!"
-/datum/decl/emote/visible/collapse/do_extra(var/mob/user)
+/datum/decl/emote/visible/collapse/do_extra(mob/user)
..()
if(istype(user))
user.Paralyse(2)
@@ -115,7 +115,7 @@
key = "faint"
emote_message_3p = "faints."
-/datum/decl/emote/visible/faint/do_extra(var/mob/user)
+/datum/decl/emote/visible/faint/do_extra(mob/user)
. = ..()
if(iscarbon(user) && !user.sleeping)
user.Sleeping(10)
@@ -227,7 +227,7 @@
emote_message_3p = "shakes hands with USER_SELF."
check_range = 1
-/datum/decl/emote/visible/handshake/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/handshake/get_emote_message_3p(atom/user, atom/target, extra_params)
if(target && !user.Adjacent(target))
return "holds out USER_THEIR hand out to TARGET."
return ..()
@@ -238,7 +238,7 @@
emote_message_3p = "signals."
check_restraints = TRUE
-/datum/decl/emote/visible/signal/get_emote_message_3p(var/mob/living/user, var/atom/target, var/extra_params)
+/datum/decl/emote/visible/signal/get_emote_message_3p(mob/living/user, atom/target, extra_params)
if(istype(user) && (!user.get_active_hand() || !user.get_inactive_hand()))
var/t1 = round(text2num(extra_params))
if(isnum(t1) && t1 <= 5)
@@ -337,7 +337,7 @@
key = "goodrip"
emote_message_3p = "drips goo."
-/datum/decl/emote/visible/goodrip/do_extra(var/mob/user)
+/datum/decl/emote/visible/goodrip/do_extra(mob/user)
..()
new /obj/effect/decal/cleanable/blood/oil(user)
var/goo_sounds = list (
diff --git a/code/modules/emotes/definitions/visible_animated.dm b/code/modules/emotes/definitions/visible_animated.dm
index b51937b725..ee6f5324f0 100644
--- a/code/modules/emotes/definitions/visible_animated.dm
+++ b/code/modules/emotes/definitions/visible_animated.dm
@@ -68,7 +68,7 @@
SOUTH
)
-/datum/decl/emote/visible/floorspin/proc/spin_dir(var/mob/user)
+/datum/decl/emote/visible/floorspin/proc/spin_dir(mob/user)
set waitfor = FALSE
for(var/i in spin_dirs)
user.set_dir(i)
@@ -76,7 +76,7 @@
if(QDELETED(user))
return
-/datum/decl/emote/visible/floorspin/proc/spin_anim(var/mob/user)
+/datum/decl/emote/visible/floorspin/proc/spin_anim(mob/user)
set waitfor = FALSE
sleep(1)
if(!QDELETED(user))
diff --git a/code/modules/emotes/definitions/visible_vomit.dm b/code/modules/emotes/definitions/visible_vomit.dm
index 27b721b7bc..96127d74e3 100644
--- a/code/modules/emotes/definitions/visible_vomit.dm
+++ b/code/modules/emotes/definitions/visible_vomit.dm
@@ -1,7 +1,7 @@
/datum/decl/emote/visible/vomit
key = "vomit"
-/datum/decl/emote/visible/vomit/do_emote(var/atom/user, var/extra_params)
+/datum/decl/emote/visible/vomit/do_emote(atom/user, extra_params)
if(isliving(user))
var/mob/living/M = user
if(!M.isSynthetic())
diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm
index 92fd8b15dc..7d1b9d7414 100644
--- a/code/modules/emotes/emote_define.dm
+++ b/code/modules/emotes/emote_define.dm
@@ -4,7 +4,7 @@
// gender-appropriate version of the same.
// - Impaired messages do not do any substitutions.
-/proc/get_emote_by_key(var/key)
+/proc/get_emote_by_key(key)
if(!LAZYLEN(GLOB.emotes_by_key))
GLOB.decls_repository.get_decls_of_type(/datum/decl/emote) // GLOB.emotes_by_key will be updated in emote Initialize()
return GLOB.emotes_by_key[key]
@@ -49,7 +49,7 @@
if(key)
LAZYSET(GLOB.emotes_by_key, key, src)
-/datum/decl/emote/proc/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/proc/get_emote_message_1p(atom/user, atom/target, extra_params)
if(target)
if(emote_message_synthetic_1p_target && check_synthetic(user))
return emote_message_synthetic_1p_target
@@ -58,7 +58,7 @@
return emote_message_synthetic_1p
return emote_message_1p
-/datum/decl/emote/proc/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/proc/get_emote_message_3p(atom/user, atom/target, extra_params)
if(target)
if(emote_message_synthetic_3p_target && check_synthetic(user))
return emote_message_synthetic_3p_target
@@ -67,7 +67,7 @@
return emote_message_synthetic_3p
return emote_message_3p
-/datum/decl/emote/proc/get_emote_sound(var/atom/user)
+/datum/decl/emote/proc/get_emote_sound(atom/user)
if(check_synthetic(user) && emote_sound_synthetic)
return list(
"sound" = emote_sound_synthetic,
@@ -79,7 +79,7 @@
"vol" = emote_volume
)
-/datum/decl/emote/proc/do_emote(var/atom/user, var/extra_params)
+/datum/decl/emote/proc/do_emote(atom/user, extra_params)
if(ismob(user) && check_restraints)
var/mob/M = user
if(M.transforming) //Transforming acts as a stasis.
@@ -149,7 +149,7 @@
do_sound(user)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_EMOTE_PERFORMED, user, extra_params)
-/datum/decl/emote/proc/replace_target_tokens(var/msg, var/atom/target)
+/datum/decl/emote/proc/replace_target_tokens(msg, atom/target)
. = msg
if(istype(target))
. = replacetext(., "TARGET_THEM", target.p_them())
@@ -157,7 +157,7 @@
. = replacetext(., "TARGET_SELF", target.p_themselves())
. = replacetext(., "TARGET", span_bold("\the [target]"))
-/datum/decl/emote/proc/replace_user_tokens(var/msg, var/atom/user)
+/datum/decl/emote/proc/replace_user_tokens(msg, atom/user)
. = msg
if(istype(user))
. = replacetext(., "USER_THEM", user.p_them())
@@ -165,15 +165,15 @@
. = replacetext(., "USER_SELF", user.p_themselves())
. = replacetext(., "USER", span_bold("\the [user]"))
-/datum/decl/emote/proc/get_radio_message(var/atom/user)
+/datum/decl/emote/proc/get_radio_message(atom/user)
if(emote_message_radio_synthetic && check_synthetic(user))
return emote_message_radio_synthetic
return emote_message_radio
-/datum/decl/emote/proc/do_extra(var/atom/user, var/atom/target)
+/datum/decl/emote/proc/do_extra(atom/user, atom/target)
return
-/datum/decl/emote/proc/do_sound(var/atom/user)
+/datum/decl/emote/proc/do_sound(atom/user)
var/list/use_sound = get_emote_sound(user)
if(!islist(use_sound) || length(use_sound) < 2)
return
@@ -195,7 +195,7 @@
else
playsound(user.loc, sound_to_play, use_sound["vol"], sound_vary, extrarange = use_sound["exr"], frequency = null, preference = sound_preferences, volume_channel = use_sound["volchannel"])
-/datum/decl/emote/proc/mob_can_use(var/mob/user)
+/datum/decl/emote/proc/mob_can_use(mob/user)
return istype(user) && user.stat != DEAD && (type in user.get_available_emotes())
/datum/decl/emote/proc/can_target()
@@ -204,7 +204,7 @@
/datum/decl/emote/dd_SortValue()
return key
-/datum/decl/emote/proc/check_synthetic(var/mob/living/user)
+/datum/decl/emote/proc/check_synthetic(mob/living/user)
. = istype(user) && user.isSynthetic()
if(!. && ishuman(user) && message_type == AUDIBLE_MESSAGE)
var/mob/living/carbon/human/H = user
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index 681aa10a72..98264e342d 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -6,14 +6,14 @@
/mob/proc/get_available_emotes()
return GLOB.default_mob_emotes.Copy()
-/mob/proc/can_emote(var/emote_type)
+/mob/proc/can_emote(emote_type)
return (stat == CONSCIOUS)
#define EMOTE_REFRESH_SPAM_COOLDOWN (5 SECONDS)
-/mob/living/can_emote(var/emote_type)
+/mob/living/can_emote(emote_type)
return (..() && !(silent && emote_type == AUDIBLE_MESSAGE))
-/mob/proc/emote(var/act, var/m_type, var/message)
+/mob/proc/emote(act, m_type, message)
set waitfor = FALSE
// s-s-snowflake
if(src.stat == DEAD && act != "deathgasp")
@@ -105,7 +105,7 @@
#undef EMOTE_REFRESH_SPAM_COOLDOWN
-/mob/proc/format_emote(var/emoter = null, var/message = null)
+/mob/proc/format_emote(emoter = null, message = null)
var/pretext
var/subtext
var/nametext
@@ -161,7 +161,7 @@
return list("pretext" = pretext, "nametext" = nametext, "subtext" = subtext)
// Specific mob type exceptions below.
-/mob/living/silicon/ai/emote(var/act, var/type, var/message)
+/mob/living/silicon/ai/emote(act, type, message)
var/obj/machinery/hologram/holopad/T = src.holo
if(T && T.masters[src]) //Is the AI using a holopad?
src.holopad_emote(message)
diff --git a/code/modules/entopics_vr/entopics.dm b/code/modules/entopics_vr/entopics.dm
index f9b64a9315..91798d6dc7 100644
--- a/code/modules/entopics_vr/entopics.dm
+++ b/code/modules/entopics_vr/entopics.dm
@@ -13,7 +13,7 @@
var/image/my_image
var/registered = FALSE // Less expensive to make it a finite state than to use |= on entopic_images or anything like that.
-/datum/entopic/New(var/atom/aholder, var/icon/aicon, var/aicon_state, var/aalpha, var/aplane, var/alayer, var/aoverride, var/aname, var/asuffix)
+/datum/entopic/New(atom/aholder, icon/aicon, aicon_state, aalpha, aplane, alayer, aoverride, aname, asuffix)
ASSERT(aholder && (isicon(aicon) || isicon(icon)))
//Everything we need to set in the initializer
@@ -118,7 +118,7 @@
. = ..()
ent_debug = new(aholder = src, aicon = icon, aicon_state = "holo_Jin")
-/proc/entopic_icon_helper(var/atom/A,var/holo = TRUE)
+/proc/entopic_icon_helper(atom/A,holo = TRUE)
ASSERT(A)
var/icon/CI = getCompoundIcon(A)
diff --git a/code/modules/entrepreneur/entrepreneur_items.dm b/code/modules/entrepreneur/entrepreneur_items.dm
index d3ee41ae8a..53597220f9 100644
--- a/code/modules/entrepreneur/entrepreneur_items.dm
+++ b/code/modules/entrepreneur/entrepreneur_items.dm
@@ -283,7 +283,7 @@
icon = 'icons/obj/entrepreneur.dmi'
icon_state = "exercise_mat"
-/obj/item/bedsheet/pillow/exercise/attackby(var/obj/item/component, mob/user as mob)
+/obj/item/bedsheet/pillow/exercise/attackby(obj/item/component, mob/user as mob)
return
/obj/item/entrepreneur/dumbbell
@@ -444,7 +444,7 @@
return 0
next_result = tgui_input_list(user, "What should it land on next?", "Next result", possible_results)
-/obj/item/entrepreneur/spirit_board/attack_ghost(var/mob/observer/dead/user)
+/obj/item/entrepreneur/spirit_board/attack_ghost(mob/observer/dead/user)
if(!ghost_enabled)
return
if(jobban_isbanned(user, JOB_GHOSTROLES))
diff --git a/code/modules/env_message/env_message.dm b/code/modules/env_message/env_message.dm
index b30a64ad87..5d8be0d55e 100644
--- a/code/modules/env_message/env_message.dm
+++ b/code/modules/env_message/env_message.dm
@@ -23,11 +23,11 @@ GLOBAL_LIST_EMPTY(env_messages)
for(var/tckey in message_list)
. += message_list[tckey]
-/obj/effect/env_message/proc/add_message(var/tckey, var/message)
+/obj/effect/env_message/proc/add_message(tckey, message)
message_list[tckey] = message
update_message()
-/obj/effect/env_message/proc/remove_message(var/tckey)
+/obj/effect/env_message/proc/remove_message(tckey)
message_list -= tckey
if(!message_list.len)
qdel(src)
@@ -59,7 +59,7 @@ GLOBAL_LIST_EMPTY(env_messages)
..()
-/proc/clear_env_message(var/tckey)
+/proc/clear_env_message(tckey)
for(var/obj/effect/env_message/EM in GLOB.env_messages)
if(tckey in EM.message_list)
EM.remove_message(tckey)
diff --git a/code/modules/eventkit/collector_event/blockers.dm b/code/modules/eventkit/collector_event/blockers.dm
index b35db0d84c..5d7be25250 100644
--- a/code/modules/eventkit/collector_event/blockers.dm
+++ b/code/modules/eventkit/collector_event/blockers.dm
@@ -70,7 +70,7 @@
. = ..()
icon_state = "[base_icon]_[block_amount ? "off" : "on"]"
-/obj/structure/event_collector_blocker/proc/induce_failure(var/intensity = -1) //progress to remove from the machine
+/obj/structure/event_collector_blocker/proc/induce_failure(intensity = -1) //progress to remove from the machine
if(intensity == -1)
intensity = default_block_amount
@@ -100,7 +100,7 @@
. += span_notice("Looks like it's functioning normally")
-/obj/structure/event_collector_blocker/proc/get_repair_message(var/mob/user)
+/obj/structure/event_collector_blocker/proc/get_repair_message(mob/user)
return "[user] repairs \the [src]!"
/obj/structure/event_collector_blocker/attack_hand(mob/user)
@@ -125,7 +125,7 @@
else
to_chat(user,span_notice("this doesn't look like the right tool for the job..."))
-/obj/structure/event_collector_blocker/proc/pre_repair_handling(var/obj/item/O,var/toolType,var/mob/user) //can we use this tool?
+/obj/structure/event_collector_blocker/proc/pre_repair_handling(obj/item/O,toolType,mob/user) //can we use this tool?
switch(toolType)
if(TOOL_WELDER)
var/obj/item/weldingtool/welder = O.get_welder()
@@ -150,7 +150,7 @@
return FALSE
return TRUE
-/obj/structure/event_collector_blocker/proc/post_repair_handling(var/obj/item/O,var/toolType,var/mob/user)
+/obj/structure/event_collector_blocker/proc/post_repair_handling(obj/item/O,toolType,mob/user)
switch(toolType) //snowflake code time
if(TOOL_WELDER)
var/obj/item/weldingtool/welder = O.get_welder()
@@ -167,7 +167,7 @@
name = "Breaker"
desc = "I barely know er!"
-/obj/structure/event_collector_blocker/breaker/get_repair_message(var/mob/user)
+/obj/structure/event_collector_blocker/breaker/get_repair_message(mob/user)
return "[user] flips \the [src] back on!"
/obj/structure/event_collector_blocker/circuit_panel
diff --git a/code/modules/eventkit/collector_event/event_collector.dm b/code/modules/eventkit/collector_event/event_collector.dm
index d953f19c3b..a44e959723 100644
--- a/code/modules/eventkit/collector_event/event_collector.dm
+++ b/code/modules/eventkit/collector_event/event_collector.dm
@@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(event_collector_blockers,list()) //ditto
. += blocker.block_amount
-/obj/structure/event_collector/proc/jiggle_animation(var/intensity = 1)
+/obj/structure/event_collector/proc/jiggle_animation(intensity = 1)
var/matrix/secondary_effect = matrix()
var/matrix/effect = matrix()
effect.Turn(-5*intensity)
@@ -255,7 +255,7 @@ GLOBAL_LIST_INIT(event_collector_blockers,list()) //ditto
for(var/atom/movable/to_move in contents)
to_move.forceMove(get_turf(src))
-/obj/structure/event_collector/proc/post_object_insert(var/mob/user)
+/obj/structure/event_collector/proc/post_object_insert(mob/user)
return
/obj/structure/event_collector/proc/post_recipe_complete()
diff --git a/code/modules/eventkit/medical_issues.dm b/code/modules/eventkit/medical_issues.dm
index 5d8d6713f5..2c9985fa60 100644
--- a/code/modules/eventkit/medical_issues.dm
+++ b/code/modules/eventkit/medical_issues.dm
@@ -115,7 +115,7 @@
// Proc for setting all this up for GMs
-/mob/living/carbon/human/proc/custom_medical_issue(var/mob/user)
+/mob/living/carbon/human/proc/custom_medical_issue(mob/user)
var/list/external_organ_surgeries = list("bone reinforcement","remove growths","redirect blood vessels","extract object","flesh graft")
var/list/internal_organ_surgeries = list("remove growths","redirect blood vessels","close holes","ultrasound","reoxygenate tissue")
@@ -223,7 +223,7 @@
else
to_chat(user,"[issue_name] can only be cured by amputation or removal of \the [issue_organ]!")
-/mob/living/carbon/human/proc/clear_medical_issue(var/mob/user)
+/mob/living/carbon/human/proc/clear_medical_issue(mob/user)
var/list/all_issues = list()
for(var/obj/item/organ/O in contents)
for(var/datum/medical_issue/MI in O.medical_issues)
diff --git a/code/modules/events/apc_damage.dm b/code/modules/events/apc_damage.dm
index 49a9a27e82..a7a6d03f35 100644
--- a/code/modules/events/apc_damage.dm
+++ b/code/modules/events/apc_damage.dm
@@ -45,6 +45,6 @@
return pick(apcs)
-/datum/event/apc_damage/proc/is_valid_apc(var/obj/machinery/power/apc/apc)
+/datum/event/apc_damage/proc/is_valid_apc(obj/machinery/power/apc/apc)
var/turf/T = get_turf(apc)
return !apc.is_critical && !apc.emagged && T && (T.z in using_map.player_levels)
diff --git a/code/modules/events/camera_damage.dm b/code/modules/events/camera_damage.dm
index 835ecb6b5a..5cc41796de 100644
--- a/code/modules/events/camera_damage.dm
+++ b/code/modules/events/camera_damage.dm
@@ -21,7 +21,7 @@
if(prob(5*severity))
cam.wires.cut(WIRE_CAM_ALARM)
-/datum/event/camera_damage/proc/acquire_random_camera(var/remaining_attempts = 5)
+/datum/event/camera_damage/proc/acquire_random_camera(remaining_attempts = 5)
if(!GLOB.cameranet.cameras.len)
return
if(!remaining_attempts)
@@ -32,7 +32,7 @@
return C
return acquire_random_camera(remaining_attempts--)
-/datum/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
+/datum/event/camera_damage/proc/is_valid_camera(obj/machinery/camera/C)
// Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
var/turf/T = get_turf(C)
return T && C.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
diff --git a/code/modules/events/canister_leak.dm b/code/modules/events/canister_leak.dm
index 22c54a7153..99c2ef8b2f 100644
--- a/code/modules/events/canister_leak.dm
+++ b/code/modules/events/canister_leak.dm
@@ -24,7 +24,7 @@
kill()
return
-/datum/event/canister_leak/proc/break_canister(var/obj/machinery/portable_atmospherics/canister/C)
+/datum/event/canister_leak/proc/break_canister(obj/machinery/portable_atmospherics/canister/C)
log_game("canister_leak event: Canister [C] ([C.x],[C.y],[C.z]) destroyed.")
C.health = 0
C.healthcheck()
diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm
index 0ae855a0bc..db06cf70e6 100644
--- a/code/modules/events/carp_migration.dm
+++ b/code/modules/events/carp_migration.dm
@@ -32,7 +32,7 @@
if(count_spawned_carps() < carp_cap)
spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2)
-/datum/event/carp_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir)
+/datum/event/carp_migration/proc/spawn_fish(num_groups, group_size_min, group_size_max, dir)
if(isnull(dir))
dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal)
@@ -73,7 +73,7 @@
i++
// Spawn a single carp at given location.
-/datum/event/carp_migration/proc/spawn_one_carp(var/loc)
+/datum/event/carp_migration/proc/spawn_one_carp(loc)
var/mob/living/simple_mob/animal/carp_to_spawn = new /mob/living/simple_mob/animal/space/carp/event(loc)
RegisterSignal(carp_to_spawn, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_carp_destruction))
spawned_carp.Add(carp_to_spawn)
diff --git a/code/modules/events/comms_blackout.dm b/code/modules/events/comms_blackout.dm
index 2cd30b71f4..4d232fe3d1 100644
--- a/code/modules/events/comms_blackout.dm
+++ b/code/modules/events/comms_blackout.dm
@@ -1,5 +1,5 @@
-/proc/communications_blackout(var/silent = 1)
+/proc/communications_blackout(silent = 1)
if(!silent)
GLOB.command_announcement.Announce("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT", new_sound = ANNOUNCER_MSG_COMMSBLACKOUT)
diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm
index 30063ff758..82c59e4b37 100644
--- a/code/modules/events/electrical_storm.dm
+++ b/code/modules/events/electrical_storm.dm
@@ -54,7 +54,7 @@
for(var/obj/machinery/power/apc/T in picked_apcs)
affect_apc(T)
-/datum/event/electrical_storm/proc/affect_apc(var/obj/machinery/power/apc/T)
+/datum/event/electrical_storm/proc/affect_apc(obj/machinery/power/apc/T)
// Main breaker is turned off. Consider this APC protected.
if(!T.operating)
return
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index b07ce3e6a3..6981e146de 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -12,7 +12,7 @@
var/list/min_job_count = list()
var/datum/event/event_type
-/datum/event_meta/New(var/event_severity, var/event_name, var/datum/event/type, var/event_weight, var/list/job_weights, var/is_one_shot = 0, var/min_event_weight = 0, var/max_event_weight = 0, var/add_to_queue = 1, var/list/min_jobs)
+/datum/event_meta/New(event_severity, event_name, datum/event/type, event_weight, list/job_weights, is_one_shot = 0, min_event_weight = 0, max_event_weight = 0, add_to_queue = 1, list/min_jobs)
name = event_name
severity = event_severity
event_type = type
@@ -27,7 +27,7 @@
min_job_count = min_jobs
-/datum/event_meta/proc/get_weight(var/list/active_with_role)
+/datum/event_meta/proc/get_weight(list/active_with_role)
if(!enabled)
return 0
@@ -44,7 +44,7 @@
return total_weight
-/datum/event_meta/proc/minimum_active(var/list/active_with_role)
+/datum/event_meta/proc/minimum_active(list/active_with_role)
var/can_fire = TRUE
for(var/role in min_job_count)
if(role in active_with_role)
@@ -165,7 +165,7 @@
/datum/event/proc/get_skybox_image()
return
-/datum/event/New(var/datum/event_meta/EM, external_use = FALSE)
+/datum/event/New(datum/event_meta/EM, external_use = FALSE)
// event needs to be responsible for this, as stuff like APLUs currently make their own events for curious reasons
if(!external_use)
SSevents.active_events += src
diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm
index 2eb3994ddf..474bc760a7 100644
--- a/code/modules/events/event_container.dm
+++ b/code/modules/events/event_container.dm
@@ -62,7 +62,7 @@
available_events -= picked_event
return picked_event
-/datum/event_container/proc/get_weight(var/datum/event_meta/EM, var/list/active_with_role)
+/datum/event_container/proc/get_weight(datum/event_meta/EM, list/active_with_role)
if(!EM.enabled)
return 0
diff --git a/code/modules/events/event_container_vr.dm b/code/modules/events/event_container_vr.dm
index 1124d1ae18..fcaa48d0c3 100644
--- a/code/modules/events/event_container_vr.dm
+++ b/code/modules/events/event_container_vr.dm
@@ -11,7 +11,7 @@
// Adds a list of pre-disabled events to the available events list.
// This keeps them in the rotation, but disabled, so they can be enabled with a click if desired that round.
-/datum/event_container/proc/add_disabled_events(var/list/disabled_events)
+/datum/event_container/proc/add_disabled_events(list/disabled_events)
for(var/datum/event_meta/EM in disabled_events)
EM.enabled = 0
available_events += EM
diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm
index bca76d03e2..bd646d9b3c 100644
--- a/code/modules/events/event_manager.dm
+++ b/code/modules/events/event_manager.dm
@@ -9,7 +9,7 @@
var/row_options3 = " width='150px'"
var/datum/event_container/selected_event_container = null
-/datum/controller/subsystem/events/proc/Interact(var/mob/living/user)
+/datum/controller/subsystem/events/proc/Interact(mob/living/user)
var/html = GetInteractWindow()
diff --git a/code/modules/events/gnat_migration.dm b/code/modules/events/gnat_migration.dm
index 85c958fb35..dcc1cd2c99 100644
--- a/code/modules/events/gnat_migration.dm
+++ b/code/modules/events/gnat_migration.dm
@@ -28,7 +28,7 @@
if(count_spawned_gnats() < gnat_cap)
spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2)
-/datum/event/gnat_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir)
+/datum/event/gnat_migration/proc/spawn_fish(num_groups, group_size_min, group_size_max, dir)
if(isnull(dir))
dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal)
@@ -69,7 +69,7 @@
i++
// Spawn a single gnat at given location.
-/datum/event/gnat_migration/proc/spawn_one_gnat(var/loc)
+/datum/event/gnat_migration/proc/spawn_one_gnat(loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/gnat(loc)
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_gnat_destruction))
spawned_gnat.Add(M)
@@ -83,7 +83,7 @@
. += 1
// If gnat is bomphed, remove it from the list.
-/datum/event/gnat_migration/proc/on_gnat_destruction(var/mob/M)
+/datum/event/gnat_migration/proc/on_gnat_destruction(mob/M)
SIGNAL_HANDLER
spawned_gnat -= M
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
diff --git a/code/modules/events/ian_storm_vr.dm b/code/modules/events/ian_storm_vr.dm
index b84d684b4a..0ebd4bd698 100644
--- a/code/modules/events/ian_storm_vr.dm
+++ b/code/modules/events/ian_storm_vr.dm
@@ -21,7 +21,7 @@
continue
place_ian(T)
-/datum/event/ianstorm/proc/place_ian(var/turf/T)
+/datum/event/ianstorm/proc/place_ian(turf/T)
// Try three times to place an Ian
for(var/i = 0, i < 3, i++)
var/turf/target = get_step(T, pick(GLOB.alldirs))
diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm
index 9e29c84250..666136bdfd 100644
--- a/code/modules/events/infestation.dm
+++ b/code/modules/events/infestation.dm
@@ -132,7 +132,7 @@
if(count_spawned_vermin() < vermin_cap)
spawn_vermin(rand(4,10), prep_size_min, prep_size_max)
-/datum/event/infestation/proc/spawn_vermin(var/num_groups, var/group_size_min, var/group_size_max)
+/datum/event/infestation/proc/spawn_vermin(num_groups, group_size_min, group_size_max)
if(spawn_locations.len) // Okay we've got landmarks, lets use those!
shuffle_inplace(spawn_locations)
num_groups = min(num_groups, spawn_locations.len)
@@ -143,7 +143,7 @@
return
// Spawn a single vermin at given location.
-/datum/event/infestation/proc/spawn_one_vermin(var/loc)
+/datum/event/infestation/proc/spawn_one_vermin(loc)
var/mob/living/simple_mob/animal/M = new spawn_types(loc)
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_vermin_destruction))
spawned_vermin.Add(M)
@@ -157,7 +157,7 @@
. += 1
// If vermin is kill, remove it from the list.
-/datum/event/infestation/proc/on_vermin_destruction(var/mob/M)
+/datum/event/infestation/proc/on_vermin_destruction(mob/M)
SIGNAL_HANDLER
spawned_vermin -= M
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
diff --git a/code/modules/events/jellyfish_migration.dm b/code/modules/events/jellyfish_migration.dm
index 3a1c45e8a8..84123984e5 100644
--- a/code/modules/events/jellyfish_migration.dm
+++ b/code/modules/events/jellyfish_migration.dm
@@ -28,7 +28,7 @@
if(count_spawned_jellyfish() < jellyfish_cap)
spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2)
-/datum/event/jellyfish_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir)
+/datum/event/jellyfish_migration/proc/spawn_fish(num_groups, group_size_min, group_size_max, dir)
if(isnull(dir))
dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal)
@@ -69,7 +69,7 @@
i++
// Spawn a single jellyfish at given location.
-/datum/event/jellyfish_migration/proc/spawn_one_jellyfish(var/loc)
+/datum/event/jellyfish_migration/proc/spawn_one_jellyfish(loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc)
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_jellyfish_destruction))
spawned_jellyfish.Add(M)
@@ -83,7 +83,7 @@
. += 1
// If jellyfish is bomphed, remove it from the list.
-/datum/event/jellyfish_migration/proc/on_jellyfish_destruction(var/mob/M)
+/datum/event/jellyfish_migration/proc/on_jellyfish_destruction(mob/M)
SIGNAL_HANDLER
spawned_jellyfish -= M
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
diff --git a/code/modules/events/meteor_strike_vr.dm b/code/modules/events/meteor_strike_vr.dm
index c4ff35d582..73fc52c166 100644
--- a/code/modules/events/meteor_strike_vr.dm
+++ b/code/modules/events/meteor_strike_vr.dm
@@ -95,7 +95,7 @@
/obj/structure/meteorite/ex_act()
return
-/obj/structure/meteorite/attackby(var/obj/item/I, var/mob/M)
+/obj/structure/meteorite/attackby(obj/item/I, mob/M)
if(istype(I, /obj/item/pickaxe))
var/obj/item/pickaxe/P = I
M.visible_message(span_warning("[M] starts [P.drill_verb] \the [src]."), span_warning("You start [P.drill_verb] \the [src]."))
diff --git a/code/modules/events/ray_migration.dm b/code/modules/events/ray_migration.dm
index 67da449a0d..3247df0beb 100644
--- a/code/modules/events/ray_migration.dm
+++ b/code/modules/events/ray_migration.dm
@@ -28,7 +28,7 @@
if(count_spawned_rays() < ray_cap)
spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2)
-/datum/event/ray_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir)
+/datum/event/ray_migration/proc/spawn_fish(num_groups, group_size_min, group_size_max, dir)
if(isnull(dir))
dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal)
@@ -69,7 +69,7 @@
i++
// Spawn a single ray at given location.
-/datum/event/ray_migration/proc/spawn_one_ray(var/loc)
+/datum/event/ray_migration/proc/spawn_one_ray(loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/ray(loc)
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_ray_destruction))
spawned_ray.Add(M)
@@ -83,7 +83,7 @@
. += 1
// If ray is bomphed, remove it from the list.
-/datum/event/ray_migration/proc/on_ray_destruction(var/mob/M)
+/datum/event/ray_migration/proc/on_ray_destruction(mob/M)
SIGNAL_HANDLER
spawned_ray -= M
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
diff --git a/code/modules/events/shark_migration.dm b/code/modules/events/shark_migration.dm
index ffa840ae83..0c59c68d92 100644
--- a/code/modules/events/shark_migration.dm
+++ b/code/modules/events/shark_migration.dm
@@ -28,7 +28,7 @@
if(count_spawned_sharks() < shark_cap)
spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2)
-/datum/event/shark_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir)
+/datum/event/shark_migration/proc/spawn_fish(num_groups, group_size_min, group_size_max, dir)
if(isnull(dir))
dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal)
@@ -69,7 +69,7 @@
i++
// Spawn a single shark at given location.
-/datum/event/shark_migration/proc/spawn_one_shark(var/loc)
+/datum/event/shark_migration/proc/spawn_one_shark(loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/shark/event(loc)
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_shark_destruction))
spawned_shark.Add(M)
@@ -83,7 +83,7 @@
. += 1
// If shark is bomphed, remove it from the list.
-/datum/event/shark_migration/proc/on_shark_destruction(var/mob/M)
+/datum/event/shark_migration/proc/on_shark_destruction(mob/M)
SIGNAL_HANDLER
spawned_shark -= M
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
diff --git a/code/modules/events/solar_storm.dm b/code/modules/events/solar_storm.dm
index c24a1dfd0c..e5b44a6762 100644
--- a/code/modules/events/solar_storm.dm
+++ b/code/modules/events/solar_storm.dm
@@ -12,7 +12,7 @@
GLOB.command_announcement.Announce("A solar storm has been detected approaching \the [station_name()]. Please halt all EVA activites immediately and return to the interior of the [using_map.facility_type].", "Anomaly Alert", new_sound = ANNOUNCER_MSG_RADIATION)
adjust_solar_output(1.5)
-/datum/event/solar_storm/proc/adjust_solar_output(var/mult = 1)
+/datum/event/solar_storm/proc/adjust_solar_output(mult = 1)
if(isnull(base_solar_gen_rate)) base_solar_gen_rate = GLOB.solar_gen_rate
GLOB.solar_gen_rate = mult * base_solar_gen_rate
diff --git a/code/modules/events/spacefish_migration.dm b/code/modules/events/spacefish_migration.dm
index 442a77422f..10a1cdc4d8 100644
--- a/code/modules/events/spacefish_migration.dm
+++ b/code/modules/events/spacefish_migration.dm
@@ -43,7 +43,7 @@
if(count_spawned_fish() < fish_cap)
spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2)
-/datum/event/spacefish_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir)
+/datum/event/spacefish_migration/proc/spawn_fish(num_groups, group_size_min, group_size_max, dir)
if(isnull(dir))
dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal)
@@ -84,7 +84,7 @@
i++
// Spawn a single fish at given location.
-/datum/event/spacefish_migration/proc/spawn_one_fish(var/loc)
+/datum/event/spacefish_migration/proc/spawn_one_fish(loc)
var/mob/living/simple_mob/animal/M = new fish_type(loc)
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_fish_destruction))
spawned_fish.Add(M)
@@ -98,7 +98,7 @@
. += 1
// If fish is bomphed, remove it from the list.
-/datum/event/spacefish_migration/proc/on_fish_destruction(var/mob/M)
+/datum/event/spacefish_migration/proc/on_fish_destruction(mob/M)
SIGNAL_HANDLER
spawned_fish -= M
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
diff --git a/code/modules/events/spider_migration_yw.dm b/code/modules/events/spider_migration_yw.dm
index 28a4a58527..52717eabeb 100644
--- a/code/modules/events/spider_migration_yw.dm
+++ b/code/modules/events/spider_migration_yw.dm
@@ -24,7 +24,7 @@
else
spawn_spider(rand(1, 3), 1, 2) //1 to 6 spider, alone or in pairs
-/datum/event/spider_migration/proc/spawn_spider(var/num_groups, var/group_size_min=3, var/group_size_max=5)
+/datum/event/spider_migration/proc/spawn_spider(num_groups, group_size_min=3, group_size_max=5)
var/list/spawn_locations = list()
for(var/obj/effect/landmark/C in GLOB.landmarks_list)
diff --git a/code/modules/events/supply_demand_vr.dm b/code/modules/events/supply_demand_vr.dm
index 464aedd869..889b6e94d9 100644
--- a/code/modules/events/supply_demand_vr.dm
+++ b/code/modules/events/supply_demand_vr.dm
@@ -96,7 +96,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
/**
* Event Handler for responding to the supply shuttle arriving at centcom.
*/
-/datum/event/supply_demand/proc/handle_sold_shuttle(var/area/area_shuttle)
+/datum/event/supply_demand/proc/handle_sold_shuttle(area/area_shuttle)
var/match_found = 0;
for(var/atom/movable/MA in area_shuttle)
@@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
/**
* Helper method to check an item against the list of required_items.
*/
-/datum/event/supply_demand/proc/match_item(var/atom/I)
+/datum/event/supply_demand/proc/match_item(atom/I)
for(var/datum/supply_demand_order/meta in required_items)
if(meta.match_item(I))
if(meta.qty_need <= 0)
@@ -138,7 +138,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
* @param to_department - Name of department to deliver to, or null to send to all departments.
* @return 1 if successful, 0 if couldn't send.
*/
-/datum/event/supply_demand/proc/send_console_message(var/message, var/to_department)
+/datum/event/supply_demand/proc/send_console_message(message, to_department)
for(var/obj/machinery/message_server/MS in world)
if(!MS.active) continue
MS.send_rc_message(to_department ? to_department : "All Departments", my_department, message, "", "", 2)
@@ -152,14 +152,14 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
var/qty_orig // How much was requested
var/qty_need // How much we still need
-/datum/supply_demand_order/New(var/qty)
+/datum/supply_demand_order/New(qty)
if(qty) qty_orig = qty
qty_need = qty_orig
/datum/supply_demand_order/proc/describe()
return "[name] - (Qty: [qty_need])"
-/datum/supply_demand_order/proc/match_item(var/atom/I)
+/datum/supply_demand_order/proc/match_item(atom/I)
return 0
//
@@ -168,14 +168,14 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
/datum/supply_demand_order/thing
var/atom/type_path // Type path of the item required
-/datum/supply_demand_order/thing/New(var/qty, var/atom/type_path)
+/datum/supply_demand_order/thing/New(qty, atom/type_path)
..()
src.type_path = type_path
src.name = initial(type_path.name)
if(!name)
log_game("supply_demand event: Order for thing [type_path] has no name.")
-/datum/supply_demand_order/thing/match_item(var/atom/I)
+/datum/supply_demand_order/thing/match_item(atom/I)
if(istype(I, type_path))
// Hey, we found it! How we handle it depends on some details tho.
if(istype(I, /obj/item/stack))
@@ -194,7 +194,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
/datum/supply_demand_order/reagent
var/reagent_id
-/datum/supply_demand_order/reagent/New(var/qty, var/datum/reagent/R)
+/datum/supply_demand_order/reagent/New(qty, datum/reagent/R)
..()
name = R.name
reagent_id = R.id
@@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
return "[qty_need] units of [name] in its own container(s)"
// Any reagent container will do now. Whole number units only.
-/datum/supply_demand_order/reagent/match_item(var/atom/I)
+/datum/supply_demand_order/reagent/match_item(atom/I)
if(!I.reagents)
return
if(!istype(I, /obj/item/reagent_containers))
@@ -233,7 +233,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
desc += "
- [GLOB.gas_data.name[gas]]: [round((mixture.gas[gas] / total_moles) * 100)]%\n"
return desc
-/datum/supply_demand_order/gas/match_item(var/obj/machinery/portable_atmospherics/canister)
+/datum/supply_demand_order/gas/match_item(obj/machinery/portable_atmospherics/canister)
if(!istype(canister))
return
var/datum/gas_mixture/canmix = canister.air_contents
@@ -257,7 +257,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
// Item choosing procs - Decide what supplies will be demanded!
//
-/datum/event/supply_demand/proc/choose_food_items(var/differentTypes)
+/datum/event/supply_demand/proc/choose_food_items(differentTypes)
var/list/types = subtypesof(/datum/recipe)
for(var/i in 1 to differentTypes)
var/datum/recipe/R = pick(types)
@@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
required_items += new /datum/supply_demand_order/thing(chosen_qty, chosen_path)
return
-/datum/event/supply_demand/proc/choose_chemistry_items(var/differentTypes)
+/datum/event/supply_demand/proc/choose_chemistry_items(differentTypes)
// Checking if they show up in health analyzer is good huristic for it being a drug
var/list/medicineReagents = list()
for(var/datum/decl/chemical_reaction/instant/CR in SSchemistry.chemical_reactions)
@@ -281,7 +281,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
required_items += new /datum/supply_demand_order/reagent(chosen_qty, R)
return
-/datum/event/supply_demand/proc/choose_bar_items(var/differentTypes)
+/datum/event/supply_demand/proc/choose_bar_items(differentTypes)
var/list/drinkReagents = list()
for(var/datum/decl/chemical_reaction/instant/drinks/CR in SSchemistry.chemical_reactions)
var/datum/reagent/R = SSchemistry.chemical_reagents[initial(CR.result)]
@@ -294,7 +294,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
required_items += new /datum/supply_demand_order/reagent(chosen_qty, R)
return
-/datum/event/supply_demand/proc/choose_robotics_items(var/differentTypes)
+/datum/event/supply_demand/proc/choose_robotics_items(differentTypes)
// Do not make mechs dynamic, its too silly
var/list/types = list(
/obj/mecha/combat/durand,
@@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
required_items += new /datum/supply_demand_order/thing(rand(1, 2), T)
return
-/datum/event/supply_demand/proc/choose_atmos_items(var/differentTypes)
+/datum/event/supply_demand/proc/choose_atmos_items(differentTypes)
var/datum/gas_mixture/mixture = new
mixture.temperature = T20C
var/unpickedTypes = GLOB.gas_data.gases.Copy()
@@ -322,7 +322,7 @@ GLOBAL_LIST_EMPTY_TYPED(running_demand_events, /datum/event/supply_demand)
required_items += O
return
-/datum/event/supply_demand/proc/choose_alloy_items(var/differentTypes)
+/datum/event/supply_demand/proc/choose_alloy_items(differentTypes)
var/list/types = subtypesof(/datum/alloy)
for(var/i in 1 to differentTypes)
var/datum/alloy/A = pick(types)
diff --git a/code/modules/events/window_break.dm b/code/modules/events/window_break.dm
index ff1d18cb31..a5da269a26 100644
--- a/code/modules/events/window_break.dm
+++ b/code/modules/events/window_break.dm
@@ -27,7 +27,7 @@
return
//TL;DR: breadth first search for all connected turfs with windows
-/datum/event/window_break/proc/gather_collateral_windows(var/obj/structure/window/target_window)
+/datum/event/window_break/proc/gather_collateral_windows(obj/structure/window/target_window)
var/list/turf/frontier_set = list(target_window.loc)
var/list/obj/structure/window/result_set = list()
var/list/turf/explored_set = list()
diff --git a/code/modules/examine/descriptions/armor.dm b/code/modules/examine/descriptions/armor.dm
index 78feb8bf72..1c36d1b8f5 100644
--- a/code/modules/examine/descriptions/armor.dm
+++ b/code/modules/examine/descriptions/armor.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/proc/describe_armor(var/armor_type, var/descriptive_attack_type)
+/obj/item/clothing/proc/describe_armor(armor_type, descriptive_attack_type)
if(armor[armor_type])
switch(armor[armor_type])
if(1 to 20)
diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm
index eebd75695d..0ed178ac86 100644
--- a/code/modules/examine/examine.dm
+++ b/code/modules/examine/examine.dm
@@ -34,7 +34,7 @@
return list()
// Quickly adds the boilerplate code to add an image and padding for the image.
-/proc/desc_panel_image(var/icon_state)
+/proc/desc_panel_image(icon_state)
return "[icon2html(GLOB.description_icons[icon_state], usr)] "
/mob/living/get_description_fluff()
@@ -88,7 +88,7 @@
to_chat(src, final_string)
update_examine_panel(A)
-/mob/proc/embedded_info(var/atom/A)
+/mob/proc/embedded_info(atom/A)
. = ""
if(!(client?.prefs?.read_preference(/datum/preference/choiced/examine_mode) == EXAMINE_MODE_VERBOSE))
return
@@ -138,7 +138,7 @@
return TRUE
return FALSE
-/mob/proc/update_examine_panel(var/atom/A)
+/mob/proc/update_examine_panel(atom/A)
if(client)
var/is_antag = antag_check()
client.update_description_holders(A, is_antag)
diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm
index 2b4d3a5ff5..18a350811d 100644
--- a/code/modules/ext_scripts/irc.dm
+++ b/code/modules/ext_scripts/irc.dm
@@ -1,4 +1,4 @@
-/proc/send2irc(var/channel, var/msg)
+/proc/send2irc(channel, msg)
return // VOREStation Edit - Can't exploit shell if we never call shell!
/* Unreachable with above VOREStation Edit
if (CONFIG_GET(flag/use_irc_bot)) // CHOMPEdit
@@ -25,12 +25,12 @@
return
*/
-/proc/send2mainirc(var/msg)
+/proc/send2mainirc(msg)
if(CONFIG_GET(string/main_irc))
send2irc(CONFIG_GET(string/main_irc), msg)
return
-/proc/send2adminirc(var/msg)
+/proc/send2adminirc(msg)
if(CONFIG_GET(string/admin_irc))
send2irc(CONFIG_GET(string/admin_irc), msg)
return
diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm
index 847e101a5d..16930cb7d5 100644
--- a/code/modules/ext_scripts/python.dm
+++ b/code/modules/ext_scripts/python.dm
@@ -1,5 +1,5 @@
// Ported from /vg/.
-/proc/escape_shell_arg(var/arg)
+/proc/escape_shell_arg(arg)
// RCE prevention
// - Encloses arg in single quotes
// - Escapes single quotes
@@ -16,7 +16,7 @@
arg = "'[arg]'"
return arg
-/proc/ext_python(var/script, var/arguments, var/scriptsprefix = 1)
+/proc/ext_python(script, arguments, scriptsprefix = 1)
return // VOREStation Edit - Can't exploit shell if we never call shell!
/* Unreachable with above vorestation edit
if(scriptsprefix)
diff --git a/code/modules/fireworks/firework_launcher.dm b/code/modules/fireworks/firework_launcher.dm
index 1bcd7d826e..9cc8e9a05e 100644
--- a/code/modules/fireworks/firework_launcher.dm
+++ b/code/modules/fireworks/firework_launcher.dm
@@ -30,7 +30,7 @@
/obj/machinery/firework_launcher/update_icon()
icon_state = "launcher[loaded_star ? "1" : "0"][anchored ? "1" : "0"][panel_open ? "_open" : ""]"
-/obj/machinery/firework_launcher/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/firework_launcher/attackby(obj/item/O, mob/user)
if(default_deconstruction_screwdriver(user, O))
update_icon()
return
diff --git a/code/modules/fireworks/firework_stars.dm b/code/modules/fireworks/firework_stars.dm
index 4e3bf024c4..39137aec0a 100644
--- a/code/modules/fireworks/firework_stars.dm
+++ b/code/modules/fireworks/firework_stars.dm
@@ -7,7 +7,7 @@
icon_state = "star"
w_class = ITEMSIZE_SMALL
-/obj/item/firework_star/proc/trigger_firework(var/datum/weather_holder/w_holder)
+/obj/item/firework_star/proc/trigger_firework(datum/weather_holder/w_holder)
return
@@ -16,7 +16,7 @@
desc = "A firework star designed to alter a weather, rather than put on a show."
var/weather_type
-/obj/item/firework_star/weather/trigger_firework(var/datum/weather_holder/w_holder)
+/obj/item/firework_star/weather/trigger_firework(datum/weather_holder/w_holder)
if(!w_holder) // Sanity
return
if(w_holder.firework_override) // Make sure weather-based events can't be interfered with
@@ -91,7 +91,7 @@
var/list/firework_adjectives = list("beautiful", "pretty", "fancy", "colorful", "bright", "shimmering")
var/list/firework_colors = list("red", "orange", "yellow", "green", "cyan", "blue", "purple", "pink", "beige", "white")
-/obj/item/firework_star/aesthetic/trigger_firework(var/datum/weather_holder/w_holder)
+/obj/item/firework_star/aesthetic/trigger_firework(datum/weather_holder/w_holder)
if(!w_holder)
return
w_holder.message_all_outdoor_players(get_firework_message())
diff --git a/code/modules/fishing/fishing_net.dm b/code/modules/fishing/fishing_net.dm
index 4773bae0f3..98188d479d 100644
--- a/code/modules/fishing/fishing_net.dm
+++ b/code/modules/fishing/fishing_net.dm
@@ -29,7 +29,7 @@
. = ..()
update_icon()
-/obj/item/material/fishing_net/afterattack(var/atom/A, var/mob/user, var/proximity)
+/obj/item/material/fishing_net/afterattack(atom/A, mob/user, proximity)
if(get_dist(get_turf(src), A) > reach)
return
@@ -77,7 +77,7 @@
update_weight()
return
-/obj/item/material/fishing_net/attackby(var/obj/item/W, var/mob/user)
+/obj/item/material/fishing_net/attackby(obj/item/W, mob/user)
if(contents)
for(var/mob/living/L in contents)
if(prob(25))
@@ -139,7 +139,7 @@
special_handling = TRUE
-/obj/item/material/fishing_net/butterfly_net/afterattack(var/atom/A, var/mob/user, var/proximity)
+/obj/item/material/fishing_net/butterfly_net/afterattack(atom/A, mob/user, proximity)
if(get_dist(get_turf(src), A) > reach)
return
diff --git a/code/modules/flufftext/fake_attacker.dm b/code/modules/flufftext/fake_attacker.dm
index d268680d2b..0861dcb916 100644
--- a/code/modules/flufftext/fake_attacker.dm
+++ b/code/modules/flufftext/fake_attacker.dm
@@ -49,7 +49,7 @@
qdel_all_images()
clients.Cut()
-/obj/effect/fake_attacker/proc/create_images_from(var/atom/clone)
+/obj/effect/fake_attacker/proc/create_images_from(atom/clone)
SHOULD_NOT_OVERRIDE(TRUE)
dir_images["[NORTH]"] = image(clone,dir = NORTH)
dir_images["[SOUTH]"] = image(clone,dir = SOUTH)
@@ -63,12 +63,12 @@
G.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
G.loc = loc
-/obj/effect/fake_attacker/proc/append_client(var/client/C)
+/obj/effect/fake_attacker/proc/append_client(client/C)
SHOULD_NOT_OVERRIDE(TRUE)
clients.Add(WEAKREF(C))
assign_image_to_client(C)
-/obj/effect/fake_attacker/proc/assign_image_to_client(var/client/C)
+/obj/effect/fake_attacker/proc/assign_image_to_client(client/C)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!C)
@@ -83,7 +83,7 @@
for(var/datum/weakref/C in clients)
clear_images_from_client(C?.resolve())
-/obj/effect/fake_attacker/proc/clear_images_from_client(var/client/C)
+/obj/effect/fake_attacker/proc/clear_images_from_client(client/C)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!C)
@@ -105,7 +105,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Hallucination attackers with AI behaviors
//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-/mob/proc/create_hallucination_attacker(var/turf/T = null,var/mob/living/carbon/human/clone = null, var/forced_type = null)
+/mob/proc/create_hallucination_attacker(turf/T = null,mob/living/carbon/human/clone = null, forced_type = null)
SHOULD_NOT_OVERRIDE(TRUE)
if(!client)
return null
@@ -149,7 +149,7 @@
VAR_PROTECTED/datum/weakref/target = null
var/requires_hallucinating = TRUE // Mob will qdel if the target is not hallucinating if this is true
-/obj/effect/fake_attacker/human/Initialize(mapload,var/mob/targeting_mob,var/atom/clone_appearance_from)
+/obj/effect/fake_attacker/human/Initialize(mapload,mob/targeting_mob,atom/clone_appearance_from)
. = ..()
START_PROCESSING(SSobj, src)
set_target(targeting_mob)
@@ -180,7 +180,7 @@
return M
-/obj/effect/fake_attacker/human/proc/set_target(var/mob/M)
+/obj/effect/fake_attacker/human/proc/set_target(mob/M)
target = WEAKREF(M)
diff --git a/code/modules/flufftext/hallucination_events.dm b/code/modules/flufftext/hallucination_events.dm
index 3777d8802a..af983408d1 100644
--- a/code/modules/flufftext/hallucination_events.dm
+++ b/code/modules/flufftext/hallucination_events.dm
@@ -160,7 +160,7 @@
our_human.playsound_local(get_turf(our_human), send_sound, vol = 75, channel = CHANNEL_AMBIENCE_FORCED)
-/datum/component/hallucinations/proc/secondary_sound(var/sound_path)
+/datum/component/hallucinations/proc/secondary_sound(sound_path)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
our_human.playsound_local(get_turf(our_human), sound_path, vol = 75, channel = CHANNEL_AMBIENCE_FORCED)
diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm
index 6d5dd03531..f6403a164b 100644
--- a/code/modules/food/drinkingglass/drinkingglass.dm
+++ b/code/modules/food/drinkingglass/drinkingglass.dm
@@ -141,7 +141,7 @@
else continue
side = "right"
-/obj/item/reagent_containers/food/drinks/glass2/afterattack(var/obj/target, var/mob/user, var/proximity)
+/obj/item/reagent_containers/food/drinks/glass2/afterattack(obj/target, mob/user, proximity)
if(user.a_intent == I_HURT) //We only want splashing to be done if they are on harm intent.
if(!is_open_container() || !proximity)
return TRUE
@@ -153,7 +153,7 @@
return TRUE
..()
-/obj/item/reagent_containers/food/drinks/glass2/standard_feed_mob(var/mob/user, var/mob/target)
+/obj/item/reagent_containers/food/drinks/glass2/standard_feed_mob(mob/user, mob/target)
if(afterattack(target, user)) //Check to see if harm intent & splash.
return
else
diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index 4a721dc61e..9c27f3d73d 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -23,7 +23,7 @@
handle_name_change(usr)
-/obj/item/reagent_containers/food/proc/handle_name_change(var/mob/living/user)
+/obj/item/reagent_containers/food/proc/handle_name_change(mob/living/user)
if(user.stat == DEAD || !(ishuman(user) || isrobot(user)))
to_chat(user, span_warning("You can't cook!"))
return
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index f2722c93a8..0dee823d0f 100644
--- a/code/modules/food/food/condiment.dm
+++ b/code/modules/food/food/condiment.dm
@@ -18,14 +18,14 @@
center_of_mass_y = 6
volume = 50
-/obj/item/reagent_containers/food/condiment/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/reagent_containers/food/condiment/attackby(obj/item/W as obj, mob/user as mob)
return
/obj/item/reagent_containers/food/condiment/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
if(standard_feed_mob(user, M))
return
-/obj/item/reagent_containers/food/condiment/afterattack(var/obj/target, var/mob/user, var/flag)
+/obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user, flag)
if(!user.Adjacent(target))
return
if(standard_dispenser_refill(user, target))
@@ -47,10 +47,10 @@
else
..()
-/obj/item/reagent_containers/food/condiment/feed_sound(var/mob/user)
+/obj/item/reagent_containers/food/condiment/feed_sound(mob/user)
playsound(src, 'sound/items/drink.ogg', rand(10, 50), 1)
-/obj/item/reagent_containers/food/condiment/self_feed_message(var/mob/user)
+/obj/item/reagent_containers/food/condiment/self_feed_message(mob/user)
to_chat(user, span_notice("You swallow some of contents of \the [src]."))
/obj/item/reagent_containers/food/condiment/on_reagent_change()
diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
index 235cea9b30..80b8189330 100644
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -91,7 +91,7 @@
return ..()
-/obj/item/reagent_containers/food/drinks/proc/On_Consume(var/mob/living/eater, var/mob/feeder, var/changed = FALSE)
+/obj/item/reagent_containers/food/drinks/proc/On_Consume(mob/living/eater, mob/feeder, changed = FALSE)
SEND_SIGNAL(src, COMSIG_GLASS_DRANK, eater, feeder)
if(!feeder)
feeder = eater
@@ -126,7 +126,7 @@
qdel(src)
return
-/obj/item/reagent_containers/food/drinks/on_rag_wipe(var/obj/item/reagent_containers/glass/rag/R)
+/obj/item/reagent_containers/food/drinks/on_rag_wipe(obj/item/reagent_containers/glass/rag/R)
wash(CLEAN_SCRUB)
/obj/item/reagent_containers/food/drinks/attack_self(mob/user, special_pass)
@@ -166,7 +166,7 @@
return
return ..()
-/obj/item/reagent_containers/food/drinks/standard_feed_mob(var/mob/user, var/mob/target)
+/obj/item/reagent_containers/food/drinks/standard_feed_mob(mob/user, mob/target)
if(!is_open_container())
to_chat(user, span_notice("You need to open [src]!"))
return TRUE
@@ -176,19 +176,19 @@
On_Consume(target, user, changed)
return
-/obj/item/reagent_containers/food/drinks/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target)
+/obj/item/reagent_containers/food/drinks/standard_dispenser_refill(mob/user, obj/structure/reagent_dispensers/target)
if(!is_open_container())
to_chat(user, span_notice("You need to open [src]!"))
return TRUE
return ..()
-/obj/item/reagent_containers/food/drinks/standard_pour_into(var/mob/user, var/atom/target)
+/obj/item/reagent_containers/food/drinks/standard_pour_into(mob/user, atom/target)
if(!is_open_container())
to_chat(user, span_notice("You need to open [src]!"))
return TRUE
return ..()
-/obj/item/reagent_containers/food/drinks/self_feed_message(var/mob/user)
+/obj/item/reagent_containers/food/drinks/self_feed_message(mob/user)
if(amount_per_transfer_from_this == volume) //I wanted to use a switch, but switch statements can't use vars and the maximum volume of containers varies
to_chat(user, span_notice("You knock back the entire [src] in one go!"))
else if(amount_per_transfer_from_this == 1)
@@ -204,7 +204,7 @@
else //default message as a fallback
to_chat(user, span_notice("You swallow a gulp from \the [src]."))
-/obj/item/reagent_containers/food/drinks/feed_sound(var/mob/user)
+/obj/item/reagent_containers/food/drinks/feed_sound(mob/user)
playsound(src, 'sound/items/drink.ogg', rand(10, 50), TRUE)
/obj/item/reagent_containers/food/drinks/examine(mob/user)
diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm
index 38f47b402b..719299ce18 100644
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -55,7 +55,7 @@
violent_throw = FALSE
throw_source = null
-/obj/item/reagent_containers/food/drinks/bottle/proc/smash_check(var/distance)
+/obj/item/reagent_containers/food/drinks/bottle/proc/smash_check(distance)
if(!isGlass || !smash_duration)
return 0
@@ -65,7 +65,7 @@
return 0
return prob(chance_table[idx])
-/obj/item/reagent_containers/food/drinks/bottle/proc/smash(var/newloc, atom/against = null)
+/obj/item/reagent_containers/food/drinks/bottle/proc/smash(newloc, atom/against = null)
if(ismob(loc))
var/mob/M = loc
M.drop_from_inventory(src)
@@ -159,7 +159,7 @@
else
set_light(0)
-/obj/item/reagent_containers/food/drinks/bottle/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/reagent_containers/food/drinks/bottle/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
var/blocked = ..()
if(user.a_intent != I_HURT)
diff --git a/code/modules/food/food/lunch.dm b/code/modules/food/food/lunch.dm
index d6592bf5a6..c00f42c409 100644
--- a/code/modules/food/food/lunch.dm
+++ b/code/modules/food/food/lunch.dm
@@ -178,14 +178,14 @@ GLOBAL_LIST_INIT(lunchables_ethanol_reagents, list(/datum/reagent/ethanol/acid_s
GLOB.lunchables_ethanol_reagents = init_lunchable_reagent_list(GLOB.lunchables_ethanol_reagents, /datum/reagent/ethanol)
return GLOB.lunchables_ethanol_reagents
-/proc/init_lunchable_list(var/list/lunches)
+/proc/init_lunchable_list(list/lunches)
. = list()
for(var/obj/O as anything in lunches)
var/name = strip_improper(initial(O.name))
.[name] = O
return sortAssoc(.)
-/proc/init_lunchable_reagent_list(var/list/banned_reagents, var/reagent_types)
+/proc/init_lunchable_reagent_list(list/banned_reagents, reagent_types)
. = list()
for(var/reagent_type in subtypesof(reagent_types))
if(reagent_type in banned_reagents)
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 2e86a71cb9..44923783ac 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -60,7 +60,7 @@
reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc)
//Placeholder for effect that trigger on eating that aren't tied to reagents.
-/obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/living/eater, var/mob/living/feeder)
+/obj/item/reagent_containers/food/snacks/proc/On_Consume(mob/living/eater, mob/living/feeder)
SEND_SIGNAL(src, COMSIG_FOOD_EATEN, eater, feeder)
if(food_inserted_micros && food_inserted_micros.len)
for(var/mob/living/micro in food_inserted_micros)
@@ -473,7 +473,7 @@
////////////////////////////////////////////////////////////////////////////////
/// FOOD END
////////////////////////////////////////////////////////////////////////////////
-/obj/item/reagent_containers/food/snacks/attack_generic(var/mob/living/user)
+/obj/item/reagent_containers/food/snacks/attack_generic(mob/living/user)
if(!isanimal(user) && !isalien(user))
return
user.visible_message(span_infoplain(span_bold("[user]") + " nibbles away at \the [src]."),span_info("You nibble away at \the [src]."))
@@ -1489,7 +1489,7 @@
. = ..()
reagents.add_reagent("protein", 2) // needed to call On_Consume()... Is this actually an issue?
-/obj/item/reagent_containers/food/snacks/clownburger/On_Consume(var/mob/living/user)
+/obj/item/reagent_containers/food/snacks/clownburger/On_Consume(mob/living/user)
if(user && ishuman(user) && prob(3))
var/mob/living/carbon/human/H = user
H.malignant_organ_spawn( /obj/item/organ/internal/malignant/parasite/honker )
@@ -2072,7 +2072,7 @@
flags |= OPENCONTAINER
return
-/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(var/mob/M)
+/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/M)
var/mob/living/Prey = Expand()
if(!isliving(M))
@@ -5208,7 +5208,7 @@
return . = ..()
//This proc handles drawing coatings out of a container when this food is dipped into it
-/obj/item/reagent_containers/food/snacks/proc/apply_coating(var/datum/reagent/nutriment/coating/C, var/mob/user)
+/obj/item/reagent_containers/food/snacks/proc/apply_coating(datum/reagent/nutriment/coating/C, mob/user)
if (coating)
to_chat(user, "The [src] is already coated in [coating.name]!")
return 0
@@ -5303,7 +5303,7 @@
C.data["cooked"] = 1
C.name = C.cooked_name
-/obj/item/reagent_containers/food/snacks/proc/on_consume(var/mob/eater, var/mob/feeder = null)
+/obj/item/reagent_containers/food/snacks/proc/on_consume(mob/eater, mob/feeder = null)
if(!reagents.total_volume)
eater.visible_message(span_notice("[eater] finishes eating \the [src]."),span_notice("You finish eating \the [src]."))
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 5de26d03bd..32f86b99ce 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -250,7 +250,7 @@
reagents.add_reagent(REAGENT_ID_KELOTANE, 2)
bitesize = 4
-/obj/structure/chaoscake/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/chaoscake/attackby(obj/item/W, mob/living/user)
if(istype(W,/obj/item/material/knife))
if(edible == 1)
HasSliceMissing()
@@ -307,7 +307,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/bigslice,
/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/bigslice)
-/obj/structure/theonepizza/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/theonepizza/attackby(obj/item/W, mob/living/user)
if(istype(W,/obj/item/material/knife))
user.visible_message(span_infoplain(span_bold("\The [user]") + " starts to slowly cut through The One Pizza."), span_notice("You start to slowly cut through The One Pizza."))
if(do_after(user, slicetime, target = src))
diff --git a/code/modules/food/food/superfoods_ch.dm b/code/modules/food/food/superfoods_ch.dm
index df82b9382a..6ad8f8fe33 100644
--- a/code/modules/food/food/superfoods_ch.dm
+++ b/code/modules/food/food/superfoods_ch.dm
@@ -192,7 +192,7 @@
"its The Infinity Cake! This huge imposing cake made by immense efforts and resources stands tall in you, radiating a menacing aura of frosty goodness and diabetes for those not wary of it's infinite might!"
)
-/obj/structure/thecake/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/thecake/attackby(obj/item/W, mob/living/user)
if(istype(W,/obj/item/material/knife))
if(edible == 1)
HasSliceMissing()
@@ -494,7 +494,7 @@
reagents.add_reagent(REAGENT_ID_KELOTANE, 2)
bitesize = 4
-/obj/structure/chaoscake/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/chaoscake/attackby(obj/item/W, mob/living/user)
if(istype(W,/obj/item/material/knife))
if(edible == 1)
HasSliceMissing()
@@ -550,7 +550,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/bigslice,
/obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/bigslice)
-/obj/structure/theonepizza/attackby(var/obj/item/W, var/mob/living/user)
+/obj/structure/theonepizza/attackby(obj/item/W, mob/living/user)
if(istype(W,/obj/item/material/knife))
user.visible_message(span_bold("\The [user]") + " starts to slowly cut through The One Pizza.", span_notice("You start to slowly cut through The One Pizza."))
if(do_after(user, slicetime, src))
diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm
index c14296890c..ab38ac9296 100644
--- a/code/modules/food/food/z_custom_food_vr.dm
+++ b/code/modules/food/food/z_custom_food_vr.dm
@@ -66,7 +66,7 @@
. = ..()
return
-/obj/item/reagent_containers/food/snacks/customizable/proc/generateFilling(var/obj/item/reagent_containers/food/snacks/S, params)
+/obj/item/reagent_containers/food/snacks/customizable/proc/generateFilling(obj/item/reagent_containers/food/snacks/S, params)
var/image/I
if(fullyCustom)
var/icon/C = getFlatIcon(S, S.dir, 0)
diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm
index 2396da4b00..0b70ec46f8 100644
--- a/code/modules/food/kitchen/cooking_machines/_appliance.dm
+++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm
@@ -57,12 +57,12 @@
qdel(CI)
return ..()
-/obj/machinery/appliance/examine(var/mob/user)
+/obj/machinery/appliance/examine(mob/user)
. = ..()
if(Adjacent(user))
. += list_contents(user)
-/obj/machinery/appliance/proc/list_contents(var/mob/user)
+/obj/machinery/appliance/proc/list_contents(mob/user)
if (cooking_objs.len)
var/string = "Contains..."
for(var/datum/cooking_item/CI as anything in cooking_objs)
@@ -95,7 +95,7 @@
else
return list("bad", "It is burning!")
-/obj/machinery/appliance/proc/report_progress(var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/report_progress(datum/cooking_item/CI)
if (!CI || !CI.max_cookwork)
return null
@@ -181,7 +181,7 @@
to_chat(user, span_notice("You prepare \the [src] to make \a [selected_option] with the next thing you put in. Try putting several ingredients in a container!"))
//Handles all validity checking and error messages for inserting things
-/obj/machinery/appliance/proc/can_insert(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/proc/can_insert(obj/item/I, mob/user)
if(istype(I.loc, /mob/living/silicon))
return 0
else if (istype(I.loc, /obj/item/rig_module))
@@ -228,13 +228,13 @@
//This function is overridden by cookers that do stuff with containers
-/obj/machinery/appliance/proc/has_space(var/obj/item/I)
+/obj/machinery/appliance/proc/has_space(obj/item/I)
if(cooking_objs.len >= max_contents)
return FALSE
return TRUE
-/obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/attackby(obj/item/I, mob/user)
if(!cook_type || (stat & (BROKEN)))
to_chat(user, span_warning("\The [src] is not working."))
return FALSE
@@ -274,7 +274,7 @@
update_icon()
//Override for container mechanics
-/obj/machinery/appliance/proc/add_content(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/proc/add_content(obj/item/I, mob/user)
if(!user.unEquip(I) && !isturf(I.loc))
return
@@ -304,7 +304,7 @@
cooking = TRUE
return CI
-/obj/machinery/appliance/proc/get_cooking_work(var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/get_cooking_work(datum/cooking_item/CI)
for (var/obj/item/J in CI.container)
cookwork_by_item(J, CI)
@@ -332,7 +332,7 @@
CI.max_cookwork += buffer*multiplier
//Just a helper to save code duplication in the above
-/obj/machinery/appliance/proc/cookwork_by_item(var/obj/item/I, var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/cookwork_by_item(obj/item/I, datum/cooking_item/CI)
var/obj/item/reagent_containers/food/snacks/S = I
var/work = 0
if (istype(S))
@@ -357,7 +357,7 @@
CI.max_cookwork += work
//Called every tick while we're cooking something
-/obj/machinery/appliance/proc/do_cooking_tick(var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/do_cooking_tick(datum/cooking_item/CI)
if (!istype(CI) || !CI.max_cookwork)
return FALSE
@@ -445,7 +445,7 @@
/obj/machinery/appliance/proc/predict_modification(obj/item/input, datum/cooking_item/CI)
return "[cook_type] [input.name]"
-/obj/machinery/appliance/proc/finish_cooking(var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/finish_cooking(datum/cooking_item/CI)
src.visible_message(span_infoplain(span_bold("\The [src]") + " pings!"))
if(cooked_sound)
playsound(get_turf(src), cooked_sound, 50, 1)
@@ -499,7 +499,7 @@
//Combination cooking involves combining the names and reagents of ingredients into a predefined output object
//The ingredients represent flavours or fillings. EG: donut pizza, cheese bread
-/obj/machinery/appliance/proc/combination_cook(var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/combination_cook(datum/cooking_item/CI)
var/cook_path = output_options[CI.combine_target]
var/list/words = list()
@@ -581,7 +581,7 @@
return result
//Helper proc for standard modification cooking
-/obj/machinery/appliance/proc/modify_cook(var/obj/item/input, var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/modify_cook(obj/item/input, datum/cooking_item/CI)
var/obj/item/reagent_containers/food/snacks/result
if (istype(input, /obj/item/holder))
result = create_mob_food(input, CI)
@@ -600,7 +600,7 @@
// Update strings.
change_product_strings(result, CI)
-/obj/machinery/appliance/proc/burn_food(var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/burn_food(datum/cooking_item/CI)
// You dun goofed.
CI.burned = 1
CI.container.clear()
@@ -715,7 +715,7 @@
return TRUE
return FALSE
-/obj/machinery/appliance/proc/can_remove_items(var/mob/user, show_warning = TRUE)
+/obj/machinery/appliance/proc/can_remove_items(mob/user, show_warning = TRUE)
if (!Adjacent(user))
return FALSE
@@ -724,7 +724,7 @@
return TRUE
-/obj/machinery/appliance/proc/eject(var/datum/cooking_item/CI, var/mob/user = null)
+/obj/machinery/appliance/proc/eject(datum/cooking_item/CI, mob/user = null)
var/obj/item/thing
var/delete = 1
var/status = CI.container.check_contents()
@@ -764,15 +764,15 @@
if(cooked_sound)
playsound(get_turf(src), cooked_sound, 50, 1)
-/obj/machinery/appliance/proc/cook_mob(var/mob/living/victim, var/mob/user)
+/obj/machinery/appliance/proc/cook_mob(mob/living/victim, mob/user)
return
-/obj/machinery/appliance/proc/change_product_strings(var/obj/item/reagent_containers/food/snacks/product, var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/change_product_strings(obj/item/reagent_containers/food/snacks/product, datum/cooking_item/CI)
product.name = "[cook_type] [product.name]"
product.desc = "[product.desc]\nIt has been [cook_type]."
-/obj/machinery/appliance/proc/change_product_appearance(var/obj/item/reagent_containers/food/snacks/product, var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/change_product_appearance(obj/item/reagent_containers/food/snacks/product, datum/cooking_item/CI)
if (!product.coating) //Coatings change colour through a new sprite
product.color = food_color
product.filling_color = food_color
@@ -804,7 +804,7 @@
src.composition_reagent_quantity = size_reagent
//This function creates a food item which represents a dead mob
-/obj/machinery/appliance/proc/create_mob_food(var/obj/item/holder/H, var/datum/cooking_item/CI)
+/obj/machinery/appliance/proc/create_mob_food(obj/item/holder/H, datum/cooking_item/CI)
if (!istype(H) || !H.held_mob)
qdel(H)
return null
@@ -861,7 +861,7 @@
var/oil = 0
var/max_oil = 0//Used for fryers.
-/datum/cooking_item/New(var/obj/item/I)
+/datum/cooking_item/New(obj/item/I)
container = I
//This is called for containers whose contents are ejected without removing the container
diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm
index 284d190395..31283e4655 100644
--- a/code/modules/food/kitchen/cooking_machines/_cooker.dm
+++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm
@@ -27,7 +27,7 @@
return data
-/obj/machinery/appliance/cooker/examine(var/mob/user)
+/obj/machinery/appliance/cooker/examine(mob/user)
. = ..()
if(.) //no need to duplicate adjacency check
if(!stat)
@@ -39,7 +39,7 @@
else
. += span_warning("It is switched off.")
-/obj/machinery/appliance/cooker/list_contents(var/mob/user)
+/obj/machinery/appliance/cooker/list_contents(mob/user)
if (cooking_objs.len)
var/string = "Contains..."
var/num = 0
@@ -139,7 +139,7 @@
update_cooking_power()
//Cookers do differently, they use containers
-/obj/machinery/appliance/cooker/has_space(var/obj/item/I)
+/obj/machinery/appliance/cooker/has_space(obj/item/I)
if(istype(I, /obj/item/reagent_containers/cooking_container))
//Containers can go into an empty slot
if(cooking_objs.len < max_contents)
@@ -152,7 +152,7 @@
return 0
-/obj/machinery/appliance/cooker/add_content(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/cooker/add_content(obj/item/I, mob/user)
var/datum/cooking_item/CI = ..()
if(istype(CI) && CI.combine_target)
to_chat(user, span_filter_notice("\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items."))
diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm
index 515f3a5579..e3c2ab91ff 100644
--- a/code/modules/food/kitchen/cooking_machines/_mixer.dm
+++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm
@@ -16,7 +16,7 @@ fundamental differences
var/datum/looping_sound/mixer/mixer_loop
tgui_id = "KitchenMixer"
-/obj/machinery/appliance/mixer/examine(var/mob/user)
+/obj/machinery/appliance/mixer/examine(mob/user)
. = ..()
if(Adjacent(user))
. += span_notice("It is currently set to make a [selected_option]")
@@ -51,7 +51,7 @@ fundamental differences
CI.combine_target = selected_option
-/obj/machinery/appliance/mixer/has_space(var/obj/item/I)
+/obj/machinery/appliance/mixer/has_space(obj/item/I)
var/datum/cooking_item/CI = cooking_objs[1]
if (!CI || !CI.container)
return 0
@@ -62,7 +62,7 @@ fundamental differences
return 0
-/obj/machinery/appliance/mixer/can_remove_items(var/mob/user, show_warning = TRUE)
+/obj/machinery/appliance/mixer/can_remove_items(mob/user, show_warning = TRUE)
if(stat)
return 1
else
@@ -120,14 +120,14 @@ fundamental differences
playsound(src, 'sound/machines/click.ogg', 40, 1)
update_icon()
-/obj/machinery/appliance/mixer/can_insert(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/mixer/can_insert(obj/item/I, mob/user)
if(!stat)
to_chat(user, span_warning(",You can't add items while \the [src] is running. Wait for it to finish or turn the power off to abort."))
return 0
else
return ..()
-/obj/machinery/appliance/mixer/finish_cooking(var/datum/cooking_item/CI)
+/obj/machinery/appliance/mixer/finish_cooking(datum/cooking_item/CI)
..()
stat |= POWEROFF
playsound(src, 'sound/machines/click.ogg', 40, 1)
diff --git a/code/modules/food/kitchen/cooking_machines/candy.dm b/code/modules/food/kitchen/cooking_machines/candy.dm
index 4ab29a9e30..a036e974dd 100644
--- a/code/modules/food/kitchen/cooking_machines/candy.dm
+++ b/code/modules/food/kitchen/cooking_machines/candy.dm
@@ -39,12 +39,12 @@
if(candymaker_loop)
candymaker_loop.stop(src)
-/obj/machinery/appliance/mixer/candy/change_product_appearance(var/obj/item/reagent_containers/food/snacks/product)
+/obj/machinery/appliance/mixer/candy/change_product_appearance(obj/item/reagent_containers/food/snacks/product)
food_color = get_random_colour(1)
. = ..()
-/obj/machinery/appliance/mixer/candy/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/appliance/mixer/candy/attackby(obj/item/O as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, O)) //CHOMPedit - Allows for deconstruction
return
if(default_deconstruction_crowbar(user, O))
diff --git a/code/modules/food/kitchen/cooking_machines/cereal.dm b/code/modules/food/kitchen/cooking_machines/cereal.dm
index 820f00e456..89fd235b29 100644
--- a/code/modules/food/kitchen/cooking_machines/cereal.dm
+++ b/code/modules/food/kitchen/cooking_machines/cereal.dm
@@ -25,11 +25,11 @@
QDEL_NULL(cerealmaker_loop)
/*
-/obj/machinery/appliance/mixer/cereal/change_product_strings(var/obj/item/reagent_containers/food/snacks/product, var/datum/cooking_item/CI)
+/obj/machinery/appliance/mixer/cereal/change_product_strings(obj/item/reagent_containers/food/snacks/product, datum/cooking_item/CI)
. = ..()
product.name = "box of [CI.object.name] cereal"
-/obj/machinery/appliance/mixer/cereal/change_product_appearance(var/obj/item/reagent_containers/food/snacks/product)
+/obj/machinery/appliance/mixer/cereal/change_product_appearance(obj/item/reagent_containers/food/snacks/product)
product.icon = 'icons/obj/food.dmi'
product.icon_state = "cereal_box"
product.filling_color = CI.object.color
@@ -54,7 +54,7 @@
if(cerealmaker_loop)
cerealmaker_loop.stop(src)
-/obj/machinery/appliance/mixer/cereal/combination_cook(var/datum/cooking_item/CI)
+/obj/machinery/appliance/mixer/cereal/combination_cook(datum/cooking_item/CI)
var/list/images = list()
var/num = 0
@@ -86,7 +86,7 @@
result.overlays += images[i]
-/obj/machinery/appliance/mixer/cereal/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/appliance/mixer/cereal/attackby(obj/item/O as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, O)) //CHOMPedit - Allows for deconstruction
return
if(default_deconstruction_crowbar(user, O))
diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm
index a4669dab8d..baea660d5a 100644
--- a/code/modules/food/kitchen/cooking_machines/container.dm
+++ b/code/modules/food/kitchen/cooking_machines/container.dm
@@ -25,7 +25,7 @@
flags |= OPENCONTAINER | NOREACT
-/obj/item/reagent_containers/cooking_container/examine(var/mob/user)
+/obj/item/reagent_containers/cooking_container/examine(mob/user)
. = ..()
if (contents.len)
var/string = "It contains...."
@@ -36,7 +36,7 @@
. += span_notice("It contains [reagents.total_volume]u of reagents.")
-/obj/item/reagent_containers/cooking_container/attackby(var/obj/item/I as obj, var/mob/user as mob)
+/obj/item/reagent_containers/cooking_container/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/gripper))
var/obj/item/gripper/GR = I
var/obj/item/wrapped = GR.get_wrapped_item()
@@ -99,7 +99,7 @@
return 1//Contains only a single object which can be extracted alone
return 2//Contains multiple objects and/or reagents
-/obj/item/reagent_containers/cooking_container/click_alt(var/mob/user)
+/obj/item/reagent_containers/cooking_container/click_alt(mob/user)
do_empty(user)
//Deletes contents of container.
@@ -111,7 +111,7 @@
if (reagents)
reagents.clear_reagents()
-/obj/item/reagent_containers/cooking_container/proc/label(var/number, var/CT = null)
+/obj/item/reagent_containers/cooking_container/proc/label(number, CT = null)
//This returns something like "Fryer basket 1 - empty"
//The latter part is a brief reminder of contents
//This is used in the removal menu
@@ -133,7 +133,7 @@
. += "empty"
-/obj/item/reagent_containers/cooking_container/proc/can_fit(var/obj/item/I)
+/obj/item/reagent_containers/cooking_container/proc/can_fit(obj/item/I)
var/total = 0
for (var/obj/item/J in contents)
total += J.w_class
@@ -144,7 +144,7 @@
//Takes a reagent holder as input and distributes its contents among the items in the container
//Distribution is weighted based on the volume already present in each item
-/obj/item/reagent_containers/cooking_container/proc/soak_reagent(var/datum/reagents/holder)
+/obj/item/reagent_containers/cooking_container/proc/soak_reagent(datum/reagents/holder)
var/total = 0
var/list/weights = list()
for (var/obj/item/I in contents)
diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm
index 9be58af6a6..24c216244e 100644
--- a/code/modules/food/kitchen/cooking_machines/fryer.dm
+++ b/code/modules/food/kitchen/cooking_machines/fryer.dm
@@ -60,7 +60,7 @@
QDEL_NULL(oil)
return ..()
-/obj/machinery/appliance/cooker/fryer/examine(var/mob/user)
+/obj/machinery/appliance/cooker/fryer/examine(mob/user)
. = ..()
var/oil_level = oil.total_volume/optimal_oil
if(Adjacent(user))
@@ -140,7 +140,7 @@
//Fryer gradually infuses any cooked food with oil. Moar calories
//This causes a slow drop in oil levels, encouraging refill after extended use
-/obj/machinery/appliance/cooker/fryer/do_cooking_tick(var/datum/cooking_item/CI)
+/obj/machinery/appliance/cooker/fryer/do_cooking_tick(datum/cooking_item/CI)
if(..() && (CI.oil < CI.max_oil) && prob(20))
var/datum/reagents/buffer = new /datum/reagents(2)
oil.trans_to_holder(buffer, min(0.5, CI.max_oil - CI.oil))
@@ -151,7 +151,7 @@
//To solve any odd logic problems with results having oil as part of their compiletime ingredients.
//Upon finishing a recipe the fryer will analyse any oils in the result, and replace them with our oil
//As well as capping the total to the max oil
-/obj/machinery/appliance/cooker/fryer/finish_cooking(var/datum/cooking_item/CI)
+/obj/machinery/appliance/cooker/fryer/finish_cooking(datum/cooking_item/CI)
..()
var/total_oil = 0
var/total_our_oil = 0
@@ -190,7 +190,7 @@
if (R.id == our_oil.id)
I.reagents.remove_reagent(R.id, R.volume*portion)
-/obj/machinery/appliance/cooker/fryer/cook_mob(var/mob/living/victim, var/mob/user)
+/obj/machinery/appliance/cooker/fryer/cook_mob(mob/living/victim, mob/user)
if(!istype(victim))
return
@@ -260,7 +260,7 @@
fry_loop.stop()
-/obj/machinery/appliance/cooker/fryer/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/cooker/fryer/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/reagent_containers) && !istype(I, /obj/item/reagent_containers/food) && I.reagents)
if(istype(I, /obj/item/reagent_containers/glass)) //Scooping stuff out with a glass.
if(I.reagents.total_volume <= 0 && oil)
diff --git a/code/modules/food/kitchen/cooking_machines/grill.dm b/code/modules/food/kitchen/cooking_machines/grill.dm
index 6bdc4ab67e..b0ab1c2d61 100644
--- a/code/modules/food/kitchen/cooking_machines/grill.dm
+++ b/code/modules/food/kitchen/cooking_machines/grill.dm
@@ -50,7 +50,7 @@
if(grill_loop)
grill_loop.stop(src)
-/obj/machinery/appliance/cooker/grill/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/appliance/cooker/grill/attackby(obj/item/O as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, O)) //CHOMPedit - Allows for deconstruction
return
if(default_deconstruction_crowbar(user, O))
@@ -59,7 +59,7 @@
return
..()
-/obj/machinery/appliance/cooker/grill/finish_cooking(var/datum/cooking_item/CI)
+/obj/machinery/appliance/cooker/grill/finish_cooking(datum/cooking_item/CI)
..()
for(var/obj/item/I in CI.container)
SEND_SIGNAL(I, COMSIG_ITEM_BARBEQUE_GRILLED)
diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm
index a95438982d..5071f717f8 100644
--- a/code/modules/food/kitchen/cooking_machines/oven.dm
+++ b/code/modules/food/kitchen/cooking_machines/oven.dm
@@ -85,7 +85,7 @@
oven_loop.stop(src)
..()
-/obj/machinery/appliance/cooker/oven/click_alt(var/mob/user)
+/obj/machinery/appliance/cooker/oven/click_alt(mob/user)
try_toggle_door(user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
@@ -115,7 +115,7 @@
to_chat(user, span_notice("You [open? "open":"close"] the oven door"))
update_icon()
-/obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I)
+/obj/machinery/appliance/cooker/oven/proc/manip(obj/item/I)
// check if someone's trying to manipulate the machine
if(I.has_tool_quality(TOOL_CROWBAR) || I.has_tool_quality(TOOL_SCREWDRIVER) || istype(I, /obj/item/storage/part_replacer))
@@ -123,7 +123,7 @@
else
return FALSE
-/obj/machinery/appliance/cooker/oven/can_insert(var/obj/item/I, var/mob/user)
+/obj/machinery/appliance/cooker/oven/can_insert(obj/item/I, mob/user)
if(!open && !manip(I))
to_chat(user, span_warning("You can't put anything in while the door is closed!"))
return 0
@@ -141,7 +141,7 @@
if(temperature > T.temperature)
equalize_temperature()
-/obj/machinery/appliance/cooker/oven/can_remove_items(var/mob/user, show_warning = TRUE)
+/obj/machinery/appliance/cooker/oven/can_remove_items(mob/user, show_warning = TRUE)
if(!open)
if(show_warning)
to_chat(user, span_warning("You can't take anything out while the door is closed!"))
@@ -153,7 +153,7 @@
//Oven has lots of recipes and combine options. The chance for interference is high, so
//If a combine target is set the oven will do it instead of checking recipes
-/obj/machinery/appliance/cooker/oven/finish_cooking(var/datum/cooking_item/CI)
+/obj/machinery/appliance/cooker/oven/finish_cooking(datum/cooking_item/CI)
if(CI.combine_target)
CI.result_type = 3//Combination type. We're making something out of our ingredients
visible_message(span_infoplain(span_bold("\The [src]") + " pings!"))
@@ -163,7 +163,7 @@
..()
-/obj/machinery/appliance/cooker/oven/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/appliance/cooker/oven/attackby(obj/item/O as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, O)) //CHOMPedit - Allows for deconstruction
return
if(default_deconstruction_crowbar(user, O))
diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm
index 42f24f2784..4118e20c39 100644
--- a/code/modules/food/kitchen/gibber.dm
+++ b/code/modules/food/kitchen/gibber.dm
@@ -45,7 +45,7 @@
input_plate = null
return ..()
-/obj/machinery/gibber/autogibber/Bumped(var/atom/A)
+/obj/machinery/gibber/autogibber/Bumped(atom/A)
if(!input_plate) return
if(ismob(A))
@@ -91,12 +91,12 @@
. = ..()
. += "The safety guard is [emagged ? span_danger("disabled") : "enabled"]."
-/obj/machinery/gibber/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/gibber/emag_act(remaining_charges, mob/user)
emagged = !emagged
to_chat(user, span_danger("You [emagged ? "disable" : "enable"] the gibber safety guard."))
return 1
-/obj/machinery/gibber/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/gibber/attackby(obj/item/W, mob/user)
var/obj/item/grab/G = W
if(default_unfasten_wrench(user, W, 40))
@@ -112,7 +112,7 @@
move_into_gibber(user,G.affecting)
// Grab() process should clean up the grab item, no need to del it.
-/obj/machinery/gibber/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/gibber/attackby(obj/item/O as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, O)) //CHOMPedit - Allows for deconstruction
return
if(default_deconstruction_crowbar(user, O))
@@ -126,7 +126,7 @@
return
move_into_gibber(user,target)
-/obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim)
+/obj/machinery/gibber/proc/move_into_gibber(mob/user,mob/living/victim)
if(src.occupant)
to_chat(user, span_danger("The gibber is full, empty it first!"))
diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm
index ef36638e34..03a89e0177 100644
--- a/code/modules/food/kitchen/microwave.dm
+++ b/code/modules/food/kitchen/microwave.dm
@@ -514,7 +514,7 @@
return TRUE
return FALSE
-/obj/machinery/microwave/proc/stop(var/success = TRUE)
+/obj/machinery/microwave/proc/stop(success = TRUE)
if(success)
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
operating = FALSE // Turn it off again aferwards
@@ -525,7 +525,7 @@
post_state_change()
soundloop.stop()
-/obj/machinery/microwave/proc/dispose(var/message = TRUE)
+/obj/machinery/microwave/proc/dispose(message = TRUE)
for (var/atom/movable/A in cookingContents())
A.forceMove(loc)
if (src.reagents.total_volume)
@@ -539,7 +539,7 @@
src.visible_message(span_warning("\The [src] gets covered in muck!"))
src.flags &= ~MICROWAVE_FLAGS //So you can't add condiments
-/obj/machinery/microwave/proc/broke(var/spark = TRUE)
+/obj/machinery/microwave/proc/broke(spark = TRUE)
if(spark)
var/datum/effect/effect/system/spark_spread/s = new
s.set_up(2, 1, src)
diff --git a/code/modules/food/kitchen/smartfridge/drying_rack.dm b/code/modules/food/kitchen/smartfridge/drying_rack.dm
index a7e61ee9e2..26e528e202 100644
--- a/code/modules/food/kitchen/smartfridge/drying_rack.dm
+++ b/code/modules/food/kitchen/smartfridge/drying_rack.dm
@@ -10,7 +10,7 @@
. = ..()
AddElement(/datum/element/climbable)
-/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/food/snacks/))
var/obj/item/reagent_containers/food/snacks/S = O
if (S.dried_type)
diff --git a/code/modules/food/kitchen/smartfridge/engineering.dm b/code/modules/food/kitchen/smartfridge/engineering.dm
index 57b186a420..a4c43b654a 100644
--- a/code/modules/food/kitchen/smartfridge/engineering.dm
+++ b/code/modules/food/kitchen/smartfridge/engineering.dm
@@ -16,10 +16,10 @@
/obj/machinery/smartfridge/sheets/persistent_lossy
persistent = /datum/persistent/storage/smartfridge/sheet_storage/lossy
-/obj/machinery/smartfridge/sheets/accept_check(var/obj/item/O)
+/obj/machinery/smartfridge/sheets/accept_check(obj/item/O)
return istype(O, /obj/item/stack/material) && !istype(O, /obj/item/stack/material/cyborg)
-/obj/machinery/smartfridge/sheets/vend(datum/stored_item/stack/I, var/count)
+/obj/machinery/smartfridge/sheets/vend(datum/stored_item/stack/I, count)
var/amount = I.get_amount()
if(amount < 1)
return
@@ -31,7 +31,7 @@
count -= S.get_amount()
SStgui.update_uis(src)
-/obj/machinery/smartfridge/sheets/find_record(var/obj/item/O)
+/obj/machinery/smartfridge/sheets/find_record(obj/item/O)
for(var/datum/stored_item/stack/I as anything in item_records)
if(O.type == I.item_path) // Typecheck should evaluate material-specific subtype
return I
diff --git a/code/modules/food/kitchen/smartfridge/medical.dm b/code/modules/food/kitchen/smartfridge/medical.dm
index ae7b79929c..8109f459bf 100644
--- a/code/modules/food/kitchen/smartfridge/medical.dm
+++ b/code/modules/food/kitchen/smartfridge/medical.dm
@@ -7,7 +7,7 @@
icon_contents = "chem"
circuit = /obj/item/circuitboard/smartfridge/medbay
-/obj/machinery/smartfridge/medbay/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/medbay/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
return FALSE
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
@@ -21,7 +21,7 @@
req_one_access = list(ACCESS_MEDICAL,ACCESS_CHEMISTRY)
circuit = /obj/item/circuitboard/smartfridge/medbay/secure
-/obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/medbay/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
return FALSE
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
@@ -36,7 +36,7 @@
desc = "A refrigerated storage unit for storing viral material."
icon_contents = "viro"
-/obj/machinery/smartfridge/virology/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/virology/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
return FALSE
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
@@ -49,7 +49,7 @@
icon_contents = "viro"
req_access = list(ACCESS_VIROLOGY)
-/obj/machinery/smartfridge/secure/virology/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/virology/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
return FALSE
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
@@ -65,7 +65,7 @@
icon_contents = "chem"
req_one_access = list(ACCESS_CHEMISTRY)
-/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/chemistry/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
return FALSE
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
@@ -78,7 +78,7 @@
icon_contents = "chem"
req_one_access = list(ACCESS_CHEMISTRY)
-/obj/machinery/smartfridge/secure/chemistry/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/chemistry/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/reagent_containers/borghypo))
return FALSE
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
diff --git a/code/modules/food/kitchen/smartfridge/research.dm b/code/modules/food/kitchen/smartfridge/research.dm
index 0fac80fe68..52fe32ab09 100644
--- a/code/modules/food/kitchen/smartfridge/research.dm
+++ b/code/modules/food/kitchen/smartfridge/research.dm
@@ -8,7 +8,7 @@
req_access = list(ACCESS_RESEARCH)
circuit = /obj/item/circuitboard/smartfridge/science
-/obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/extract/accept_check(obj/item/O as obj)
if(istype(O, /obj/item/slime_extract) || istype(O, /obj/item/slimepotion))
return 1
return 0
diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm
index cdc6677540..a6d5d66637 100644
--- a/code/modules/food/kitchen/smartfridge/smartfridge.dm
+++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm
@@ -173,14 +173,14 @@
to_chat(user, span_notice("\The [src] smartly refuses [O]."))
return TRUE
-/obj/machinery/smartfridge/secure/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/smartfridge/secure/emag_act(remaining_charges, mob/user)
if(!emagged)
emagged = 1
locked = -1
to_chat(user, span_filter_notice("You short out the product lock on [src]."))
return TRUE
-/obj/machinery/smartfridge/proc/find_record(var/obj/item/O)
+/obj/machinery/smartfridge/proc/find_record(obj/item/O)
for(var/datum/stored_item/I as anything in item_records)
if((O.type == I.item_path) && (O.name == I.item_name))
return I
@@ -195,7 +195,7 @@
SStgui.update_uis(src)
update_icon()
-/obj/machinery/smartfridge/proc/vend(datum/stored_item/I, var/count)
+/obj/machinery/smartfridge/proc/vend(datum/stored_item/I, count)
var/amount = I.get_amount()
// Sanity check, there are probably ways to press the button when it shouldn't be possible.
if(amount <= 0)
diff --git a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm
index c37268f527..cc4a7bd395 100644
--- a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm
+++ b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm
@@ -19,7 +19,7 @@
/*
* Allow thrown items into smartfridges
*/
-/obj/machinery/smartfridge/hitby(var/atom/movable/source, datum/thrownthing/throwingdatum)
+/obj/machinery/smartfridge/hitby(atom/movable/source, datum/thrownthing/throwingdatum)
. = ..()
var/mob/thrower = throwingdatum?.get_thrower()
if(accept_check(source) && thrower)
@@ -47,7 +47,7 @@
var/obj/machinery/smartfridge/chemistry/chemvator/attached
circuit = /obj/item/circuitboard/smartfridge/chemvator
-/obj/machinery/smartfridge/chemistry/chemvator/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/chemistry/chemvator/accept_check(obj/item/O as obj)
if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers) || istype(O,/obj/item/reagent_containers/glass/))
return 1
return 0
diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm
index 057437d241..96d0154971 100644
--- a/code/modules/food/recipe.dm
+++ b/code/modules/food/recipe.dm
@@ -64,7 +64,7 @@
var/wiki_flag = 0
-/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents, var/exact = FALSE)
+/datum/recipe/proc/check_reagents(datum/reagents/avail_reagents, exact = FALSE)
if(!reagents || !reagents.len)
return TRUE
@@ -83,7 +83,7 @@
return FALSE
return TRUE
-/datum/recipe/proc/check_fruit(var/obj/container, var/exact = FALSE)
+/datum/recipe/proc/check_fruit(obj/container, exact = FALSE)
if (!fruit || !fruit.len)
return TRUE
@@ -106,7 +106,7 @@
break
return .
-/datum/recipe/proc/check_items(var/obj/container as obj, var/exact = FALSE)
+/datum/recipe/proc/check_items(obj/container as obj, exact = FALSE)
if(!items || !items.len)
return TRUE
@@ -147,7 +147,7 @@
return .
//This is called on individual items within the container.
-/datum/recipe/proc/check_coating(var/obj/O, var/exact = FALSE)
+/datum/recipe/proc/check_coating(obj/O, exact = FALSE)
if(!istype(O,/obj/item/reagent_containers/food/snacks))
return TRUE //Only snacks can be battered
@@ -165,7 +165,7 @@
return FALSE
//general version
-/datum/recipe/proc/make(var/obj/container as obj)
+/datum/recipe/proc/make(obj/container as obj)
var/obj/result_obj = new result(container)
if(istype(container, /obj/machinery))
var/obj/machinery/machine = container
@@ -181,7 +181,7 @@
// food-related
// This proc is called under the assumption that the container has already been checked and found to contain the necessary ingredients
-/datum/recipe/proc/make_food(var/obj/container as obj)
+/datum/recipe/proc/make_food(obj/container as obj)
if(!result)
log_runtime(EXCEPTION(span_danger("Recipe [type] is defined without a result, please bug report this.")))
if(istype(container, /obj/machinery/microwave))
@@ -315,7 +315,7 @@
// When exact is false, extraneous ingredients are ignored
// When exact is true, extraneous ingredients will fail the recipe
// In both cases, the full set of required ingredients is still needed
-/proc/select_recipe(var/list/datum/recipe/available_recipes, var/obj/obj as obj, var/exact)
+/proc/select_recipe(list/datum/recipe/available_recipes, obj/obj as obj, exact)
var/highest_count = 0
var/count = 0
for (var/datum/recipe/recipe in available_recipes)
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 6b4f9ace75..3ae5eb5e6c 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -51,10 +51,10 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
wiki_flag = WIKI_SPOILER
-/datum/recipe/donkpocket/proc/warm_up(var/obj/item/reagent_containers/food/snacks/donkpocket/being_cooked)
+/datum/recipe/donkpocket/proc/warm_up(obj/item/reagent_containers/food/snacks/donkpocket/being_cooked)
being_cooked.heat()
-/datum/recipe/donkpocket/make_food(var/obj/container as obj)
+/datum/recipe/donkpocket/make_food(obj/container as obj)
. = ..(container)
for (var/obj/item/reagent_containers/food/snacks/donkpocket/D in .)
if (!D.warm)
@@ -67,7 +67,7 @@ I said no!
)
result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL
-/datum/recipe/donkpocket/warm/make_food(var/obj/container)
+/datum/recipe/donkpocket/warm/make_food(obj/container)
var/list/results = list()
var/obj/item/reagent_containers/food/snacks/donkpocket/D = locate(/obj/item/reagent_containers/food/snacks/donkpocket) in container
if(!D)
@@ -190,7 +190,7 @@ I said no!
reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_AMATOXIN = 5)
result = /obj/item/reagent_containers/food/snacks/amanitajelly
-/datum/recipe/amanitajelly/make_food(var/obj/container as obj)
+/datum/recipe/amanitajelly/make_food(obj/container as obj)
. = ..(container)
for(var/obj/item/reagent_containers/food/snacks/amanitajelly/being_cooked in .)
being_cooked.reagents.del_reagent(REAGENT_ID_AMATOXIN)
@@ -495,7 +495,7 @@ I said no!
result = /obj/item/reagent_containers/food/snacks/donkpocket/dankpocket
wiki_flag = WIKI_SPOILER
-/datum/recipe/validsalad/make_food(var/obj/container as obj)
+/datum/recipe/validsalad/make_food(obj/container as obj)
. = ..(container)
for (var/obj/item/reagent_containers/food/snacks/validsalad/being_cooked in .)
being_cooked.reagents.del_reagent(REAGENT_ID_TOXIN)
diff --git a/code/modules/gamemaster/event2/events/engineering/camera_damage.dm b/code/modules/gamemaster/event2/events/engineering/camera_damage.dm
index 2051d48b13..b6bc4e77eb 100644
--- a/code/modules/gamemaster/event2/events/engineering/camera_damage.dm
+++ b/code/modules/gamemaster/event2/events/engineering/camera_damage.dm
@@ -23,7 +23,7 @@
if(prob(25))
cam.wires.cut(WIRE_CAM_ALARM)
-/datum/event2/event/camera_damage/proc/acquire_random_camera(var/remaining_attempts = 5)
+/datum/event2/event/camera_damage/proc/acquire_random_camera(remaining_attempts = 5)
if(!GLOB.cameranet.cameras.len)
return
if(!remaining_attempts)
@@ -35,7 +35,7 @@
// It is very important to use --var and not var-- for recursive calls, as var-- will cause an infinite loop.
return acquire_random_camera(--remaining_attempts)
-/datum/event2/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
+/datum/event2/event/camera_damage/proc/is_valid_camera(obj/machinery/camera/C)
// Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
var/turf/T = get_turf(C)
return T && C?.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
diff --git a/code/modules/gamemaster/event2/events/engineering/window_break.dm b/code/modules/gamemaster/event2/events/engineering/window_break.dm
index cbf2f864ff..a25d2825dd 100644
--- a/code/modules/gamemaster/event2/events/engineering/window_break.dm
+++ b/code/modules/gamemaster/event2/events/engineering/window_break.dm
@@ -116,7 +116,7 @@
return FALSE
//TL;DR: breadth first search for all connected turfs with windows
-/datum/event2/event/window_break/proc/gather_collateral_windows(var/obj/structure/window/target_window)
+/datum/event2/event/window_break/proc/gather_collateral_windows(obj/structure/window/target_window)
var/list/turf/frontier_set = list(target_window.loc)
var/list/obj/structure/window/result_set = list()
var/list/turf/explored_set = list()
diff --git a/code/modules/gamemaster/event2/events/everyone/solar_storm.dm b/code/modules/gamemaster/event2/events/everyone/solar_storm.dm
index 137e78979b..c28a9fb7b7 100644
--- a/code/modules/gamemaster/event2/events/everyone/solar_storm.dm
+++ b/code/modules/gamemaster/event2/events/everyone/solar_storm.dm
@@ -33,7 +33,7 @@
Please report to medbay if you experience any unusual symptoms.", "Anomaly Alert")
adjust_solar_output(1)
-/datum/event2/event/solar_storm/proc/adjust_solar_output(var/mult = 1)
+/datum/event2/event/solar_storm/proc/adjust_solar_output(mult = 1)
if(isnull(base_solar_gen_rate))
base_solar_gen_rate = GLOB.solar_gen_rate
GLOB.solar_gen_rate = mult * base_solar_gen_rate
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 90e8e469a8..38ec05f5ad 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -509,7 +509,7 @@
qdel(src)
return
-/obj/item/hand/update_icon(var/direction = 0)
+/obj/item/hand/update_icon(direction = 0)
var/cardNumber = cards.len
diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm
index 7776faaff8..de761c89b6 100644
--- a/code/modules/genetics/side_effects.dm
+++ b/code/modules/genetics/side_effects.dm
@@ -19,7 +19,7 @@
// start the side effect, this should give some cue as to what's happening,
// such as gasping. These cues need to be unique among side-effects.
-/datum/genetics/side_effect/proc/finish(var/datum/weakref/WR)
+/datum/genetics/side_effect/proc/finish(datum/weakref/WR)
var/mob/living/carbon/human/H = WR.resolve()
if(!H || !ishuman(H)) return FALSE
H.genetic_side_effects -= src
diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm
index 168c6930c0..af547159c4 100644
--- a/code/modules/ghosttrap/trap.dm
+++ b/code/modules/ghosttrap/trap.dm
@@ -3,7 +3,7 @@
GLOBAL_LIST(ghost_traps)
-/proc/get_ghost_trap(var/trap_key)
+/proc/get_ghost_trap(trap_key)
if(!GLOB.ghost_traps)
populate_ghost_traps()
return GLOB.ghost_traps[trap_key]
@@ -22,7 +22,7 @@ GLOBAL_LIST(ghost_traps)
var/ghost_trap_role = "Positronic Brain"
// Check for bans, proper atom types, etc.
-/datum/ghosttrap/proc/assess_candidate(var/mob/observer/dead/candidate)
+/datum/ghosttrap/proc/assess_candidate(mob/observer/dead/candidate)
if(!istype(candidate) || !candidate.client || !candidate.ckey)
return 0
if(!candidate.MayRespawn())
@@ -36,7 +36,7 @@ GLOBAL_LIST(ghost_traps)
return 1
// Print a message to all ghosts with the right prefs/lack of bans.
-/datum/ghosttrap/proc/request_player(var/mob/target, var/request_string)
+/datum/ghosttrap/proc/request_player(mob/target, request_string)
if(!target)
return
for(var/mob/observer/dead/O in GLOB.player_list)
@@ -65,7 +65,7 @@ GLOBAL_LIST(ghost_traps)
return 1
// Shunts the ckey/mind into the target mob.
-/datum/ghosttrap/proc/transfer_personality(var/mob/candidate, var/mob/target)
+/datum/ghosttrap/proc/transfer_personality(mob/candidate, mob/target)
if(!assess_candidate(candidate))
return 0
target.ckey = candidate.ckey
@@ -77,7 +77,7 @@ GLOBAL_LIST(ghost_traps)
return 1
// Fluff!
-/datum/ghosttrap/proc/welcome_candidate(var/mob/target)
+/datum/ghosttrap/proc/welcome_candidate(mob/target)
to_chat(target, span_infoplain(span_bold("You are a positronic brain, brought into existence on [station_name()].")))
to_chat(target, span_infoplain(span_bold("As a synthetic intelligence, you answer to all crewmembers, as well as the AI.")))
to_chat(target, span_infoplain(span_bold("Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.")))
@@ -92,7 +92,7 @@ GLOBAL_LIST(ghost_traps)
P.icon_state = "posibrain-occupied"
// Allows people to set their own name. May or may not need to be removed for posibrains if people are dumbasses.
-/datum/ghosttrap/proc/set_new_name(var/mob/target)
+/datum/ghosttrap/proc/set_new_name(mob/target)
var/newname = sanitizeSafe(tgui_input_text(target,"Enter a name, or leave blank for the default name.", "Name change","", MAX_NAME_LEN, encode = FALSE), MAX_NAME_LEN)
if (newname != "")
target.real_name = newname
@@ -106,7 +106,7 @@ GLOBAL_LIST(ghost_traps)
ghost_trap_message = "They are occupying a living plant now."
ghost_trap_role = "Plant"
-/datum/ghosttrap/plant/welcome_candidate(var/mob/target)
+/datum/ghosttrap/plant/welcome_candidate(mob/target)
to_chat(target, span_infoplain(span_alium(span_bold("You awaken slowly, stirring into sluggish motion as the air caresses you."))))
// This is a hack, replace with some kind of species blurb proc.
if(istype(target,/mob/living/carbon/alien/diona))
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index b36d85aa0a..b252f56d14 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -69,10 +69,10 @@
"Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list())
)
-/obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/HolodeckControl/attack_ai(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/computer/HolodeckControl/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/HolodeckControl/attack_hand(mob/user as mob)
if(..())
return
tgui_interact(user)
@@ -150,7 +150,7 @@
add_fingerprint(ui.user)
-/obj/machinery/computer/HolodeckControl/emag_act(var/remaining_charges, var/mob/user as mob)
+/obj/machinery/computer/HolodeckControl/emag_act(remaining_charges, mob/user as mob)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
last_to_emag = user //emag again to change the owner
if (!emagged)
@@ -232,7 +232,7 @@
T.ex_act(3)
T.hotspot_expose(1000,500,1)
-/obj/machinery/computer/HolodeckControl/proc/derez(var/obj/obj , var/silent = 1)
+/obj/machinery/computer/HolodeckControl/proc/derez(obj/obj , silent = 1)
holographic_objs.Remove(obj)
if(obj == null)
@@ -248,7 +248,7 @@
visible_message("The [oldobj.name] fades away!")
qdel(obj)
-/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A)
+/obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A)
for(var/turf/T in A)
if(istype(T, /turf/space))
return 0
@@ -256,7 +256,7 @@
return 1
//Why is it called toggle if it doesn't toggle?
-/obj/machinery/computer/HolodeckControl/proc/togglePower(var/toggleOn = 0)
+/obj/machinery/computer/HolodeckControl/proc/togglePower(toggleOn = 0)
if(toggleOn)
loadProgram(default_program, 0)
else
@@ -269,7 +269,7 @@
update_use_power(USE_POWER_IDLE)
-/obj/machinery/computer/HolodeckControl/proc/loadProgram(var/prog, var/check_delay = 1)
+/obj/machinery/computer/HolodeckControl/proc/loadProgram(prog, check_delay = 1)
if(!prog)
return
@@ -356,7 +356,7 @@
return 1
-/obj/machinery/computer/HolodeckControl/proc/toggleGravity(var/area/A)
+/obj/machinery/computer/HolodeckControl/proc/toggleGravity(area/A)
if(world.time < (last_gravity_change + 25))
if(world.time < (last_gravity_change + 15))//To prevent super-spam clicking
return
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index 8f09558f94..38fb966622 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -163,7 +163,7 @@
sparring_variant_type = /datum/unarmed_attack/holopugilism
is_punch = TRUE
-/datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/zone)
+/datum/unarmed_attack/holopugilism/unarmed_override(mob/living/carbon/human/user,mob/living/carbon/human/target,zone)
user.do_attack_animation(src)
var/damage = rand(0, 9)
if(!damage)
@@ -234,7 +234,7 @@
..()
return
-/obj/structure/window/reinforced/holowindow/shatter(var/display_message = 1)
+/obj/structure/window/reinforced/holowindow/shatter(display_message = 1)
playsound(src, "shatter", 70, 1)
if(display_message)
visible_message("[src] fades away as it shatters!")
@@ -269,7 +269,7 @@
return
-/obj/machinery/door/window/holowindoor/shatter(var/display_message = 1)
+/obj/machinery/door/window/holowindoor/shatter(display_message = 1)
src.density = FALSE
playsound(src, "shatter", 70, 1)
if(display_message)
@@ -316,7 +316,7 @@
/obj/item/holo/esword/red
lcolor = "#FF0000"
-/obj/item/holo/esword/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/holo/esword/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(active && default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
@@ -513,7 +513,7 @@
. = ..()
set_light(2) //hologram lighting
-/mob/living/simple_mob/animal/space/carp/holodeck/proc/set_safety(var/safe)
+/mob/living/simple_mob/animal/space/carp/holodeck/proc/set_safety(safe)
if (safe)
faction = FACTION_NEUTRAL
melee_damage_lower = 0
diff --git a/code/modules/holodeck/HolodeckPrograms.dm b/code/modules/holodeck/HolodeckPrograms.dm
index c68f26d731..af9a058e42 100644
--- a/code/modules/holodeck/HolodeckPrograms.dm
+++ b/code/modules/holodeck/HolodeckPrograms.dm
@@ -2,6 +2,6 @@
var/target
var/list/ambience = null
-/datum/holodeck_program/New(var/target, var/list/ambience = null)
+/datum/holodeck_program/New(target, list/ambience = null)
src.target = target
src.ambience = ambience
diff --git a/code/modules/holomap/generate_holomap.dm b/code/modules/holomap/generate_holomap.dm
index 7d9c575bd6..cb540221f2 100644
--- a/code/modules/holomap/generate_holomap.dm
+++ b/code/modules/holomap/generate_holomap.dm
@@ -52,7 +52,7 @@
S.setup_holomap()
// Generates the "base" holomap for one z-level, showing only the physical structure of walls and paths.
-/datum/controller/subsystem/holomaps/proc/generateHoloMinimap(var/zLevel = 1)
+/datum/controller/subsystem/holomaps/proc/generateHoloMinimap(zLevel = 1)
// Sanity checks - Better to generate a helpful error message now than have DrawBox() runtime
var/icon/canvas = icon(HOLOMAP_ICON, "blank")
if(world.maxx > canvas.Width())
@@ -78,7 +78,7 @@
// This seems to do the drawing thing, but draws only the areas, having nothing to do with the tiles.
// Leshana: I'm guessing this map will get overlayed on top of the base map at runtime? We'll see.
// Wait, seems we actually blend the area map on top of it right now! Huh.
-/datum/controller/subsystem/holomaps/proc/generateStationMinimap(var/zLevel)
+/datum/controller/subsystem/holomaps/proc/generateStationMinimap(zLevel)
// Sanity checks - Better to generate a helpful error message now than have DrawBox() runtime
var/icon/canvas = icon(HOLOMAP_ICON, "blank")
if(world.maxx > canvas.Width())
diff --git a/code/modules/holomap/holomap_datum.dm b/code/modules/holomap/holomap_datum.dm
index f6d4f61bba..68fefcc3cc 100644
--- a/code/modules/holomap/holomap_datum.dm
+++ b/code/modules/holomap/holomap_datum.dm
@@ -4,7 +4,7 @@
var/image/cursor
var/image/legend
-/datum/station_holomap/proc/initialize_holomap(var/turf/T, var/isAI = null, var/mob/user = null, var/reinit = FALSE)
+/datum/station_holomap/proc/initialize_holomap(turf/T, isAI = null, mob/user = null, reinit = FALSE)
if(!station_map || reinit)
station_map = image(SSholomaps.extraMiniMaps["[HOLOMAP_EXTRA_STATIONMAP]_[T.z]"])
if(!cursor || reinit)
diff --git a/code/modules/holomap/mapper.dm b/code/modules/holomap/mapper.dm
index b5bedca118..8add79f5c7 100644
--- a/code/modules/holomap/mapper.dm
+++ b/code/modules/holomap/mapper.dm
@@ -395,7 +395,7 @@
marker_prefix = prefix_update_rig["[rig.type]"]
return
-/obj/item/mapping_unit/proc/handle_marker(var/atom/movable/marker,var/TU_x,var/TU_y)
+/obj/item/mapping_unit/proc/handle_marker(atom/movable/marker,TU_x,TU_y)
marker.pixel_x = TU_x - 8 //16x16 icons, so to center.
marker.pixel_y = TU_y - 8
animate(marker, alpha = 0, time = 5, easing = SINE_EASING)
diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm
index 1c8c566334..21cd290b75 100644
--- a/code/modules/holomap/station_holomap.dm
+++ b/code/modules/holomap/station_holomap.dm
@@ -65,7 +65,7 @@
spawn(1) //When built from frames, need to allow time for it to set pixel_x and pixel_y
update_icon()
-/obj/machinery/station_map/attack_hand(var/mob/user)
+/obj/machinery/station_map/attack_hand(mob/user)
if(watching_mob && (watching_mob != user))
to_chat(user, span_warning("Someone else is currently watching the holomap."))
return
@@ -77,7 +77,7 @@
startWatching(user)
// Let people bump up against it to watch
-/obj/machinery/station_map/Bumped(var/atom/movable/AM)
+/obj/machinery/station_map/Bumped(atom/movable/AM)
if(!watching_mob && isliving(AM) && AM.loc == loc)
startWatching(AM)
@@ -85,7 +85,7 @@
if(get_dir(mover, target) == GLOB.reverse_dir[dir])
return FALSE
return TRUE
-/obj/machinery/station_map/proc/startWatching(var/mob/user)
+/obj/machinery/station_map/proc/startWatching(mob/user)
// Okay, does this belong on a screen thing or what?
// One argument is that this is an "in game" object becuase its in the world.
// But I think it actually isn't. The map isn't holo projected into the whole room, (maybe strat one is!)
@@ -122,7 +122,7 @@
else
to_chat(user, span_notice("A hologram of the station appears before your eyes."))
-/obj/machinery/station_map/attack_ai(var/mob/living/silicon/robot/user)
+/obj/machinery/station_map/attack_ai(mob/living/silicon/robot/user)
return // TODO - Implement for AI ~Leshana
// user.station_holomap.toggleHolomap(user, isAI(user))
@@ -224,7 +224,7 @@
circuit = /obj/item/circuitboard/station_map
icon_override = 'icons/obj/machines/stationmap.dmi'
-/datum/frame/frame_types/station_map/get_icon_state(var/state)
+/datum/frame/frame_types/station_map/get_icon_state(state)
return "station_map_frame_[state]"
/obj/structure/frame
diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm
index 933d000c2b..9f1435674f 100644
--- a/code/modules/hydroponics/backtank.dm
+++ b/code/modules/hydroponics/backtank.dm
@@ -49,7 +49,7 @@
/obj/item/watertank/ui_action_click(mob/user)
toggle_mister(user)
-/obj/item/watertank/attack_hand(var/mob/user)
+/obj/item/watertank/attack_hand(mob/user)
if(loc == user)
toggle_mister()
else
@@ -98,7 +98,7 @@
if(slot != slot_back)
remove_noz()
-/obj/item/watertank/proc/remove_noz(var/mob/user)
+/obj/item/watertank/proc/remove_noz(mob/user)
if(!noz) return
if(ismob(noz.loc))
diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm
index 503fab41bf..94f7870b28 100644
--- a/code/modules/hydroponics/beekeeping/beehive.dm
+++ b/code/modules/hydroponics/beekeeping/beehive.dm
@@ -34,12 +34,12 @@
if(81 to 100)
add_overlay("bees3")
-/obj/machinery/beehive/examine(var/mob/user)
+/obj/machinery/beehive/examine(mob/user)
. = ..()
if(!closed)
. += "The lid is open."
-/obj/machinery/beehive/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/beehive/attackby(obj/item/I, mob/user)
if(I.has_tool_quality(TOOL_CROWBAR))
closed = !closed
user.visible_message(span_notice("[user] [closed ? "closes" : "opens"] \the [src]."), span_notice("You [closed ? "close" : "open"] \the [src]."))
@@ -126,7 +126,7 @@
qdel(src)
return
-/obj/machinery/beehive/attack_hand(var/mob/user)
+/obj/machinery/beehive/attack_hand(mob/user)
if(!closed)
if(honeycombs < 100)
to_chat(user, span_notice("There are no filled honeycombs."))
@@ -212,7 +212,7 @@
if(processing)
icon_state = "[icon_state]_moving"
-/obj/machinery/honey_extractor/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/honey_extractor/attackby(obj/item/I, mob/user)
if(processing)
to_chat(user, span_notice("\The [src] is currently spinning, wait until it's finished."))
return
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 9f2a9e3c71..6b16a1c9a1 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -16,7 +16,7 @@
special_handling = TRUE
-/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, var/planttype)
+/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, planttype)
. = ..()
if(!dried_type)
@@ -143,7 +143,7 @@
SSplants.plant_icon_cache[icon_key] = plant_icon
add_overlay(plant_icon)
-/obj/item/reagent_containers/food/snacks/grown/Crossed(var/mob/living/M)
+/obj/item/reagent_containers/food/snacks/grown/Crossed(mob/living/M)
if(M.is_incorporeal())
return
if(seed && seed.get_trait(TRAIT_JUICY) == 2)
@@ -170,7 +170,7 @@
if(seed) seed.thrown_at(src,hit_atom)
..()
-/obj/item/reagent_containers/food/snacks/grown/attackby(var/obj/item/W, var/mob/living/user)
+/obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/W, mob/living/user)
if(seed)
if(seed.get_trait(TRAIT_PRODUCES_POWER) && istype(W, /obj/item/stack/cable_coil))
@@ -257,7 +257,7 @@
. = ..()
-/obj/item/reagent_containers/food/snacks/grown/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/reagent_containers/food/snacks/grown/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
if(seed && seed.get_trait(TRAIT_STINGS))
@@ -377,7 +377,7 @@
GLOBAL_LIST_EMPTY(fruit_icon_cache)
-/obj/item/reagent_containers/food/snacks/fruit_slice/Initialize(mapload, var/datum/seed/S)
+/obj/item/reagent_containers/food/snacks/fruit_slice/Initialize(mapload, datum/seed/S)
. = ..()
// Need to go through and make a general image caching controller. Todo.
if(!istype(S))
diff --git a/code/modules/hydroponics/grown_sif.dm b/code/modules/hydroponics/grown_sif.dm
index aa3e827ca7..22068c88e7 100644
--- a/code/modules/hydroponics/grown_sif.dm
+++ b/code/modules/hydroponics/grown_sif.dm
@@ -10,7 +10,7 @@
if(seeds)
to_chat(user, span_notice("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object."))
-/obj/item/reagent_containers/food/snacks/grown/sif/attackby(var/obj/item/W, var/mob/living/user)
+/obj/item/reagent_containers/food/snacks/grown/sif/attackby(obj/item/W, mob/living/user)
if(seed && W.sharp && seeds > 0)
var/take_seeds = min(seeds, rand(1,2))
seeds -= take_seeds
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 4483f9950d..4422f4d1cd 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -81,19 +81,19 @@
sleep(-1)
update_growth_stages()
-/datum/seed/proc/get_trait(var/trait)
+/datum/seed/proc/get_trait(trait)
return traits["[trait]"]
/datum/seed/proc/get_trash_type()
return trash_type
-/datum/seed/proc/set_trait(var/trait,var/nval,var/ubound,var/lbound, var/degrade)
+/datum/seed/proc/set_trait(trait,nval,ubound,lbound, degrade)
if(!isnull(degrade)) nval *= degrade
if(!isnull(ubound)) nval = min(nval,ubound)
if(!isnull(lbound)) nval = max(nval,lbound)
traits["[trait]"] = nval
-/datum/seed/proc/create_spores(var/turf/T)
+/datum/seed/proc/create_spores(turf/T)
if(!T)
return
if(!istype(T))
@@ -113,7 +113,7 @@
S.start()
// Does brute damage to a target.
-/datum/seed/proc/do_thorns(var/mob/living/carbon/human/target, var/obj/item/fruit, var/target_limb)
+/datum/seed/proc/do_thorns(mob/living/carbon/human/target, obj/item/fruit, target_limb)
if(!get_trait(TRAIT_CARNIVOROUS))
return
@@ -157,7 +157,7 @@
target.adjustBruteLoss(damage)
// Adds reagents to a target.
-/datum/seed/proc/do_sting(var/mob/living/carbon/human/target, var/obj/item/fruit)
+/datum/seed/proc/do_sting(mob/living/carbon/human/target, obj/item/fruit)
if(!get_trait(TRAIT_STINGS))
return
if(chems && chems.len)
@@ -183,7 +183,7 @@
fruit.reagents.remove_reagent(chem, injecting)
//Splatter a turf.
-/datum/seed/proc/splatter(var/turf/T,var/obj/item/thrown)
+/datum/seed/proc/splatter(turf/T,obj/item/thrown)
if(splat_type && !(locate(/obj/effect/plant) in T))
var/obj/effect/plant/splat = new splat_type(T, src)
if(!istype(splat)) // Plants handle their own stuff.
@@ -222,7 +222,7 @@
R.add_reagent(chem,min(5,max(1,get_trait(TRAIT_POTENCY)/3)))
//Applies an effect to a target atom.
-/datum/seed/proc/thrown_at(var/obj/item/thrown,var/atom/target, var/force_explode)
+/datum/seed/proc/thrown_at(obj/item/thrown,atom/target, force_explode)
var/splatted
var/turf/origin_turf = get_turf(target)
@@ -289,7 +289,7 @@
origin_turf.visible_message(span_danger("The [thrown.name] splatters against [target]!"))
qdel(thrown)
-/datum/seed/proc/handle_environment(var/turf/current_turf, var/datum/gas_mixture/environment, var/light_supplied, var/check_only)
+/datum/seed/proc/handle_environment(turf/current_turf, datum/gas_mixture/environment, light_supplied, check_only)
var/health_change = 0
// Handle gas consumption.
@@ -339,7 +339,7 @@
return health_change
-/datum/seed/proc/apply_special_effect(var/mob/living/target,var/obj/item/thrown)
+/datum/seed/proc/apply_special_effect(mob/living/target,obj/item/thrown)
var/impact = 1
do_sting(target,thrown)
@@ -566,7 +566,7 @@
return pick(mutants)
//Mutates the plant overall (randomly).
-/datum/seed/proc/mutate(var/degree,var/turf/source_turf)
+/datum/seed/proc/mutate(degree,turf/source_turf)
if(!degree || get_trait(TRAIT_IMMUTABLE) > 0) return
@@ -658,7 +658,7 @@
return
//Mutates a specific trait/set of traits.
-/datum/seed/proc/apply_gene(var/datum/plantgene/gene)
+/datum/seed/proc/apply_gene(datum/plantgene/gene)
if(!gene || !gene.values || get_trait(TRAIT_IMMUTABLE) > 0) return
@@ -727,7 +727,7 @@
update_growth_stages()
//Returns a list of the desired trait values.
-/datum/seed/proc/get_gene(var/genetype)
+/datum/seed/proc/get_gene(genetype)
if(!genetype) return 0
@@ -772,7 +772,7 @@
return (P ? P : 0)
//Place the plant products at the feet of the user.
-/datum/seed/proc/harvest(var/mob/user,var/yield_mod,var/harvest_sample,var/force_amount,var/reagent_mod,var/reagent_mod_amount)
+/datum/seed/proc/harvest(mob/user,yield_mod,harvest_sample,force_amount,reagent_mod,reagent_mod_amount)
if(!user)
return
@@ -855,7 +855,7 @@
// When the seed in this machine mutates/is modified, the tray seed value
// is set to a new datum copied from the original. This datum won't actually
// be put into the global datum list until the product is harvested, though.
-/datum/seed/proc/diverge(var/modified)
+/datum/seed/proc/diverge(modified)
if(get_trait(TRAIT_IMMUTABLE) > 0) return
diff --git a/code/modules/hydroponics/seed_gene_mut.dm b/code/modules/hydroponics/seed_gene_mut.dm
index 63c12a7b1a..2c82ef0600 100644
--- a/code/modules/hydroponics/seed_gene_mut.dm
+++ b/code/modules/hydroponics/seed_gene_mut.dm
@@ -1,4 +1,4 @@
-/datum/seed/proc/diverge_mutate_gene(var/datum/decl/plantgene/G, var/turf/T)
+/datum/seed/proc/diverge_mutate_gene(datum/decl/plantgene/G, turf/T)
if(!istype(G))
log_runtime("Attempted to mutate [src] with a non-plantgene var.")
return src
@@ -48,13 +48,13 @@
/datum/decl/plantgene/special
gene_tag = GENE_SPECIAL
-/datum/decl/plantgene/proc/mutate(var/datum/seed/S)
+/datum/decl/plantgene/proc/mutate(datum/seed/S)
return
-/datum/decl/plantgene/biochem/mutate(var/datum/seed/S)
+/datum/decl/plantgene/biochem/mutate(datum/seed/S)
S.set_trait(TRAIT_POTENCY, S.get_trait(TRAIT_POTENCY)+rand(-20,20),200, 0)
-/datum/decl/plantgene/hardiness/mutate(var/datum/seed/S)
+/datum/decl/plantgene/hardiness/mutate(datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_TOXINS_TOLERANCE, S.get_trait(TRAIT_TOXINS_TOLERANCE)+rand(-2,2),10,0)
if(prob(60))
@@ -64,7 +64,7 @@
if(prob(60))
S.set_trait(TRAIT_ENDURANCE, S.get_trait(TRAIT_ENDURANCE)+rand(-5,5),100,0)
-/datum/decl/plantgene/environment/mutate(var/datum/seed/S)
+/datum/decl/plantgene/environment/mutate(datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_IDEAL_HEAT, S.get_trait(TRAIT_IDEAL_HEAT)+rand(-2,2),10,0)
if(prob(60))
@@ -72,7 +72,7 @@
if(prob(60))
S.set_trait(TRAIT_LIGHT_TOLERANCE, S.get_trait(TRAIT_LIGHT_TOLERANCE)+rand(-5,5),100,0)
-/datum/decl/plantgene/metabolism/mutate(var/datum/seed/S)
+/datum/decl/plantgene/metabolism/mutate(datum/seed/S)
if(prob(65))
S.set_trait(TRAIT_REQUIRES_NUTRIENTS, S.get_trait(TRAIT_REQUIRES_NUTRIENTS)+rand(-2,2),10,0)
if(prob(65))
@@ -80,7 +80,7 @@
if(prob(40))
S.set_trait(TRAIT_ALTER_TEMP, S.get_trait(TRAIT_ALTER_TEMP)+rand(-5,5),100,0)
-/datum/decl/plantgene/diet/mutate(var/datum/seed/S)
+/datum/decl/plantgene/diet/mutate(datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_CARNIVOROUS, S.get_trait(TRAIT_CARNIVOROUS)+rand(-1,1),2,0)
if(prob(60))
@@ -90,7 +90,7 @@
if(prob(65))
S.set_trait(TRAIT_WATER_CONSUMPTION, S.get_trait(TRAIT_WATER_CONSUMPTION)+rand(-1,1),50,0)
-/datum/decl/plantgene/output/mutate(var/datum/seed/S, var/turf/T)
+/datum/decl/plantgene/output/mutate(datum/seed/S, turf/T)
if(prob(50))
S.set_trait(TRAIT_BIOLUM, !S.get_trait(TRAIT_BIOLUM))
if(S.get_trait(TRAIT_BIOLUM))
@@ -111,7 +111,7 @@
else
T.visible_message(span_notice("\The [S.display_name]'s spores no longer fall."))
-/datum/decl/plantgene/atmosphere/mutate(var/datum/seed/S)
+/datum/decl/plantgene/atmosphere/mutate(datum/seed/S)
if(prob(60))
S.set_trait(TRAIT_HEAT_TOLERANCE, S.get_trait(TRAIT_HEAT_TOLERANCE)+rand(-2,2),40,0)
if(prob(60))
@@ -119,7 +119,7 @@
if(prob(60))
S.set_trait(TRAIT_HIGHKPA_TOLERANCE, S.get_trait(TRAIT_HIGHKPA_TOLERANCE)+rand(-10,10),500,100)
-/datum/decl/plantgene/vigour/mutate(var/datum/seed/S, var/turf/T)
+/datum/decl/plantgene/vigour/mutate(datum/seed/S, turf/T)
if(prob(65))
S.set_trait(TRAIT_PRODUCTION, S.get_trait(TRAIT_PRODUCTION)+rand(-1,1),10,0)
if(prob(65))
@@ -128,7 +128,7 @@
S.set_trait(TRAIT_SPREAD, S.get_trait(TRAIT_SPREAD)+rand(-1,1),2,0)
T.visible_message(span_infoplain(span_bold("\The [S.display_name]") + " spasms visibly, shifting in the tray."))
-/datum/decl/plantgene/fruit/mutate(var/datum/seed/S)
+/datum/decl/plantgene/fruit/mutate(datum/seed/S)
if(prob(65))
S.set_trait(TRAIT_STINGS, !S.get_trait(TRAIT_STINGS))
if(prob(65))
@@ -136,6 +136,6 @@
if(prob(65))
S.set_trait(TRAIT_JUICY, !S.get_trait(TRAIT_JUICY))
-/datum/decl/plantgene/special/mutate(var/datum/seed/S)
+/datum/decl/plantgene/special/mutate(datum/seed/S)
if(prob(65))
S.set_trait(TRAIT_TELEPORTING, !S.get_trait(TRAIT_TELEPORTING))
diff --git a/code/modules/hydroponics/seed_machines_yw.dm b/code/modules/hydroponics/seed_machines_yw.dm
index b263f56469..f184068eaf 100644
--- a/code/modules/hydroponics/seed_machines_yw.dm
+++ b/code/modules/hydroponics/seed_machines_yw.dm
@@ -166,7 +166,7 @@
//nobody's made a helper function for this, so if you want to use it
//elsewhere, feel free to copy it/make it more easily accessible
//Verifies that input is valid hex input (#AAAAAA, where A is 0-F)
-/obj/machinery/botany/precisioneditor/proc/is_valid_hex(var/input)
+/obj/machinery/botany/precisioneditor/proc/is_valid_hex(input)
var/safety_check = 1
if(!(length(input) == 7))
return FALSE //input is either too short or too long
@@ -183,7 +183,7 @@
return TRUE
-/obj/machinery/botany/precisioneditor/proc/add_chem_to_seed(var/chem_name)
+/obj/machinery/botany/precisioneditor/proc/add_chem_to_seed(chem_name)
if(!loaded_beaker)
return
var/chem_amount = loaded_beaker.reagents.get_reagent_amount(chem_name)
diff --git a/code/modules/hydroponics/seed_mobs.dm b/code/modules/hydroponics/seed_mobs.dm
index 63c9f096ba..45eadd6851 100644
--- a/code/modules/hydroponics/seed_mobs.dm
+++ b/code/modules/hydroponics/seed_mobs.dm
@@ -1,5 +1,5 @@
// The following procs are used to grab players for mobs produced by a seed (mostly for dionaea).
-/datum/seed/proc/handle_living_product(var/mob/living/host)
+/datum/seed/proc/handle_living_product(mob/living/host)
if(!host || !istype(host) || ai_mob_product) return
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index a7396fa054..7f4f75027e 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -13,7 +13,7 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
var/datum/seed/seed
var/modified = 0
-/obj/item/seeds/Initialize(mapload, var/_seed_type)
+/obj/item/seeds/Initialize(mapload, _seed_type)
if(_seed_type in SSplants.seeds)
seed_type = _seed_type
update_seed()
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index e6aabcffb2..7ad657ba24 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -5,14 +5,14 @@
var/list/obj/item/seeds/seeds = list() // Tracks actual objects contained in the pile
var/ID
-/datum/seed_pile/New(var/obj/item/seeds/O, var/ID)
+/datum/seed_pile/New(obj/item/seeds/O, ID)
name = O.name
amount = 1
seed_type = O.seed
seeds += O
src.ID = ID
-/datum/seed_pile/proc/matches(var/obj/item/seeds/O)
+/datum/seed_pile/proc/matches(obj/item/seeds/O)
if (O.seed == seed_type)
return 1
return 0
@@ -383,7 +383,7 @@
return TRUE
break
-/obj/machinery/seed_storage/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/seed_storage/attackby(obj/item/O as obj, mob/user as mob)
if (istype(O, /obj/item/seeds) && !lockdown)
add(O)
user.visible_message(span_filter_notice("[user] puts \the [O.name] into \the [src]."), span_filter_notice("You put \the [O] into \the [src]."))
@@ -413,7 +413,7 @@
else if((O.has_tool_quality(TOOL_WIRECUTTER) || istype(O, /obj/item/multitool)) && panel_open)
wires.Interact(user)
-/obj/machinery/seed_storage/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/seed_storage/emag_act(remaining_charges, mob/user)
if(!src.emagged)
emagged = 1
if(lockdown)
@@ -430,7 +430,7 @@
qdel(sparks)
return 1
-/obj/machinery/seed_storage/proc/add(var/obj/item/seeds/O as obj, var/contraband = 0)
+/obj/machinery/seed_storage/proc/add(obj/item/seeds/O as obj, contraband = 0)
if (istype(O.loc, /mob))
var/mob/user = O.loc
user.remove_from_mob(O)
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index bd11857fa2..3f503b2467 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -1,7 +1,7 @@
#define DEFAULT_SEED PLANT_GLOWSHROOM
#define VINE_GROWTH_STAGES 5
-/proc/spacevine_infestation(var/potency_min=70, var/potency_max=100, var/maturation_min=5, var/maturation_max=15)
+/proc/spacevine_infestation(potency_min=70, potency_max=100, maturation_min=5, maturation_max=15)
spawn() //to stop the secrets panel hanging
var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas //CHOMPedit start: keeping old method over upstream's landmark method
for(var/areapath in typesof(/area/hallway))
@@ -83,7 +83,7 @@
/obj/effect/plant/single
spread_chance = 0
-/obj/effect/plant/Initialize(mapload, var/datum/seed/newseed, var/obj/effect/plant/newparent)
+/obj/effect/plant/Initialize(mapload, datum/seed/newseed, obj/effect/plant/newparent)
. = ..()
//VOREStation Edit Start
if(isopenturf(loc))
@@ -242,7 +242,7 @@
floor = 1
return 1
-/obj/effect/plant/attackby(var/obj/item/W, var/mob/user)
+/obj/effect/plant/attackby(obj/item/W, mob/user)
user.setClickCooldown(user.get_attack_speed(W))
SSplants.add_plant(src)
diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm
index 5daae6c25e..3bf2be3ae6 100644
--- a/code/modules/hydroponics/spreading/spreading_response.dm
+++ b/code/modules/hydroponics/spreading/spreading_response.dm
@@ -29,10 +29,10 @@
if(isturf(loc))
sense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity)) // CHOMPEdit
-/obj/effect/plant/attack_hand(var/mob/user)
+/obj/effect/plant/attack_hand(mob/user)
manual_unbuckle(user)
-/obj/effect/plant/attack_generic(var/mob/user)
+/obj/effect/plant/attack_generic(mob/user)
manual_unbuckle(user)
/obj/effect/plant/Crossed(atom/movable/O)
@@ -41,7 +41,7 @@
if(isliving(O))
trodden_on(O)
-/obj/effect/plant/proc/trodden_on(var/mob/living/victim)
+/obj/effect/plant/proc/trodden_on(mob/living/victim)
if(!is_mature())
return
var/mob/living/carbon/human/H = victim
@@ -94,7 +94,7 @@
check_health()
return
-/obj/effect/plant/proc/entangle(var/mob/living/victim)
+/obj/effect/plant/proc/entangle(mob/living/victim)
if(has_buckled_mobs())
return
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 82aea460e1..17c09a54b6 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -140,7 +140,7 @@
REAGENT_ID_PITCHERNECTAR = 1
)
-/obj/machinery/portable_atmospherics/hydroponics/click_alt(var/mob/living/user)
+/obj/machinery/portable_atmospherics/hydroponics/click_alt(mob/living/user)
if(!istype(user))
return
if(mechanical && !user.incapacitated() && Adjacent(user))
@@ -148,7 +148,7 @@
return 1
return ..()
-/obj/machinery/portable_atmospherics/hydroponics/attack_ghost(var/mob/observer/dead/user)
+/obj/machinery/portable_atmospherics/hydroponics/attack_ghost(mob/observer/dead/user)
if(!(harvest && seed && seed.has_mob_product))
return
@@ -161,7 +161,7 @@
harvest()
return
-/obj/machinery/portable_atmospherics/hydroponics/attack_generic(var/mob/user)
+/obj/machinery/portable_atmospherics/hydroponics/attack_generic(mob/user)
// Why did I ever think this was a good idea. TODO: move this onto the nymph mob.
if(istype(user,/mob/living/carbon/alien/diona))
@@ -201,7 +201,7 @@
if(S)
plant_seeds(S)
-/obj/machinery/portable_atmospherics/hydroponics/proc/plant_seeds(var/obj/item/seeds/S)
+/obj/machinery/portable_atmospherics/hydroponics/proc/plant_seeds(obj/item/seeds/S)
lastproduce = 0
seed = S.seed //Grab the seed datum.
dead = 0
@@ -217,7 +217,7 @@
check_health()
update_icon()
-/obj/machinery/portable_atmospherics/hydroponics/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/portable_atmospherics/hydroponics/bullet_act(obj/item/projectile/Proj)
//Don't act on seeds like dionaea that shouldn't change.
if(seed && seed.get_trait(TRAIT_IMMUTABLE) > 0)
@@ -343,7 +343,7 @@
check_health()
//Harvests the product of a plant.
-/obj/machinery/portable_atmospherics/hydroponics/proc/harvest(var/mob/user)
+/obj/machinery/portable_atmospherics/hydroponics/proc/harvest(mob/user)
//Harvest the product of the plant,
if(!seed || !harvest)
@@ -375,7 +375,7 @@
return
//Clears out a dead plant.
-/obj/machinery/portable_atmospherics/hydroponics/proc/remove_dead(var/mob/user)
+/obj/machinery/portable_atmospherics/hydroponics/proc/remove_dead(mob/user)
if(!user || !dead) return
if(closed_system)
@@ -420,7 +420,7 @@
return
-/obj/machinery/portable_atmospherics/hydroponics/proc/mutate(var/severity)
+/obj/machinery/portable_atmospherics/hydroponics/proc/mutate(severity)
// No seed, no mutations.
if(!seed)
@@ -509,7 +509,7 @@
return
-/obj/machinery/portable_atmospherics/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/hydroponics/attackby(obj/item/O as obj, mob/user as mob)
if(O.is_open_container())
return 0
@@ -717,7 +717,7 @@
close_lid(usr)
return
-/obj/machinery/portable_atmospherics/hydroponics/proc/close_lid(var/mob/living/user)
+/obj/machinery/portable_atmospherics/hydroponics/proc/close_lid(mob/living/user)
closed_system = !closed_system
to_chat(user, span_filter_notice("You [closed_system ? "close" : "open"] the tray's lid."))
update_icon()
diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm
index 73a0ede0b8..f616518dbb 100644
--- a/code/modules/hydroponics/trays/tray_soil.dm
+++ b/code/modules/hydroponics/trays/tray_soil.dm
@@ -7,7 +7,7 @@
tray_light = 0
frozen = -1
-/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O,/obj/item/tank))
return
if(istype(O,/obj/item/shovel))
@@ -50,7 +50,7 @@
icon = 'icons/obj/seeds.dmi'
icon_state = "blank"
-/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Initialize(mapload,var/datum/seed/newseed)
+/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Initialize(mapload,datum/seed/newseed)
. = ..()
if(isopenturf(loc))
return INITIALIZE_HINT_QDEL
diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index 91e71c9e12..2e3d23e97d 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -140,7 +140,7 @@
return
print_report(usr)
-/obj/item/analyzer/plant_analyzer/proc/print_report(var/mob/living/user)
+/obj/item/analyzer/plant_analyzer/proc/print_report(mob/living/user)
var/datum/seed/grown_seed = last_seed
if(!istype(grown_seed))
to_chat(user, span_warning("There is no scan data to print."))
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index bd4493f217..1ccdeb114a 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -268,7 +268,7 @@
. += part.size
// Returns true if the circuit made it inside.
-/obj/item/electronic_assembly/proc/add_circuit(var/obj/item/integrated_circuit/IC, var/mob/user)
+/obj/item/electronic_assembly/proc/add_circuit(obj/item/integrated_circuit/IC, mob/user)
if(!opened)
to_chat(user, span_warning("\The [src] isn't opened, so you can't put anything inside. Try using a crowbar."))
return FALSE
@@ -295,7 +295,7 @@
return TRUE
// Non-interactive version of above that always succeeds, intended for build-in circuits that get added on assembly initialization.
-/obj/item/electronic_assembly/proc/force_add_circuit(var/obj/item/integrated_circuit/IC)
+/obj/item/electronic_assembly/proc/force_add_circuit(obj/item/integrated_circuit/IC)
IC.forceMove(src)
IC.assembly = src
@@ -313,7 +313,7 @@
for(var/obj/item/integrated_circuit/input/reference_grabber/G in contents)
G.afterattack(target, user, proximity, null)
-/obj/item/electronic_assembly/attackby(var/obj/item/I, var/mob/user)
+/obj/item/electronic_assembly/attackby(obj/item/I, mob/user)
if(can_anchor && I.has_tool_quality(TOOL_WRENCH))
anchored = !anchored
to_chat(user, span_notice("You've [anchored ? "" : "un"]secured \the [src] to \the [get_turf(src)]."))
@@ -487,5 +487,5 @@
return ..() // Fall back to default behavior if no access_card
// Returns TRUE if I is something that could/should have a valid interaction. Used to tell circuitclothes to hit the circuit with something instead of the clothes
-/obj/item/electronic_assembly/proc/is_valid_tool(var/obj/item/I)
+/obj/item/electronic_assembly/proc/is_valid_tool(obj/item/I)
return I.has_tool_quality(TOOL_CROWBAR) || I.has_tool_quality(TOOL_SCREWDRIVER) || istype(I, /obj/item/integrated_circuit) || istype(I, /obj/item/cell/device) || istype(I, /obj/item/integrated_electronics)
diff --git a/code/modules/integrated_electronics/core/assemblies/device.dm b/code/modules/integrated_electronics/core/assemblies/device.dm
index ca7ca3fe2b..13df160c27 100644
--- a/code/modules/integrated_electronics/core/assemblies/device.dm
+++ b/code/modules/integrated_electronics/core/assemblies/device.dm
@@ -44,7 +44,7 @@
if(EA)
EA.attack_self(user)
-/obj/item/assembly/electronic_assembly/pulsed(var/radio = 0) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
+/obj/item/assembly/electronic_assembly/pulsed(radio = 0) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
if(EA)
for(var/obj/item/integrated_circuit/built_in/device_input/I in EA.contents)
I.do_work()
diff --git a/code/modules/integrated_electronics/core/helpers.dm b/code/modules/integrated_electronics/core/helpers.dm
index 2f32ba90fb..2d974090fb 100644
--- a/code/modules/integrated_electronics/core/helpers.dm
+++ b/code/modules/integrated_electronics/core/helpers.dm
@@ -1,4 +1,4 @@
-/obj/item/integrated_circuit/proc/setup_io(var/list/io_list, var/io_type, var/list/io_default_list)
+/obj/item/integrated_circuit/proc/setup_io(list/io_list, io_type, list/io_default_list)
var/list/io_list_copy = io_list.Copy()
io_list.Cut()
var/i = 1
@@ -19,21 +19,21 @@
io_list.Add(new io_type(src, io_entry, default_data))
i++
-/obj/item/integrated_circuit/proc/set_pin_data(var/pin_type, var/pin_number, datum/new_data)
+/obj/item/integrated_circuit/proc/set_pin_data(pin_type, pin_number, datum/new_data)
if (istype(new_data) && !isweakref(new_data))
new_data = WEAKREF(new_data)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
return pin.write_data_to_pin(new_data)
-/obj/item/integrated_circuit/proc/get_pin_data(var/pin_type, var/pin_number)
+/obj/item/integrated_circuit/proc/get_pin_data(pin_type, pin_number)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
return pin.get_data()
-/obj/item/integrated_circuit/proc/get_pin_data_as_type(var/pin_type, var/pin_number, var/as_type)
+/obj/item/integrated_circuit/proc/get_pin_data_as_type(pin_type, pin_number, as_type)
var/datum/integrated_io/pin = get_pin_ref(pin_type, pin_number)
return pin.data_as_type(as_type)
-/obj/item/integrated_circuit/proc/activate_pin(var/pin_number)
+/obj/item/integrated_circuit/proc/activate_pin(pin_number)
var/datum/integrated_io/activate/A = activators[pin_number]
A.push_data()
@@ -44,7 +44,7 @@
return data.resolve()
return data
-/obj/item/integrated_circuit/proc/get_pin_ref(var/pin_type, var/pin_number)
+/obj/item/integrated_circuit/proc/get_pin_ref(pin_type, pin_number)
switch(pin_type)
if(IC_INPUT)
if(pin_number > inputs.len)
@@ -60,7 +60,7 @@
return activators[pin_number]
return null
-/obj/item/integrated_circuit/proc/handle_wire(var/datum/integrated_io/pin, var/obj/item/integrated_electronics/tool)
+/obj/item/integrated_circuit/proc/handle_wire(datum/integrated_io/pin, obj/item/integrated_electronics/tool)
if(istype(tool, /obj/item/integrated_electronics/wirer))
var/obj/item/integrated_electronics/wirer/wirer = tool
if(pin)
diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm
index 4b21a93f85..cf15117cc9 100644
--- a/code/modules/integrated_electronics/core/integrated_circuit.dm
+++ b/code/modules/integrated_electronics/core/integrated_circuit.dm
@@ -257,7 +257,7 @@ a creative player the means to solve many problems. Circuits are held inside an
return TRUE // Battery has enough.
return FALSE // Not enough power.
-/obj/item/integrated_circuit/proc/check_then_do_work(var/ignore_power = FALSE)
+/obj/item/integrated_circuit/proc/check_then_do_work(ignore_power = FALSE)
if(world.time < next_use) // All intergrated circuits have an internal cooldown, to protect from spam.
return
if(power_draw_per_use && !ignore_power)
diff --git a/code/modules/integrated_electronics/core/pins.dm b/code/modules/integrated_electronics/core/pins.dm
index ab7239d1f4..4eab06fed5 100644
--- a/code/modules/integrated_electronics/core/pins.dm
+++ b/code/modules/integrated_electronics/core/pins.dm
@@ -25,7 +25,7 @@ D [1]/ ||
var/list/linked = list()
var/io_type = DATA_CHANNEL
-/datum/integrated_io/New(var/newloc, var/name, var/new_data)
+/datum/integrated_io/New(newloc, name, new_data)
..()
src.name = name
if(!isnull(new_data))
@@ -44,14 +44,14 @@ D [1]/ ||
return holder.tgui_host()
-/datum/integrated_io/proc/data_as_type(var/as_type)
+/datum/integrated_io/proc/data_as_type(as_type)
if(!isweakref(data))
return
var/datum/weakref/w = data
var/output = w.resolve()
return istype(output, as_type) ? output : null
-/datum/integrated_io/proc/display_data(var/input)
+/datum/integrated_io/proc/display_data(input)
if(isnull(input))
return "(null)" // Empty data means nothing to show.
@@ -110,7 +110,7 @@ list[](
/datum/integrated_io/activate/scramble()
push_data()
-/datum/integrated_io/proc/write_data_to_pin(var/new_data)
+/datum/integrated_io/proc/write_data_to_pin(new_data)
if(isnull(new_data) || isnum(new_data) || istext(new_data) || isweakref(new_data)) // Anything else is a type we don't want.
if(istext(new_data))
new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0)
@@ -146,7 +146,7 @@ list[](
//Now that we're removed from them, we gotta remove them from us.
src.linked.Remove(their_io)
-/datum/integrated_io/proc/ask_for_data_type(mob/user, var/default, var/list/allowed_data_types = list("string","number","null"))
+/datum/integrated_io/proc/ask_for_data_type(mob/user, default, list/allowed_data_types = list("string","number","null"))
var/type_to_use = tgui_input_list(user, "Please choose a type to use.","[src] type setting", allowed_data_types)
if(!holder.check_interactivity(user))
return
diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm
index d90252c396..5eb6663034 100644
--- a/code/modules/integrated_electronics/core/printer.dm
+++ b/code/modules/integrated_electronics/core/printer.dm
@@ -62,7 +62,7 @@
else
return ..()
-/obj/item/integrated_circuit_printer/attackby(var/obj/item/O, var/mob/user)
+/obj/item/integrated_circuit_printer/attackby(obj/item/O, mob/user)
if(istype(O,/obj/item/stack/material))
var/obj/item/stack/material/stack = O
if(stack.material.name == MAT_STEEL)
diff --git a/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm b/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm
index 7e769d862f..afe9817a42 100644
--- a/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/boolean_pin.dm
@@ -7,7 +7,7 @@
var/new_data = !data
write_data_to_pin(new_data)
-/datum/integrated_io/boolean/write_data_to_pin(var/new_data)
+/datum/integrated_io/boolean/write_data_to_pin(new_data)
if(new_data == FALSE || new_data == TRUE)
data = new_data
holder.on_data_written()
@@ -19,7 +19,7 @@
/datum/integrated_io/boolean/display_pin_type()
return IC_FORMAT_BOOLEAN
-/datum/integrated_io/boolean/display_data(var/input)
+/datum/integrated_io/boolean/display_data(input)
if(data == TRUE)
return "(True)"
return "(False)"
diff --git a/code/modules/integrated_electronics/core/special_pins/char_pin.dm b/code/modules/integrated_electronics/core/special_pins/char_pin.dm
index 8398cd8e7e..4f4230d19e 100644
--- a/code/modules/integrated_electronics/core/special_pins/char_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/char_pin.dm
@@ -8,7 +8,7 @@
to_chat(user, span_notice("You input [new_data ? "new_data" : "NULL"] into the pin."))
write_data_to_pin(new_data)
-/datum/integrated_io/char/write_data_to_pin(var/new_data)
+/datum/integrated_io/char/write_data_to_pin(new_data)
if(isnull(new_data) || istext(new_data))
if(length(new_data) > 1)
return
diff --git a/code/modules/integrated_electronics/core/special_pins/color_pin.dm b/code/modules/integrated_electronics/core/special_pins/color_pin.dm
index b254bd4b37..0661eae95d 100644
--- a/code/modules/integrated_electronics/core/special_pins/color_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/color_pin.dm
@@ -8,7 +8,7 @@
to_chat(user, span_notice("You input a new color into the pin."))
write_data_to_pin(new_data)
-/datum/integrated_io/color/write_data_to_pin(var/new_data)
+/datum/integrated_io/color/write_data_to_pin(new_data)
// Since this is storing the color as a string hex color code, we need to make sure it's actually one.
if(isnull(new_data) || istext(new_data))
if(istext(new_data))
@@ -38,7 +38,7 @@
/datum/integrated_io/color/display_pin_type()
return IC_FORMAT_COLOR
-/datum/integrated_io/color/display_data(var/input)
+/datum/integrated_io/color/display_data(input)
if(!isnull(data))
return "([data])"
return ..()
diff --git a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm
index 8e1ad2337d..4cadfc2de1 100644
--- a/code/modules/integrated_electronics/core/special_pins/dir_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/dir_pin.dm
@@ -19,7 +19,7 @@
to_chat(user, span_notice("You input [new_data] into the pin."))
write_data_to_pin(new_data)
-/datum/integrated_io/dir/write_data_to_pin(var/new_data)
+/datum/integrated_io/dir/write_data_to_pin(new_data)
if(isnull(new_data) || (new_data in (GLOB.alldirs + list(UP, DOWN))))
data = new_data
holder.on_data_written()
@@ -27,7 +27,7 @@
/datum/integrated_io/dir/display_pin_type()
return IC_FORMAT_DIR
-/datum/integrated_io/dir/display_data(var/input)
+/datum/integrated_io/dir/display_data(input)
if(!isnull(data))
return "([dir2text(data)])"
return ..()
diff --git a/code/modules/integrated_electronics/core/special_pins/list_pin.dm b/code/modules/integrated_electronics/core/special_pins/list_pin.dm
index 40fcc73adf..221642a1b7 100644
--- a/code/modules/integrated_electronics/core/special_pins/list_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/list_pin.dm
@@ -27,19 +27,19 @@
popup.set_content(t)
popup.open()
-/datum/integrated_io/list/proc/add_to_list(mob/user, var/new_entry)
+/datum/integrated_io/list/proc/add_to_list(mob/user, new_entry)
if(!new_entry && user)
new_entry = ask_for_data_type(user)
if(is_valid(new_entry))
Add(new_entry)
-/datum/integrated_io/list/proc/Add(var/new_entry)
+/datum/integrated_io/list/proc/Add(new_entry)
var/list/my_list = data
if(my_list.len > IC_MAX_LIST_LENGTH)
my_list.Cut(Start=1,End=2)
my_list.Add(new_entry)
-/datum/integrated_io/list/proc/remove_from_list_by_position(mob/user, var/position)
+/datum/integrated_io/list/proc/remove_from_list_by_position(mob/user, position)
var/list/my_list = data
if(!my_list.len)
to_chat(user, span_warning("The list is empty, there's nothing to remove."))
@@ -50,7 +50,7 @@
if(target_entry)
my_list.Remove(target_entry)
-/datum/integrated_io/list/proc/remove_from_list(mob/user, var/target_entry)
+/datum/integrated_io/list/proc/remove_from_list(mob/user, target_entry)
var/list/my_list = data
if(!my_list.len)
to_chat(user, span_warning("The list is empty, there's nothing to remove."))
@@ -60,7 +60,7 @@
if(target_entry)
my_list.Remove(target_entry)
-/datum/integrated_io/list/proc/edit_in_list(mob/user, var/target_entry)
+/datum/integrated_io/list/proc/edit_in_list(mob/user, target_entry)
var/list/my_list = data
if(!my_list.len)
to_chat(user, span_warning("The list is empty, there's nothing to modify."))
@@ -72,7 +72,7 @@
if(edited_entry)
target_entry = edited_entry
-/datum/integrated_io/list/proc/edit_in_list_by_position(mob/user, var/position)
+/datum/integrated_io/list/proc/edit_in_list_by_position(mob/user, position)
var/list/my_list = data
if(!my_list.len)
to_chat(user, span_warning("The list is empty, there's nothing to modify."))
@@ -85,7 +85,7 @@
if(edited_entry)
target_entry = edited_entry
-/datum/integrated_io/list/proc/swap_inside_list(mob/user, var/first_target, var/second_target)
+/datum/integrated_io/list/proc/swap_inside_list(mob/user, first_target, second_target)
var/list/my_list = data
if(my_list.len <= 1)
to_chat(user, span_warning("The list is empty, or too small to do any meaningful swapping."))
@@ -111,7 +111,7 @@
my_list = shuffle(my_list)
push_data()
-/datum/integrated_io/list/write_data_to_pin(var/new_data)
+/datum/integrated_io/list/write_data_to_pin(new_data)
if(islist(new_data))
var/list/new_list = new_data
data = new_list.Copy()
diff --git a/code/modules/integrated_electronics/core/special_pins/number_pin.dm b/code/modules/integrated_electronics/core/special_pins/number_pin.dm
index 39c69145a1..2c1e8fe68c 100644
--- a/code/modules/integrated_electronics/core/special_pins/number_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/number_pin.dm
@@ -9,7 +9,7 @@
to_chat(user, span_notice("You input [new_data] into the pin."))
write_data_to_pin(new_data)
-/datum/integrated_io/number/write_data_to_pin(var/new_data)
+/datum/integrated_io/number/write_data_to_pin(new_data)
if(isnull(new_data) || isnum(new_data))
data = new_data
holder.on_data_written()
diff --git a/code/modules/integrated_electronics/core/special_pins/ref_pin.dm b/code/modules/integrated_electronics/core/special_pins/ref_pin.dm
index 96ab532647..c168e20941 100644
--- a/code/modules/integrated_electronics/core/special_pins/ref_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/ref_pin.dm
@@ -12,7 +12,7 @@
else
write_data_to_pin(null)
-/datum/integrated_io/ref/write_data_to_pin(var/new_data)
+/datum/integrated_io/ref/write_data_to_pin(new_data)
if(isnull(new_data) || isweakref(new_data))
data = new_data
holder.on_data_written()
diff --git a/code/modules/integrated_electronics/core/special_pins/string_pin.dm b/code/modules/integrated_electronics/core/special_pins/string_pin.dm
index 3b5d94417f..89c0fcac98 100644
--- a/code/modules/integrated_electronics/core/special_pins/string_pin.dm
+++ b/code/modules/integrated_electronics/core/special_pins/string_pin.dm
@@ -10,7 +10,7 @@
to_chat(user, span_notice("You input [new_data ? "new_data" : "NULL"] into the pin."))
write_data_to_pin(new_data)
-/datum/integrated_io/string/write_data_to_pin(var/new_data)
+/datum/integrated_io/string/write_data_to_pin(new_data)
new_data = sanitizeSafe(new_data, MAX_MESSAGE_LEN, 0, 0)
if(isnull(new_data) || istext(new_data))
data = new_data
diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm
index 7eea79716c..cb8a182def 100644
--- a/code/modules/integrated_electronics/core/tools.dm
+++ b/code/modules/integrated_electronics/core/tools.dm
@@ -19,7 +19,7 @@
/obj/item/integrated_electronics/wirer/update_icon()
icon_state = "wirer-[mode]"
-/obj/item/integrated_electronics/wirer/proc/wire(var/datum/integrated_io/io, mob/user)
+/obj/item/integrated_electronics/wirer/proc/wire(datum/integrated_io/io, mob/user)
if(!io.holder.assembly)
to_chat(user, span_warning("\The [io.holder] needs to be secured inside an assembly first."))
return
@@ -155,7 +155,7 @@
now off."))
accepting_refs = 0
-/obj/item/integrated_electronics/debugger/proc/write_data(var/datum/integrated_io/io, mob/user)
+/obj/item/integrated_electronics/debugger/proc/write_data(datum/integrated_io/io, mob/user)
if(io.io_type == DATA_CHANNEL)
io.write_data_to_pin(data_to_write)
var/data_to_show = data_to_write
@@ -194,7 +194,7 @@
else
icon_state = "multitool"
-/obj/item/multitool/proc/wire(var/datum/integrated_io/io, mob/user)
+/obj/item/multitool/proc/wire(datum/integrated_io/io, mob/user)
if(!io.holder.assembly)
to_chat(user, span_warning("\The [io.holder] needs to be secured inside an assembly first."))
return
@@ -224,7 +224,7 @@
update_icon()
-/obj/item/multitool/proc/unwire(var/datum/integrated_io/io1, var/datum/integrated_io/io2, mob/user)
+/obj/item/multitool/proc/unwire(datum/integrated_io/io1, datum/integrated_io/io2, mob/user)
if(!io1.linked.len || !io2.linked.len)
to_chat(user, span_warning("There is nothing connected to the data channel."))
return
diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm
index 730cd18207..8e07a736ee 100644
--- a/code/modules/integrated_electronics/passive/power.dm
+++ b/code/modules/integrated_electronics/passive/power.dm
@@ -82,7 +82,7 @@
complexity = 10
spawn_flags = IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/passive/power/metabolic_siphon/proc/test_validity(var/mob/living/carbon/human/host)
+/obj/item/integrated_circuit/passive/power/metabolic_siphon/proc/test_validity(mob/living/carbon/human/host)
if(!host || host.isSynthetic() || host.stat == DEAD || host.nutrition <= 10)
return FALSE // Robots and dead people don't have a metabolism.
return TRUE
@@ -104,7 +104,7 @@
more often due to this. This device will fail if used inside organic entities."
spawn_flags = IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/passive/power/metabolic_siphon/synthetic/test_validity(var/mob/living/carbon/human/host)
+/obj/item/integrated_circuit/passive/power/metabolic_siphon/synthetic/test_validity(mob/living/carbon/human/host)
if(!host || !host.isSynthetic() || host.stat == DEAD || host.nutrition <= 10)
return FALSE // This time we don't want a metabolism.
return TRUE
diff --git a/code/modules/integrated_electronics/subtypes/illegal.dm b/code/modules/integrated_electronics/subtypes/illegal.dm
index fdd84b184b..94977e36d0 100644
--- a/code/modules/integrated_electronics/subtypes/illegal.dm
+++ b/code/modules/integrated_electronics/subtypes/illegal.dm
@@ -46,7 +46,7 @@
exonet.address = target_address
address_spoofed = TRUE
-/obj/item/integrated_circuit/illegal/receive_exonet_message(var/atom/origin_atom, var/origin_address, var/message, var/text)
+/obj/item/integrated_circuit/illegal/receive_exonet_message(atom/origin_atom, origin_address, message, text)
set_pin_data(IC_OUTPUT, 1, origin_address)
set_pin_data(IC_OUTPUT, 2, message)
set_pin_data(IC_OUTPUT, 3, text)
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index ca79f0c513..dca9d9f09a 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -558,7 +558,7 @@
message = "text"
exonet.send_message(target_address, message, text)
-/obj/item/integrated_circuit/input/receive_exonet_message(var/atom/origin_atom, var/origin_address, var/message, var/text)
+/obj/item/integrated_circuit/input/receive_exonet_message(atom/origin_atom, origin_address, message, text)
set_pin_data(IC_OUTPUT, 1, origin_address)
set_pin_data(IC_OUTPUT, 2, message)
set_pin_data(IC_OUTPUT, 3, text)
@@ -720,7 +720,7 @@
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
power_draw_per_use = 120
-/obj/item/integrated_circuit/input/sensor/proc/scan(var/atom/A)
+/obj/item/integrated_circuit/input/sensor/proc/scan(atom/A)
var/ignore_bags = get_pin_data(IC_INPUT, 1)
if(ignore_bags)
if(istype(A, /obj/item/storage))
diff --git a/code/modules/integrated_electronics/subtypes/logic.dm b/code/modules/integrated_electronics/subtypes/logic.dm
index 82b069320d..bde7d12710 100644
--- a/code/modules/integrated_electronics/subtypes/logic.dm
+++ b/code/modules/integrated_electronics/subtypes/logic.dm
@@ -29,7 +29,7 @@
activate_pin(3)
..()
-/obj/item/integrated_circuit/logic/binary/proc/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/proc/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return FALSE
/obj/item/integrated_circuit/logic/unary
@@ -45,7 +45,7 @@
..()
activate_pin(2)
-/obj/item/integrated_circuit/logic/unary/proc/do_check(var/datum/integrated_io/A)
+/obj/item/integrated_circuit/logic/unary/proc/do_check(datum/integrated_io/A)
return FALSE
/obj/item/integrated_circuit/logic/binary/equals
@@ -55,7 +55,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/equals/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/equals/do_compare(datum/integrated_io/A, datum/integrated_io/B)
if(istext(A.data) && istext(B.data)) // Also compare strings to better match circuit description.
return lowertext(A.data) == lowertext(B.data)
return A.data == B.data
@@ -162,7 +162,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/not_equals/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/not_equals/do_compare(datum/integrated_io/A, datum/integrated_io/B)
if(istext(A.data) && istext(B.data)) // Also compare strings to better match circuit description.
return lowertext(A.data) != lowertext(B.data)
return A.data != B.data
@@ -174,7 +174,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/and/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/and/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return A.data && B.data
/obj/item/integrated_circuit/logic/binary/or
@@ -184,7 +184,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/or/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/or/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return A.data || B.data
/obj/item/integrated_circuit/logic/binary/less_than
@@ -194,7 +194,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/less_than/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/less_than/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return A.data < B.data
/obj/item/integrated_circuit/logic/binary/less_than_or_equal
@@ -204,7 +204,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/less_than_or_equal/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/less_than_or_equal/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return A.data <= B.data
/obj/item/integrated_circuit/logic/binary/greater_than
@@ -214,7 +214,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/greater_than/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/greater_than/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return A.data > B.data
/obj/item/integrated_circuit/logic/binary/greater_than_or_equal
@@ -224,7 +224,7 @@
complexity = 1
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
-/obj/item/integrated_circuit/logic/binary/greater_than_or_equal/do_compare(var/datum/integrated_io/A, var/datum/integrated_io/B)
+/obj/item/integrated_circuit/logic/binary/greater_than_or_equal/do_compare(datum/integrated_io/A, datum/integrated_io/B)
return A.data >= B.data
/obj/item/integrated_circuit/logic/unary/not
@@ -235,7 +235,7 @@
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
activators = list("invert" = IC_PINTYPE_PULSE_IN, "on inverted" = IC_PINTYPE_PULSE_OUT)
-/obj/item/integrated_circuit/logic/unary/not/do_check(var/datum/integrated_io/A)
+/obj/item/integrated_circuit/logic/unary/not/do_check(datum/integrated_io/A)
return !A.data
/obj/item/integrated_circuit/logic/toggler // Allows parts of circuits to be toggled on/off.
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index 65d1c66d1c..a9222dcc3a 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -29,7 +29,7 @@
installed_gun = null // It will be qdel'd by ..() if still in our contents
return ..()
-/obj/item/integrated_circuit/manipulation/weapon_firing/attackby(var/obj/O, var/mob/user)
+/obj/item/integrated_circuit/manipulation/weapon_firing/attackby(obj/O, mob/user)
if(istype(O, /obj/item/gun))
var/obj/item/gun/gun = O
if(installed_gun)
@@ -181,7 +181,7 @@
detach_grenade()
. =..()
-/obj/item/integrated_circuit/manipulation/grenade/attackby(var/obj/item/grenade/G, var/mob/user)
+/obj/item/integrated_circuit/manipulation/grenade/attackby(obj/item/grenade/G, mob/user)
if(istype(G))
if(attached_grenade)
to_chat(user, span_warning("There is already a grenade attached!"))
@@ -213,7 +213,7 @@
log_and_message_admins("activated a grenade assembly. Last touches: Assembly: [holder.forensic_data?.get_lastprint()] Circuit: [forensic_data?.get_lastprint()] Grenade: [attached_grenade.forensic_data?.get_lastprint()]")
// These procs do not relocate the grenade, that's the callers responsibility
-/obj/item/integrated_circuit/manipulation/grenade/proc/attach_grenade(var/obj/item/grenade/G)
+/obj/item/integrated_circuit/manipulation/grenade/proc/attach_grenade(obj/item/grenade/G)
attached_grenade = G
RegisterSignal(attached_grenade, COMSIG_OBSERVER_DESTROYED, /obj/item/integrated_circuit/manipulation/grenade/proc/detach_grenade)
size += G.w_class
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 896c2cbb6a..2643c815f3 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -56,7 +56,7 @@
else
..()
-/obj/structure/bookcase/attack_hand(var/mob/user)
+/obj/structure/bookcase/attack_hand(mob/user)
if(contents.len)
var/obj/item/book/choice = tgui_input_list(user, "Which book would you like to remove from the shelf?", "Book Selection", contents)
if(choice)
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index debe48a02f..1d2244aa82 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -32,7 +32,7 @@
var/author
var/SQLquery
-/obj/machinery/librarypubliccomp/attack_hand(var/mob/user)
+/obj/machinery/librarypubliccomp/attack_hand(mob/user)
user.set_machine(src)
var/dat = "Library Visitor\n" //
switch(screenstate)
@@ -158,7 +158,7 @@
var/obj/item/book/M = new path(null)
all_books[M.title] = M
-/obj/machinery/librarycomp/attack_hand(var/mob/user)
+/obj/machinery/librarycomp/attack_hand(mob/user)
user.set_machine(src)
var/dat = "Book Inventory Management\n" //
switch(screenstate)
@@ -325,7 +325,7 @@
onclose(user, "library")
//VOREStation Addition End
-/obj/machinery/librarycomp/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/librarycomp/emag_act(remaining_charges, mob/user)
if (src.density && !src.emagged)
src.emagged = 1
return 1
@@ -511,12 +511,12 @@
density = TRUE
var/obj/item/book/cache // Last scanned book
-/obj/machinery/libraryscanner/attackby(var/obj/O, var/mob/user)
+/obj/machinery/libraryscanner/attackby(obj/O, mob/user)
if(istype(O, /obj/item/book))
user.drop_item()
O.loc = src
-/obj/machinery/libraryscanner/attack_hand(var/mob/user)
+/obj/machinery/libraryscanner/attack_hand(mob/user)
user.set_machine(src)
var/dat = "Scanner Control Interface\n" //
if(cache)
@@ -566,7 +566,7 @@
. = ..()
AddElement(/datum/element/climbable)
-/obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob)
+/obj/machinery/bookbinder/attackby(obj/O as obj, mob/user as mob)
if(istype(O, /obj/item/paper) || istype(O, /obj/item/paper_bundle))
if(istype(O, /obj/item/paper))
user.drop_item()
diff --git a/code/modules/library/wikicomp.dm b/code/modules/library/wikicomp.dm
index 03f23b7dbc..f13d6ee405 100644
--- a/code/modules/library/wikicomp.dm
+++ b/code/modules/library/wikicomp.dm
@@ -246,7 +246,7 @@
pay_donation(H.GetIdCard(), ui.user, amount, ui)
. = TRUE
-/obj/machinery/librarywikicomp/proc/pay_donation(var/obj/item/card/id/I, var/mob/user, var/amount, var/datum/tgui/ui)
+/obj/machinery/librarywikicomp/proc/pay_donation(obj/item/card/id/I, mob/user, amount, datum/tgui/ui)
visible_message(span_info("[user] swipes a card through [src]."))
playsound(src, 'sound/machines/id_swipe.ogg', 50, 1)
if(SSinternal_wiki.pay_with_card(I, user, src, amount))
diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm
index 70a66b1830..36e02b159e 100644
--- a/code/modules/lighting/lighting_corner.dm
+++ b/code/modules/lighting/lighting_corner.dm
@@ -102,7 +102,7 @@
light_source.recalc_corner(src)
// God that was a mess, now to do the rest of the corner code! Hooray!
-/datum/lighting_corner/proc/update_lumcount(delta_r, delta_g, delta_b, var/from_sholder = FALSE)
+/datum/lighting_corner/proc/update_lumcount(delta_r, delta_g, delta_b, from_sholder = FALSE)
if (!(delta_r || delta_g || delta_b)) // 0 is falsey ok
return
@@ -200,7 +200,7 @@
return ..()
-/datum/lighting_corner/proc/update_sun(var/datum/planet_sunlight_handler/pshandler)
+/datum/lighting_corner/proc/update_sun(datum/planet_sunlight_handler/pshandler)
if(!pshandler)
return
if(sunlight == SUNLIGHT_ONLY)
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
index 63ec549f6c..83fd0e0fe4 100644
--- a/code/modules/lighting/lighting_overlay.dm
+++ b/code/modules/lighting/lighting_overlay.dm
@@ -116,7 +116,7 @@
//Used to have more code here, but it became redundant.
affected_turf.set_luminosity(1)
-/datum/lighting_object/proc/set_sunonly(var/onlysun,var/datum/planet_sunlight_handler/pshandler)
+/datum/lighting_object/proc/set_sunonly(onlysun,datum/planet_sunlight_handler/pshandler)
if(QDELETED(affected_turf)) //this should never happen but god demanded I be sad
return
switch(sunlight_only)
diff --git a/code/modules/lighting/planet_sunlight.dm b/code/modules/lighting/planet_sunlight.dm
index 7b9b156b26..eb41135558 100644
--- a/code/modules/lighting/planet_sunlight.dm
+++ b/code/modules/lighting/planet_sunlight.dm
@@ -25,7 +25,7 @@
var/atom/movable/sun_vis_simple/vis_shade
var/list/shandlers = list()
-/datum/planet_sunlight_handler/New(var/planet)
+/datum/planet_sunlight_handler/New(planet)
. = ..()
var/datum/planet/P = planet
var/datum/simple_sun/S = planet
@@ -119,7 +119,7 @@
/datum/simple_sun/planetary
var/datum/sun_holder/sun
-/datum/simple_sun/planetary/New(var/datum/planet/planet)
+/datum/simple_sun/planetary/New(datum/planet/planet)
sun = planet.sun_holder
/datum/simple_sun/planetary/update()
diff --git a/code/modules/lighting/sunlight_handler.dm b/code/modules/lighting/sunlight_handler.dm
index bb889ca9e7..b7674d55c3 100644
--- a/code/modules/lighting/sunlight_handler.dm
+++ b/code/modules/lighting/sunlight_handler.dm
@@ -43,7 +43,7 @@
var/datum/planet_sunlight_handler/pshandler
var/sleeping = FALSE
-/datum/sunlight_handler/New(var/parent)
+/datum/sunlight_handler/New(parent)
. = ..()
holder = parent
@@ -81,7 +81,7 @@
if(affected_SE) affected += affected_SE
return affected
-/datum/sunlight_handler/proc/add_to_affected(var/datum/lighting_corner/corner)
+/datum/sunlight_handler/proc/add_to_affected(datum/lighting_corner/corner)
if(holder.lighting_corner_NE == corner)
affected_NE = corner
return
@@ -95,7 +95,7 @@
affected_SE = corner
return
-/datum/sunlight_handler/proc/remove_from_affected(var/datum/lighting_corner/corner)
+/datum/sunlight_handler/proc/remove_from_affected(datum/lighting_corner/corner)
if(affected_NE == corner)
affected_NE = null
return
@@ -117,7 +117,7 @@
if(only_sun_SE) only_sun += only_sun_SE
return only_sun
-/datum/sunlight_handler/proc/add_to_only_sun(var/datum/lighting_corner/corner)
+/datum/sunlight_handler/proc/add_to_only_sun(datum/lighting_corner/corner)
if(holder.lighting_corner_NE == corner)
only_sun_NE = corner
return
@@ -131,7 +131,7 @@
only_sun_SE = corner
return
-/datum/sunlight_handler/proc/remove_from_only_sun(var/datum/lighting_corner/corner)
+/datum/sunlight_handler/proc/remove_from_only_sun(datum/lighting_corner/corner)
if(only_sun_NE == corner)
only_sun_NE = null
return
@@ -145,7 +145,7 @@
only_sun_SE = null
return
-/datum/sunlight_handler/proc/turf_update(var/old_density, var/turf/new_turf, var/above)
+/datum/sunlight_handler/proc/turf_update(old_density, turf/new_turf, above)
if(above)
sunlight_check()
sunlight_update()
@@ -346,7 +346,7 @@
effect_str_g = green
effect_str_b = blue
-/datum/sunlight_handler/proc/corner_sunlight_change(var/datum/lighting_corner/sender)
+/datum/sunlight_handler/proc/corner_sunlight_change(datum/lighting_corner/sender)
if(only_sun_object)
only_sun_object.set_sunonly(FALSE, pshandler)
only_sun_object = null
@@ -363,7 +363,7 @@
remove_from_only_sun(sender)
add_to_affected(sender)
-/datum/sunlight_handler/proc/set_sleeping(var/val)
+/datum/sunlight_handler/proc/set_sleeping(val)
if(sleeping == val)
return
sleeping = val
@@ -374,7 +374,7 @@
pshandler.shandlers |= src
SSlighting.sunlight_queue |= src //Just in case somehow gets set to false twice use |=
-/datum/sunlight_handler/proc/wake_sleepers(var/val)
+/datum/sunlight_handler/proc/wake_sleepers(val)
var/list/corners = list(holder.lighting_corner_NE,holder.lighting_corner_NW,holder.lighting_corner_SE,holder.lighting_corner_SW)
for(var/datum/lighting_corner/corner in corners)
corner.wake_sleepers()
diff --git a/code/modules/looking_glass/lg_area.dm b/code/modules/looking_glass/lg_area.dm
index 5a1ac8f145..ab453583b1 100644
--- a/code/modules/looking_glass/lg_area.dm
+++ b/code/modules/looking_glass/lg_area.dm
@@ -24,19 +24,19 @@
our_turfs.Cut()
return ..()
-/area/looking_glass/Entered(var/atom/movable/AM)
+/area/looking_glass/Entered(atom/movable/AM)
if(isliving(AM))
var/mob/living/L = AM
if(L.client)
our_landmark?.gain_viewer(L.client)
-/area/looking_glass/Exited(var/atom/movable/AM)
+/area/looking_glass/Exited(atom/movable/AM)
if(isliving(AM))
var/mob/living/L = AM
if(L.client)
our_landmark?.lose_viewer(L.client)
-/area/looking_glass/proc/begin_program(var/image/newimage)
+/area/looking_glass/proc/begin_program(image/newimage)
if(!active)
for(var/turf/simulated/floor/looking_glass/lgt as anything in our_turfs)
lgt.activate()
@@ -54,7 +54,7 @@
spawn(2 SECONDS)
our_landmark.drop_image()
-/area/looking_glass/proc/toggle_optional(var/transparent)
+/area/looking_glass/proc/toggle_optional(transparent)
for(var/turf/simulated/floor/looking_glass/lgt as anything in our_optional_turfs)
lgt.center = !transparent
if(active)
diff --git a/code/modules/looking_glass/lg_console.dm b/code/modules/looking_glass/lg_console.dm
index c45ef0de28..674521e57f 100644
--- a/code/modules/looking_glass/lg_console.dm
+++ b/code/modules/looking_glass/lg_console.dm
@@ -49,10 +49,10 @@
my_area = null
return ..()
-/obj/machinery/computer/looking_glass/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/looking_glass/attack_ai(mob/user as mob)
return attack_hand(user)
-/obj/machinery/computer/looking_glass/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/looking_glass/attack_hand(mob/user as mob)
if(..())
return
@@ -114,7 +114,7 @@
add_fingerprint(ui.user)
-/obj/machinery/computer/looking_glass/emag_act(var/remaining_charges, var/mob/user as mob)
+/obj/machinery/computer/looking_glass/emag_act(remaining_charges, mob/user as mob)
if (!emagged)
playsound(src, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
@@ -123,7 +123,7 @@
return 1
return
-/obj/machinery/computer/looking_glass/proc/load_program(var/prog_name)
+/obj/machinery/computer/looking_glass/proc/load_program(prog_name)
ready = FALSE
VARSET_IN(src, ready, TRUE, 10 SECONDS)
@@ -138,7 +138,7 @@
my_area.end_program()
-/obj/machinery/computer/looking_glass/proc/toggle_gravity(var/area/A)
+/obj/machinery/computer/looking_glass/proc/toggle_gravity(area/A)
if(world.time < (last_gravity_change + 3 SECONDS))
if(world.time < (last_gravity_change + 1 SECOND))
return
diff --git a/code/modules/looking_glass/lg_imageholder.dm b/code/modules/looking_glass/lg_imageholder.dm
index 74db27c48d..3565e8ba58 100644
--- a/code/modules/looking_glass/lg_imageholder.dm
+++ b/code/modules/looking_glass/lg_imageholder.dm
@@ -13,27 +13,27 @@
. = ..()
viewers = list()
-/obj/effect/landmark/looking_glass/proc/gain_viewer(var/client/C)
+/obj/effect/landmark/looking_glass/proc/gain_viewer(client/C)
if(C in viewers)
log_mapping("Looking Glass [x],[y],[z] tried to add a duplicate viewer.")
viewers |= C
if(holding)
show_to(C)
-/obj/effect/landmark/looking_glass/proc/lose_viewer(var/client/C)
+/obj/effect/landmark/looking_glass/proc/lose_viewer(client/C)
if(!(C in viewers))
log_mapping("Looking Glass [x],[y],[z] tried to remove a viewer it didn't have")
viewers -= C
if(holding)
unshow_to(C)
-/obj/effect/landmark/looking_glass/proc/show_to(var/client/C)
+/obj/effect/landmark/looking_glass/proc/show_to(client/C)
C.images |= holding
-/obj/effect/landmark/looking_glass/proc/unshow_to(var/client/C)
+/obj/effect/landmark/looking_glass/proc/unshow_to(client/C)
C.images -= holding
-/obj/effect/landmark/looking_glass/proc/take_image(var/image/newimage)
+/obj/effect/landmark/looking_glass/proc/take_image(image/newimage)
if(!istype(newimage))
return
diff --git a/code/modules/lore_codex/codex_tree.dm b/code/modules/lore_codex/codex_tree.dm
index b067a79b9a..e8a10fcfb8 100644
--- a/code/modules/lore_codex/codex_tree.dm
+++ b/code/modules/lore_codex/codex_tree.dm
@@ -8,7 +8,7 @@
var/list/indexed_pages = list() // Assoc list with search terms pointing to a ref of the page. It's created on New().
var/list/history = list() // List of pages we previously visited. // now a 2D list
-/datum/codex_tree/New(var/new_holder, var/new_root_type)
+/datum/codex_tree/New(new_holder, new_root_type)
holder = new_holder
root_type = new_root_type
generate_pages()
@@ -20,13 +20,13 @@
indexed_pages = home.index_page() // changed from current_page to home.
// Changes current_page to its parent, assuming one exists.
-/datum/codex_tree/proc/go_to_parent(var/mob/user)
+/datum/codex_tree/proc/go_to_parent(mob/user)
var/datum/lore/codex/D = current_page["[user]"]
if(istype(D) && D.parent)
current_page["[user]"] = D.parent
// Changes current_page to a specific page or category.
-/datum/codex_tree/proc/go_to_page(var/datum/lore/codex/new_page, var/dont_record_history = FALSE, var/mob/user)
+/datum/codex_tree/proc/go_to_page(datum/lore/codex/new_page, dont_record_history = FALSE, mob/user)
var/datum/lore/codex/D = current_page["[user]"]
if(new_page && istype(D)) // Make sure we're not going to a null page for whatever reason.
current_page["[user]"] = new_page
@@ -37,13 +37,13 @@
H.Add(new_page)
history["[user]"] = H
-/datum/codex_tree/proc/quick_link(var/search_word, var/mob/user)
+/datum/codex_tree/proc/quick_link(search_word, mob/user)
for(var/word in indexed_pages)
if(lowertext(search_word) == lowertext(word)) // Exact matches unfortunately limit our ability to perform SEOs.
go_to_page(indexed_pages[word], FALSE, user)
return
-/datum/codex_tree/proc/get_page_from_type(var/desired_type)
+/datum/codex_tree/proc/get_page_from_type(desired_type)
for(var/word in indexed_pages)
var/datum/lore/codex/C = indexed_pages[word]
if(C.type == desired_type)
@@ -51,7 +51,7 @@
return null
// Returns to the last visited page, based on the history list.
-/datum/codex_tree/proc/go_back(var/mob/user)
+/datum/codex_tree/proc/go_back(mob/user)
var/list/H = history["[user]"]
var/datum/lore/codex/D = current_page["[user]"]
if(!LAZYLEN(H) || !istype(D))
@@ -67,7 +67,7 @@
else
go_to_page(H[H.len], TRUE, user)
-/datum/codex_tree/proc/get_tree_position(var/mob/user)
+/datum/codex_tree/proc/get_tree_position(mob/user)
var/datum/lore/codex/checked = current_page["[user]"]
if(istype(checked))
var/output = ""
diff --git a/code/modules/lore_codex/lore_data/orgs.dm b/code/modules/lore_codex/lore_data/orgs.dm
index c7e819db29..1ef82c367b 100644
--- a/code/modules/lore_codex/lore_data/orgs.dm
+++ b/code/modules/lore_codex/lore_data/orgs.dm
@@ -2,7 +2,7 @@
/datum/lore/codex/category/auto_org
var/desired_type = null // Exclude other types of organizations
-/datum/lore/codex/category/auto_org/New(var/new_holder, var/new_parent)
+/datum/lore/codex/category/auto_org/New(new_holder, new_parent)
..(new_holder, new_parent)
for(var/path in GLOB.loremaster.organizations)
var/datum/lore/organization/O = GLOB.loremaster.organizations[path]
diff --git a/code/modules/lore_codex/lore_data_vr/orgs.dm b/code/modules/lore_codex/lore_data_vr/orgs.dm
index a64ec3f8cf..1c304465ae 100644
--- a/code/modules/lore_codex/lore_data_vr/orgs.dm
+++ b/code/modules/lore_codex/lore_data_vr/orgs.dm
@@ -3,7 +3,7 @@
var/desired_type = null
var/auto_keywords = list()
-/datum/lore/codex/category/auto_org/New(var/new_holder, var/new_parent)
+/datum/lore/codex/category/auto_org/New(new_holder, new_parent)
..(new_holder, new_parent)
keywords += auto_keywords
for(var/path in GLOB.loremaster.organizations)
diff --git a/code/modules/lore_codex/lore_data_yw/orgs.dm b/code/modules/lore_codex/lore_data_yw/orgs.dm
index e340624d5a..ff535500b6 100644
--- a/code/modules/lore_codex/lore_data_yw/orgs.dm
+++ b/code/modules/lore_codex/lore_data_yw/orgs.dm
@@ -3,7 +3,7 @@
var/desired_type = null
var/auto_keywords = list()
-/datum/lore/codex/category/auto_org/New(var/new_holder, var/new_parent)
+/datum/lore/codex/category/auto_org/New(new_holder, new_parent)
..(new_holder, new_parent)
keywords += auto_keywords
for(var/path, value in GLOB.loremaster.organizations)
diff --git a/code/modules/lore_codex/pages.dm b/code/modules/lore_codex/pages.dm
index c4b7953f62..ca79157f5b 100644
--- a/code/modules/lore_codex/pages.dm
+++ b/code/modules/lore_codex/pages.dm
@@ -6,7 +6,7 @@
var/list/keywords = list() // Used for searching.
var/datum/codex_tree/holder = null
-/datum/lore/codex/New(var/new_holder, var/new_parent)
+/datum/lore/codex/New(new_holder, new_parent)
..()
holder = new_holder
parent = new_parent
@@ -35,7 +35,7 @@
return
// Use this to quickly link to a different page
-/datum/lore/codex/proc/quick_link(var/target, var/word_to_display)
+/datum/lore/codex/proc/quick_link(target, word_to_display)
if(isnull(word_to_display))
word_to_display = target
return "[word_to_display]"
diff --git a/code/modules/maint_recycler/code/maint_recycler.dm b/code/modules/maint_recycler/code/maint_recycler.dm
index 12482254c1..9af846884a 100644
--- a/code/modules/maint_recycler/code/maint_recycler.dm
+++ b/code/modules/maint_recycler/code/maint_recycler.dm
@@ -124,7 +124,7 @@
-/obj/machinery/maint_recycler/fall_apart(var/severity = 3, var/scatter = TRUE)
+/obj/machinery/maint_recycler/fall_apart(severity = 3, scatter = TRUE)
return FALSE //don't fall apart
/obj/machinery/maint_recycler/dismantle()
@@ -264,7 +264,7 @@
visible_message("\The [source] bounces off of the rim of \the [src]'s processing compartment!")
-/obj/machinery/maint_recycler/proc/deny_act(var/obj/item/O,var/mob/user)
+/obj/machinery/maint_recycler/proc/deny_act(obj/item/O,mob/user)
set_screen_state("screen_deny",10)
to_chat(user, span_warning("\The [src] rejects \the [O]!"))
if(prob(99))
@@ -274,7 +274,7 @@
playsound(src, 'code/modules/maint_recycler/sfx/voice/mad/denied.ogg', 75)
//add people to the evil list, and be mean to them
-/obj/machinery/maint_recycler/proc/evil_act(var/obj/item/O,var/mob/user)
+/obj/machinery/maint_recycler/proc/evil_act(obj/item/O,mob/user)
var/isRepeat = is_user_hostile(user)
if(!isRepeat && user.key)
hostile_towards |= user.key
@@ -295,7 +295,7 @@
credit_user(user,-10) //get fucked
-/obj/machinery/maint_recycler/proc/close_door(var/mob/user)
+/obj/machinery/maint_recycler/proc/close_door(mob/user)
if(!door_open || door_locked) return
door_moving = TRUE
flick("door closing",hatch)
@@ -303,7 +303,7 @@
addtimer(CALLBACK(src, PROC_REF(door_finished_moving), FALSE), 1 SECOND)
-/obj/machinery/maint_recycler/proc/open_door(var/mob/user)
+/obj/machinery/maint_recycler/proc/open_door(mob/user)
if(door_open || door_locked) return
door_moving = TRUE
flick("door opening",hatch)
@@ -311,7 +311,7 @@
addtimer(CALLBACK(src, PROC_REF(door_finished_moving), TRUE), 1 SECOND)
-/obj/machinery/maint_recycler/proc/door_finished_moving(var/open)
+/obj/machinery/maint_recycler/proc/door_finished_moving(open)
door_moving = FALSE
door_open = open
if(open)
@@ -320,22 +320,22 @@
hatch.icon_state = "door closed"
-/obj/machinery/maint_recycler/proc/shoot_at(var/mob/victim, var/burst = 3)
+/obj/machinery/maint_recycler/proc/shoot_at(mob/victim, burst = 3)
if(victim == null) return
for(var/i = 1 to burst)
addtimer(CALLBACK(src, PROC_REF(shoot), victim), (0.3 * i SECONDS))
-/obj/machinery/maint_recycler/proc/shoot(var/mob/victim)
+/obj/machinery/maint_recycler/proc/shoot(mob/victim)
var/projectile = /obj/item/projectile/beam/stun
var/obj/item/projectile/P = new projectile(loc)
playsound(src, 'sound/weapons/Taser.ogg', 30, 1)
P.old_style_target(victim)
P.fire()
-/obj/machinery/maint_recycler/container_resist(var/mob/living)
+/obj/machinery/maint_recycler/container_resist(mob/living)
eject_item(living) //100% chance. don't sweat it.
-/obj/machinery/maint_recycler/proc/eject_item(var/mob/user)
+/obj/machinery/maint_recycler/proc/eject_item(mob/user)
if(inserted_item)
if(!door_open)
open_door(user)
@@ -344,7 +344,7 @@
eject_item_act(user)
-/obj/machinery/maint_recycler/proc/eject_item_act(var/mob/user)
+/obj/machinery/maint_recycler/proc/eject_item_act(mob/user)
inserted_item.forceMove(get_turf(src))
visible_message(span_warning("[src] ejects \the [inserted_item] from its recycling chamber!"))
inserted_item.throw_at(get_step(src,SOUTH),5,1,src)
@@ -352,7 +352,7 @@
update_icon()
-/obj/machinery/maint_recycler/proc/start_recycling(var/mob/user)
+/obj/machinery/maint_recycler/proc/start_recycling(mob/user)
if(inserted_item)
if(door_open)
close_door(user)
@@ -360,7 +360,7 @@
else
recycle_act(user)
-/obj/machinery/maint_recycler/proc/recycle_act(var/mob/user)
+/obj/machinery/maint_recycler/proc/recycle_act(mob/user)
if(!inserted_item)
to_chat(user, span_warning("\The [src] doesn't have anything to recycle!"))
return //sanity check
@@ -370,7 +370,7 @@
addtimer(CALLBACK(src, PROC_REF(post_recycle), user), 2 SECONDS)
-/obj/machinery/maint_recycler/proc/post_recycle(var/mob/user)
+/obj/machinery/maint_recycler/proc/post_recycle(mob/user)
var/value = try_get_obj_value(inserted_item)
credit_user(user,value)
if(istype(inserted_item,/mob))
@@ -484,7 +484,7 @@ TGUI PROCS
UTILITY PROCS
*/
-/obj/machinery/maint_recycler/proc/credit_user(var/mob/user, var/amount)
+/obj/machinery/maint_recycler/proc/credit_user(mob/user, amount)
if(!user || !user.client || !user.client.prefs) return
var/currentValue = user.client?.prefs?.read_preference(/datum/preference/numeric/recycler_points)
user.client?.prefs?.write_preference_by_type(/datum/preference/numeric/recycler_points, min(currentValue + amount,999))
@@ -494,25 +494,25 @@ UTILITY PROCS
granted_points[user.key] = amount
-/obj/machinery/maint_recycler/proc/user_balance(var/mob/user)
+/obj/machinery/maint_recycler/proc/user_balance(mob/user)
return user.client?.prefs?.read_preference(/datum/preference/numeric/recycler_points)
-/obj/machinery/maint_recycler/proc/canRecycle(var/mob/user, var/potentialValue)
+/obj/machinery/maint_recycler/proc/canRecycle(mob/user, potentialValue)
if(!user.key) return FALSE
if(granted_points[user.key]+potentialValue > point_cap) return FALSE
return TRUE
-/obj/machinery/maint_recycler/proc/mob_consent_check(var/mob/probable_victim)
+/obj/machinery/maint_recycler/proc/mob_consent_check(mob/probable_victim)
if(probable_victim.key)
if(probable_victim.client) //sanity check to make sure they are alright with getting squished to death
return (tgui_alert(probable_victim,"Do you want to be put in \The [src]? Industrial machinery is pretty damn deadly, you'll probably die. to death. A fine paste.", "Welcome to the Hydralulic Press Prompt", list("OSHA is for chumps", "what the fuck? get me outta here!")) == "OSHA is for chumps")
else return FALSE //no logged out users
else return TRUE //mindless mobs that've never felt the gentle touch of a client are fine
-/obj/machinery/maint_recycler/proc/is_user_hostile(var/mob/user) //negative points modifier for getting more.
+/obj/machinery/maint_recycler/proc/is_user_hostile(mob/user) //negative points modifier for getting more.
return (user.key in hostile_towards)
-/obj/machinery/maint_recycler/proc/try_get_obj_value(var/obj/candidate)
+/obj/machinery/maint_recycler/proc/try_get_obj_value(obj/candidate)
if(candidate == null) return null //default
var/init_price = 0
init_price = item_whitelist[candidate.type]
@@ -529,7 +529,7 @@ UTILITY PROCS
return init_price
-/obj/machinery/maint_recycler/proc/get_item_whitelist(var/obj/whitelistCandidate)
+/obj/machinery/maint_recycler/proc/get_item_whitelist(obj/whitelistCandidate)
. = RECYCLER_FORBIDDEN //default state
@@ -548,7 +548,7 @@ UTILITY PROCS
if(stat & NOPOWER)
set_on_state(FALSE)
-/obj/machinery/maint_recycler/proc/set_screen_state(var/state, var/duration = 10)
+/obj/machinery/maint_recycler/proc/set_screen_state(state, duration = 10)
if(!is_on) return
monitor_screen.icon_state = state
addtimer(CALLBACK(src, PROC_REF(reset_screen_state)), duration)
@@ -561,7 +561,7 @@ UTILITY PROCS
else
monitor_screen.icon_state = "screen_default"
-/obj/machinery/maint_recycler/proc/set_on_state(var/state)
+/obj/machinery/maint_recycler/proc/set_on_state(state)
if(is_on == state) return
is_on = state
if(is_on)
diff --git a/code/modules/maint_recycler/code/maint_vendor.dm b/code/modules/maint_recycler/code/maint_vendor.dm
index 808b9f3b15..1bb777bb67 100644
--- a/code/modules/maint_recycler/code/maint_vendor.dm
+++ b/code/modules/maint_recycler/code/maint_vendor.dm
@@ -27,7 +27,7 @@
var/obj/effect/overlay/recycler/monitor_screen
-/obj/machinery/maint_vendor/fall_apart(var/severity = 3, var/scatter = TRUE)
+/obj/machinery/maint_vendor/fall_apart(severity = 3, scatter = TRUE)
return FALSE //don't fall apart. you can't fall apart if you don't consent. it works irl too.
/obj/machinery/maint_vendor/dismantle()
@@ -86,7 +86,7 @@
if(!is_on)
set_on_state(TRUE)
-/obj/machinery/maint_vendor/proc/attempt_purchase(var/mob/user, var/datum/maint_recycler_vendor_entry/entry)
+/obj/machinery/maint_vendor/proc/attempt_purchase(mob/user, datum/maint_recycler_vendor_entry/entry)
if(!istype(entry))
return
if(entry.purchased_by == null)
@@ -101,7 +101,7 @@
credit_user(user,-entry.item_cost)
entry.purchased_by[user.client.ckey] += 1
-/obj/machinery/maint_vendor/proc/purchase_failed(var/mob/user, var/reason)
+/obj/machinery/maint_vendor/proc/purchase_failed(mob/user, reason)
if(prob(95))
set_screen_state("screen_deny",10)
else
@@ -110,7 +110,7 @@
playsound(src, 'code/modules/maint_recycler/sfx/generaldeny.ogg', 75, 1)
return
-/obj/machinery/maint_vendor/proc/dispense_item_from_datum(var/mob/user, var/datum/maint_recycler_vendor_entry/used_entry)
+/obj/machinery/maint_vendor/proc/dispense_item_from_datum(mob/user, datum/maint_recycler_vendor_entry/used_entry)
if(!used_entry || !used_entry.object_type_to_spawn)
to_chat(user,span_warning("What the fuck?? this is a scam! Nothing happened!"))
return;
@@ -123,7 +123,7 @@
else
set_screen_state("screen_happy",10)
-/obj/machinery/maint_vendor/proc/can_user_purchase(var/mob/user,var/datum/maint_recycler_vendor_entry/attempted_entry)
+/obj/machinery/maint_vendor/proc/can_user_purchase(mob/user,datum/maint_recycler_vendor_entry/attempted_entry)
if(!user_balance(user) || user_balance(user) < attempted_entry.item_cost)
purchase_failed(user, "Insufficent Balance")
return FALSE
@@ -150,7 +150,7 @@
add_overlay(mutable_appearance(src.icon, "passiveGlow")) //product display. screen is distinct.
add_overlay(emissive_appearance(src.icon, "passiveGlow"))
-/obj/machinery/maint_vendor/proc/set_screen_state(var/state, var/duration = 10)
+/obj/machinery/maint_vendor/proc/set_screen_state(state, duration = 10)
if(!is_on) return
monitor_screen.icon_state = state
addtimer(CALLBACK(src, PROC_REF(reset_screen_state)), duration)
@@ -215,16 +215,16 @@
//utility
-/obj/machinery/maint_vendor/proc/user_balance(var/mob/user)
+/obj/machinery/maint_vendor/proc/user_balance(mob/user)
return user.client?.prefs?.read_preference(/datum/preference/numeric/recycler_points)
-/obj/machinery/maint_vendor/proc/credit_user(var/mob/user, var/amount)
+/obj/machinery/maint_vendor/proc/credit_user(mob/user, amount)
if(!user || !user.client || !user.client.prefs) return
var/currentValue = user.client?.prefs?.read_preference(/datum/preference/numeric/recycler_points)
user.client?.prefs?.write_preference_by_type(/datum/preference/numeric/recycler_points, currentValue + amount)
-/obj/machinery/maint_vendor/proc/set_on_state(var/state)
+/obj/machinery/maint_vendor/proc/set_on_state(state)
if(is_on == state) return
is_on = state
if(is_on)
diff --git a/code/modules/maint_recycler/code/vendor_datums/recycler_vendor_entry.dm b/code/modules/maint_recycler/code/vendor_datums/recycler_vendor_entry.dm
index 7d749ae1ef..e0928bf87e 100644
--- a/code/modules/maint_recycler/code/vendor_datums/recycler_vendor_entry.dm
+++ b/code/modules/maint_recycler/code/vendor_datums/recycler_vendor_entry.dm
@@ -27,15 +27,15 @@
icon_state = pick(icon_state)
-/datum/maint_recycler_vendor_entry/proc/spawn_at(var/loc)
+/datum/maint_recycler_vendor_entry/proc/spawn_at(loc)
var/obj/item/item = new object_type_to_spawn(get_turf(loc))
post_purchase_handling(item)
-/datum/maint_recycler_vendor_entry/proc/spawn_with_delay(var/loc)
+/datum/maint_recycler_vendor_entry/proc/spawn_with_delay(loc)
addtimer(CALLBACK(src, PROC_REF(spawn_at),loc), 0.5 SECONDS)
-/datum/maint_recycler_vendor_entry/proc/post_purchase_handling(var/obj/bought)
+/datum/maint_recycler_vendor_entry/proc/post_purchase_handling(obj/bought)
SHOULD_CALL_PARENT(FALSE)
/datum/maint_recycler_vendor_entry/proc/getPurchasedCount()
diff --git a/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/displacement_map_generation.dm b/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/displacement_map_generation.dm
index 7eca17d517..ffe26bf404 100644
--- a/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/displacement_map_generation.dm
+++ b/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/displacement_map_generation.dm
@@ -1,5 +1,5 @@
//todo, figure out a better place for this
-/proc/get_humanoid_displacement_map_image(var/mob/living/carbon/human/target,var/list/discarded_layer_indicies, var/icon/displacement_map, var/outlineWidth = 0, var/render_target = null)
+/proc/get_humanoid_displacement_map_image(mob/living/carbon/human/target,list/discarded_layer_indicies, icon/displacement_map, outlineWidth = 0, render_target = null)
var/list/to_overlays = target.overlays_standing.Copy()
diff --git a/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/remote_scene_tools.dm b/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/remote_scene_tools.dm
index 4104a92eb2..ce66f6a57e 100644
--- a/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/remote_scene_tools.dm
+++ b/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/remote_scene_tools.dm
@@ -29,7 +29,7 @@ why aren't these accessories?
var/replacementType = /obj/item/remote_scene_tool
-/obj/item/remote_scene_tool/proc/link_to(var/obj/item/remote_scene_tool/to_link)
+/obj/item/remote_scene_tool/proc/link_to(obj/item/remote_scene_tool/to_link)
//link to a remote scene tool
if(linked)
return
@@ -37,7 +37,7 @@ why aren't these accessories?
linked = to_link
linked.linked = src
-/obj/item/remote_scene_tool/proc/register_to_mob(var/mob)
+/obj/item/remote_scene_tool/proc/register_to_mob(mob)
if(worn_mob == mob)
return
@@ -50,7 +50,7 @@ why aren't these accessories?
RegisterSignal(mob, COMSIG_MOB_LOGOUT, PROC_REF(worn_mob_logged_out))
transmit_emote(src, span_notice("\The [src] has been put on by [mob]!"))
-/obj/item/remote_scene_tool/proc/unregister_from_mob(var/mob)
+/obj/item/remote_scene_tool/proc/unregister_from_mob(mob)
if(worn_mob == null) return
UnregisterSignal(worn_mob, COMSIG_MOB_LOGIN)
UnregisterSignal(worn_mob, COMSIG_MOB_LOGOUT)
@@ -75,13 +75,13 @@ why aren't these accessories?
transmit_emote(src, "\The [src]'s wearer has returned from SSD!")
linked?.linked_updated()
-/obj/item/remote_scene_tool/see_emote(var/mob/M as mob, var/text, var/emote_type)
+/obj/item/remote_scene_tool/see_emote(mob/M as mob, text, emote_type)
//to_world_log("emote: [text] from [M] to [linked]")
if(M == getWearer())
//we're the one doing the emote
transmit_emote(src, text,emote_type)
-/obj/item/remote_scene_tool/proc/transmit_emote(var/mob/M as mob, var/text, var/emote_type)
+/obj/item/remote_scene_tool/proc/transmit_emote(mob/M as mob, text, emote_type)
if(linked == null) return
if(ismob(linked.getWearer()))
var/mob/m = linked.getWearer()
diff --git a/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/voodoo.dm b/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/voodoo.dm
index 8a2435dee0..b485b6efef 100644
--- a/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/voodoo.dm
+++ b/code/modules/maint_recycler/code/vendor_goodies/remote_scene_tools/voodoo.dm
@@ -73,18 +73,18 @@
. = ..()
dir = SOUTH //we need to do this
-/obj/item/remote_scene_tool/voodoo_doll/proc/get_outline_color(var/r,var/g,var/b,var/a, var/offset = 30)
+/obj/item/remote_scene_tool/voodoo_doll/proc/get_outline_color(r,g,b,a, offset = 30)
var/new_rgba = rgb(r-offset,g-offset,b-offset,a)
return new_rgba
-/obj/item/remote_scene_tool/voodoo_doll/proc/generate_layer_matrix(var/list/data)
+/obj/item/remote_scene_tool/voodoo_doll/proc/generate_layer_matrix(list/data)
var/matrix/output = matrix()
output.Translate(data[DATA_X_OFFSET], data[DATA_Y_OFFSET])
output.Turn(data[DATA_ROTATION])
output.Scale(data[DATA_SCALE], data[DATA_SCALE])
return output
-/obj/item/remote_scene_tool/voodoo_doll/proc/generate_layer_image(var/image/input, var/matrix/newtransform, var/outline_width = 0, var/outline_color = rgb(50,50,50))
+/obj/item/remote_scene_tool/voodoo_doll/proc/generate_layer_image(image/input, matrix/newtransform, outline_width = 0, outline_color = rgb(50,50,50))
if(input == null)
return null
diff --git a/code/modules/maintenance_panels/maintenance_panel.dm b/code/modules/maintenance_panels/maintenance_panel.dm
index e011c7f580..d40b59f8ad 100644
--- a/code/modules/maintenance_panels/maintenance_panel.dm
+++ b/code/modules/maintenance_panels/maintenance_panel.dm
@@ -12,7 +12,7 @@
shardtype = null
opacity = 1 // Difficult to see past
-/obj/structure/window/maintenance_panel/apply_silicate(var/amount)
+/obj/structure/window/maintenance_panel/apply_silicate(amount)
return // can't fix it like that
/obj/structure/window/maintenance_panel/updateSilicate()
@@ -44,7 +44,7 @@
. = ..()
-/obj/structure/window/maintenance_panel/take_damage(var/damage = 0, var/sound_effect = 1)
+/obj/structure/window/maintenance_panel/take_damage(damage = 0, sound_effect = 1)
var/initialhealth = health
health = max(0, health - damage)
if(health <= 0)
@@ -66,7 +66,7 @@
visible_message("\the [src] looks like it's taking damage!")
update_icon()
-/obj/structure/window/maintenance_panel/shatter(var/display_message = 1)
+/obj/structure/window/maintenance_panel/shatter(display_message = 1)
playsound(src, pick(list('sound/effects/metalscrape1.ogg','sound/effects/metalscrape2.ogg','sound/effects/metalscrape3.ogg')), 70, 1)
if(display_message)
visible_message("\the [src] thunks free of the wall!")
diff --git a/code/modules/makeup/nailpolish.dm b/code/modules/makeup/nailpolish.dm
index f09553d907..707630ec6d 100644
--- a/code/modules/makeup/nailpolish.dm
+++ b/code/modules/makeup/nailpolish.dm
@@ -20,7 +20,7 @@
color_underlay = image(icon, "color")
update_icon()
-/obj/item/nailpolish/proc/set_colour(var/_colour)
+/obj/item/nailpolish/proc/set_colour(_colour)
colour = _colour
desc = "Nail polish, " + initial(desc)
update_icon()
@@ -41,7 +41,7 @@
color_underlay.color = colour
underlays = list(color_underlay, top_underlay)
-/obj/item/organ/external/proc/get_polish(var/colour)
+/obj/item/organ/external/proc/get_polish(colour)
var/static/forbidden_parts = BP_ALL - list(BP_L_HAND, BP_R_HAND, BP_L_FOOT, BP_R_FOOT)
if(organ_tag in forbidden_parts)
return FALSE
@@ -91,7 +91,7 @@
body_part.set_polish(polish)
return ITEM_INTERACT_SUCCESS
-/obj/item/organ/external/proc/set_polish(var/datum/nail_polish/polish)
+/obj/item/organ/external/proc/set_polish(datum/nail_polish/polish)
nail_polish = polish
owner?.update_icons_body()
@@ -147,7 +147,7 @@
var/icon_state
var/color
-/datum/nail_polish/New(var/_icon, var/_icon_state, var/_color)
+/datum/nail_polish/New(_icon, _icon_state, _color)
icon = _icon
icon_state = _icon_state
color = _color
diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm
index 78af650d14..59fad051e7 100644
--- a/code/modules/maps/map_template.dm
+++ b/code/modules/maps/map_template.dm
@@ -90,7 +90,7 @@
admin_notice(span_danger("Submap initializations finished."), R_DEBUG)
-/datum/map_template/proc/load_new_z(var/centered = FALSE)
+/datum/map_template/proc/load_new_z(centered = FALSE)
var/x = 1
var/y = 1
@@ -204,7 +204,7 @@
//for your ever biggening badminnery kevinz000
//❤ - Cyberboss
-/proc/load_new_z_level(var/file, var/name)
+/proc/load_new_z_level(file, name)
var/datum/map_template/template = new(file, name, TRUE)
if(!template.cached_map || template.cached_map.check_for_errors())
return FALSE
@@ -212,7 +212,7 @@
return TRUE
// Very similar to the /tg/ version.
-/proc/seed_submaps(var/list/z_levels, var/budget = 0, var/whitelist = /area/space, var/desired_map_template_type = null)
+/proc/seed_submaps(list/z_levels, budget = 0, whitelist = /area/space, desired_map_template_type = null)
set background = TRUE
if(!z_levels || !length(z_levels))
diff --git a/code/modules/materials/materials/_materials.dm b/code/modules/materials/materials/_materials.dm
index 6ea538bc07..d48049a24d 100644
--- a/code/modules/materials/materials/_materials.dm
+++ b/code/modules/materials/materials/_materials.dm
@@ -250,7 +250,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
var/wiki_flag = 0
// Placeholders for light tiles and rglass.
-/datum/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
+/datum/material/proc/build_rod_product(mob/user, obj/item/stack/used_stack, obj/item/stack/target_stack)
if(!rod_product)
to_chat(user, span_warning("You cannot make anything out of \the [target_stack]"))
return
@@ -263,7 +263,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
S.add_fingerprint(user)
S.add_to_stacks(user)
-/datum/material/proc/build_wired_product(var/mob/living/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
+/datum/material/proc/build_wired_product(mob/living/user, obj/item/stack/used_stack, obj/item/stack/target_stack)
if(!wire_product)
to_chat(user, span_warning("You cannot make anything out of \the [target_stack]"))
return
@@ -288,7 +288,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
shard_icon = shard_type
// This is a placeholder for proper integration of windows/windoors into the system.
-/datum/material/proc/build_windows(var/mob/living/user, var/obj/item/stack/used_stack)
+/datum/material/proc/build_windows(mob/living/user, obj/item/stack/used_stack)
return 0
// Weapons handle applying a divisor for this value locally.
@@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
return hardness //todo
// Snowflakey, only checked for alien doors at the moment.
-/datum/material/proc/can_open_material_door(var/mob/living/user)
+/datum/material/proc/can_open_material_door(mob/living/user)
return 1
// Currently used for weapons and objects made of uranium to irradiate things.
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
wiki_flag = WIKI_SPOILER
// Places a girder object when a wall is dismantled, also applies reinforced material.
-/datum/material/proc/place_dismantled_girder(var/turf/target, var/datum/material/reinf_material, var/datum/material/girder_material)
+/datum/material/proc/place_dismantled_girder(turf/target, datum/material/reinf_material, datum/material/girder_material)
var/obj/structure/girder/G = new(target)
if(reinf_material)
G.reinf_material = reinf_material
@@ -334,17 +334,17 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
// General wall debris product placement.
// Not particularly necessary aside from snowflakey cult girders.
-/datum/material/proc/place_dismantled_product(var/turf/target, var/amount = 1) //Added an amount var to this. Lets multi-dropped walls to drop all of their sheets together. Woo!
+/datum/material/proc/place_dismantled_product(turf/target, amount = 1) //Added an amount var to this. Lets multi-dropped walls to drop all of their sheets together. Woo!
place_sheet(target, amount)
// Debris product. Used ALL THE TIME.
-/datum/material/proc/place_sheet(var/turf/target, amount)
+/datum/material/proc/place_sheet(turf/target, amount)
amount = round(amount)
if(stack_type && amount > 0)
return new stack_type(target, amount)
// As above.
-/datum/material/proc/place_shard(var/turf/target)
+/datum/material/proc/place_shard(turf/target)
if(shard_type)
return new /obj/item/material/shard(target, src.name)
@@ -352,11 +352,11 @@ GLOBAL_LIST_INIT(name_to_material, populate_material_list())
/datum/material/proc/is_brittle()
return !!(flags & MATERIAL_BRITTLE)
-/datum/material/proc/combustion_effect(var/turf/T, var/temperature)
+/datum/material/proc/combustion_effect(turf/T, temperature)
return
// Used by walls to do on-touch things, after checking for crumbling and open-ability.
-/datum/material/proc/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L)
+/datum/material/proc/wall_touch_special(turf/simulated/wall/W, mob/living/L)
return
/datum/material/proc/get_recipes()
diff --git a/code/modules/materials/materials/_materials_vr.dm b/code/modules/materials/materials/_materials_vr.dm
index a92abf4509..aba77ec3d3 100644
--- a/code/modules/materials/materials/_materials_vr.dm
+++ b/code/modules/materials/materials/_materials_vr.dm
@@ -3,7 +3,7 @@
return ITEM_INTERACT_SUCCESS
..()
-/obj/item/stack/material/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
+/obj/item/stack/material/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
..()
diff --git a/code/modules/materials/materials/cult.dm b/code/modules/materials/materials/cult.dm
index 8d15852d3b..f2201a3592 100644
--- a/code/modules/materials/materials/cult.dm
+++ b/code/modules/materials/materials/cult.dm
@@ -11,15 +11,15 @@
conductive = 0
wiki_flag = WIKI_SPOILER
-/datum/material/cult/place_dismantled_girder(var/turf/target)
+/datum/material/cult/place_dismantled_girder(turf/target)
new /obj/structure/girder/cult(target, MAT_CULT)
-/datum/material/cult/place_dismantled_product(var/turf/target)
+/datum/material/cult/place_dismantled_product(turf/target)
new /obj/effect/decal/cleanable/blood(target)
/datum/material/cult/reinf
name = MAT_CULT2
display_name = "human remains"
-/datum/material/cult/reinf/place_dismantled_product(var/turf/target)
+/datum/material/cult/reinf/place_dismantled_product(turf/target)
new /obj/effect/decal/remains/human(target)
diff --git a/code/modules/materials/materials/gems.dm b/code/modules/materials/materials/gems.dm
index 3779e462e7..90b8b3ad08 100644
--- a/code/modules/materials/materials/gems.dm
+++ b/code/modules/materials/materials/gems.dm
@@ -14,7 +14,7 @@
/*
// Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately.
-/datum/material/phoron/combustion_effect(var/turf/T, var/temperature, var/effect_multiplier)
+/datum/material/phoron/combustion_effect(turf/T, temperature, effect_multiplier)
if(isnull(ignition_point))
return 0
if(temperature < ignition_point)
diff --git a/code/modules/materials/materials/glass.dm b/code/modules/materials/materials/glass.dm
index d53f7b46c9..3962852b5e 100644
--- a/code/modules/materials/materials/glass.dm
+++ b/code/modules/materials/materials/glass.dm
@@ -19,7 +19,7 @@
created_fulltile_window = /obj/structure/window/basic/full
rod_product = /obj/item/stack/material/glass/reinforced
-/datum/material/glass/build_windows(var/mob/living/user, var/obj/item/stack/used_stack)
+/datum/material/glass/build_windows(mob/living/user, obj/item/stack/used_stack)
if(!user || !used_stack || !created_window || !created_fulltile_window || !window_options.len)
return 0
diff --git a/code/modules/materials/materials/metals/hull.dm b/code/modules/materials/materials/metals/hull.dm
index 5aa9135763..3bf1b80cd2 100644
--- a/code/modules/materials/materials/metals/hull.dm
+++ b/code/modules/materials/materials/metals/hull.dm
@@ -10,7 +10,7 @@
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_STEEL = SHEET_MATERIAL_AMOUNT)
-/datum/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets.
+/datum/material/steel/hull/place_sheet(turf/target) //Deconstructed into normal steel sheets.
new /obj/item/stack/material/steel(target)
/datum/material/plasteel/hull
@@ -25,7 +25,7 @@
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
-/datum/material/plasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
+/datum/material/plasteel/hull/place_sheet(turf/target) //Deconstructed into normal plasteel sheets.
new /obj/item/stack/material/plasteel(target)
/datum/material/durasteel/hull //The 'Hardball' of starship hulls.
@@ -40,7 +40,7 @@
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_DURASTEEL = SHEET_MATERIAL_AMOUNT)
-/datum/material/durasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal durasteel sheets.
+/datum/material/durasteel/hull/place_sheet(turf/target) //Deconstructed into normal durasteel sheets.
new /obj/item/stack/material/durasteel(target)
/datum/material/titanium/hull
@@ -52,7 +52,7 @@
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT)
-/datum/material/titanium/hull/place_sheet(var/turf/target) //Deconstructed into normal titanium sheets.
+/datum/material/titanium/hull/place_sheet(turf/target) //Deconstructed into normal titanium sheets.
new /obj/item/stack/material/titanium(target)
/datum/material/morphium/hull
@@ -64,7 +64,7 @@
flags = MATERIAL_UNMELTABLE | MATERIAL_NO_SYNTH
composite_material = list(MAT_MORPHIUM = SHEET_MATERIAL_AMOUNT)
-/datum/material/morphium/hull/place_sheet(var/turf/target)
+/datum/material/morphium/hull/place_sheet(turf/target)
new /obj/item/stack/material/morphium(target)
/datum/material/plastitanium/hull
@@ -78,7 +78,7 @@
flags = MATERIAL_NO_SYNTH
composite_material = list(MAT_PLASTITANIUM = SHEET_MATERIAL_AMOUNT)
-/datum/material/plastitanium/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
+/datum/material/plastitanium/hull/place_sheet(turf/target) //Deconstructed into normal plasteel sheets.
new /obj/item/stack/material/plastitanium(target)
/datum/material/gold/hull
@@ -91,5 +91,5 @@
flags = MATERIAL_NO_SYNTH
composite_material = list(MAT_GOLD = SHEET_MATERIAL_AMOUNT)
-/datum/material/gold/hull/place_sheet(var/turf/target) //Deconstructed into normal gold sheets.
+/datum/material/gold/hull/place_sheet(turf/target) //Deconstructed into normal gold sheets.
new /obj/item/stack/material/gold(target)
diff --git a/code/modules/materials/materials/organic/animal_products.dm b/code/modules/materials/materials/organic/animal_products.dm
index 0378ff7da8..089c970ff5 100644
--- a/code/modules/materials/materials/organic/animal_products.dm
+++ b/code/modules/materials/materials/organic/animal_products.dm
@@ -9,7 +9,7 @@
/datum/material/diona/place_dismantled_product()
return
-/datum/material/diona/place_dismantled_girder(var/turf/target)
+/datum/material/diona/place_dismantled_girder(turf/target)
spawn_diona_nymph(target)
/datum/material/chitin
diff --git a/code/modules/materials/materials/organic/resin.dm b/code/modules/materials/materials/organic/resin.dm
index 695784fe7b..8ada9f5868 100644
--- a/code/modules/materials/materials/organic/resin.dm
+++ b/code/modules/materials/materials/organic/resin.dm
@@ -16,7 +16,7 @@
radiation_resistance = 10
stack_type = /obj/item/stack/material/resin
-/datum/material/resin/can_open_material_door(var/mob/living/user)
+/datum/material/resin/can_open_material_door(mob/living/user)
var/mob/living/carbon/M = user
if(istype(M) && locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
return TRUE
@@ -24,7 +24,7 @@
return TRUE
return FALSE
-/datum/material/resin/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L)
+/datum/material/resin/wall_touch_special(turf/simulated/wall/W, mob/living/L)
var/mob/living/carbon/M = L
if(istype(M) && locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs)
to_chat(M, "\The [W] shudders under your touch, starting to become porous.")
diff --git a/code/modules/materials/sheets/_sheets.dm b/code/modules/materials/sheets/_sheets.dm
index 4cdf2cd44d..0da674d9ad 100644
--- a/code/modules/materials/sheets/_sheets.dm
+++ b/code/modules/materials/sheets/_sheets.dm
@@ -72,13 +72,13 @@
return "There [amount == 1 ? "is" : "are"] [amount] [material.sheet_singular_name]\s in the [material.sheet_collective_name]."
return ..()
-/obj/item/stack/material/use(var/used)
+/obj/item/stack/material/use(used)
. = ..()
if(QDELETED(src))
return
update_strings()
-/obj/item/stack/material/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)
+/obj/item/stack/material/transfer_to(obj/item/stack/S, tamount=null, type_verified)
var/obj/item/stack/material/M = S
if(!istype(M) || material.name != M.material.name)
return 0
@@ -96,7 +96,7 @@
if(!material.build_windows(user, src))
tgui_interact(user)
-/obj/item/stack/material/attackby(var/obj/item/W, var/mob/user)
+/obj/item/stack/material/attackby(obj/item/W, mob/user)
if(istype(W,/obj/item/stack/cable_coil))
material.build_wired_product(user, W, src)
return
diff --git a/code/modules/materials/sheets/organic/tanning/hide.dm b/code/modules/materials/sheets/organic/tanning/hide.dm
index 53a02b07b8..aeb096646c 100644
--- a/code/modules/materials/sheets/organic/tanning/hide.dm
+++ b/code/modules/materials/sheets/organic/tanning/hide.dm
@@ -10,7 +10,7 @@
stacktype = "hide"
no_variants = TRUE
// This needs to be very clearly documented for players. Whether it should stay in the main description is up for debate.
-/obj/item/stack/animalhide/examine(var/mob/user)
+/obj/item/stack/animalhide/examine(mob/user)
. = ..()
. += description_info
diff --git a/code/modules/materials/sheets/organic/tanning/hide_hairless.dm b/code/modules/materials/sheets/organic/tanning/hide_hairless.dm
index be73e06bc9..97e8552916 100644
--- a/code/modules/materials/sheets/organic/tanning/hide_hairless.dm
+++ b/code/modules/materials/sheets/organic/tanning/hide_hairless.dm
@@ -11,11 +11,11 @@
max_amount = 20
stacktype = "hairlesshide"
-/obj/item/stack/hairlesshide/examine(var/mob/user)
+/obj/item/stack/hairlesshide/examine(mob/user)
. = ..()
. += description_info
-/obj/item/stack/hairlesshide/water_act(var/wateramount)
+/obj/item/stack/hairlesshide/water_act(wateramount)
. = ..()
wateramount = min(amount, round(wateramount))
for(var/i in 1 to wateramount)
@@ -35,7 +35,7 @@
// Increment the amount
src.use(1)
-/obj/item/stack/hairlesshide/proc/rapidcure(var/stacknum = 1)
+/obj/item/stack/hairlesshide/proc/rapidcure(stacknum = 1)
stacknum = min(stacknum, amount)
while(stacknum)
diff --git a/code/modules/materials/sheets/organic/tanning/leather_wet.dm b/code/modules/materials/sheets/organic/tanning/leather_wet.dm
index 070b45c7a3..f99057ba8c 100644
--- a/code/modules/materials/sheets/organic/tanning/leather_wet.dm
+++ b/code/modules/materials/sheets/organic/tanning/leather_wet.dm
@@ -16,7 +16,7 @@
var/dry_type = /obj/item/stack/material/leather
-/obj/item/stack/wetleather/examine(var/mob/user)
+/obj/item/stack/wetleather/examine(mob/user)
. = ..()
. += description_info
. += "\The [src] is [get_dryness_text()]."
@@ -42,7 +42,7 @@
use(get_amount())
return L
-/obj/item/stack/wetleather/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)
+/obj/item/stack/wetleather/transfer_to(obj/item/stack/S, tamount=null, type_verified)
. = ..()
if(.) // If it transfers any, do a weighted average of the wetness
var/obj/item/stack/wetleather/W = S
diff --git a/code/modules/materials/sheets/organic/tanning/tanning_rack.dm b/code/modules/materials/sheets/organic/tanning/tanning_rack.dm
index 7062cda41e..15717cfe46 100644
--- a/code/modules/materials/sheets/organic/tanning/tanning_rack.dm
+++ b/code/modules/materials/sheets/organic/tanning/tanning_rack.dm
@@ -21,7 +21,7 @@
visible_message("The [drying] is dry!")
update_icon()
-/obj/structure/tanning_rack/examine(var/mob/user)
+/obj/structure/tanning_rack/examine(mob/user)
. = ..()
if(drying)
. += "\The [drying] is [drying.get_dryness_text()]."
@@ -34,7 +34,7 @@
else
add_overlay("leather_dry")
-/obj/structure/tanning_rack/attackby(var/atom/A, var/mob/user)
+/obj/structure/tanning_rack/attackby(atom/A, mob/user)
if(istype(A, /obj/item/stack/wetleather))
if(!drying) // If not drying anything, start drying the thing
if(user.unEquip(A, target = src))
@@ -46,7 +46,7 @@
return TRUE
return ..()
-/obj/structure/tanning_rack/attack_hand(var/mob/user)
+/obj/structure/tanning_rack/attack_hand(mob/user)
if(drying)
var/obj/item/stack/S = drying
if(!drying.wetness) // If it's dry, make a stack of dry leather and prepare to put that in their hands
@@ -63,5 +63,5 @@
drying = null
update_icon()
-/obj/structure/tanning_rack/attack_robot(var/mob/user)
+/obj/structure/tanning_rack/attack_robot(mob/user)
attack_hand(user) // That has checks to
diff --git a/code/modules/materials/sheets/organic/wood.dm b/code/modules/materials/sheets/organic/wood.dm
index f7fae829b8..52aa7db682 100644
--- a/code/modules/materials/sheets/organic/wood.dm
+++ b/code/modules/materials/sheets/organic/wood.dm
@@ -77,7 +77,7 @@
color = "#6f432a"
plank_type = /obj/item/stack/material/wood/hard
-/obj/item/stack/material/log/attackby(var/obj/item/W, var/mob/user)
+/obj/item/stack/material/log/attackby(obj/item/W, mob/user)
if(!istype(W) || W.force <= 0)
return ..()
if(W.sharp && W.edge)
diff --git a/code/modules/materials/sheets/supermatter.dm b/code/modules/materials/sheets/supermatter.dm
index 448d6e2a13..f0239e2f2e 100644
--- a/code/modules/materials/sheets/supermatter.dm
+++ b/code/modules/materials/sheets/supermatter.dm
@@ -45,7 +45,7 @@
w_class = min(5, round(amount / 10) + 1)
throw_range = round(amount / 7) + 1
-/obj/item/stack/material/supermatter/use(var/used)
+/obj/item/stack/material/supermatter/use(used)
. = ..()
update_mass()
return
diff --git a/code/modules/media/media_tracks.dm b/code/modules/media/media_tracks.dm
index 9cf2caabb2..fa78420fb4 100644
--- a/code/modules/media/media_tracks.dm
+++ b/code/modules/media/media_tracks.dm
@@ -13,7 +13,7 @@
var/lobby // Be one of the choices for lobby music?
var/casino // CHOMP Music for casino jukebox - Jack
-/datum/track/New(var/url, var/title, var/duration, var/artist = "", var/genre = "", var/secret = 0, var/lobby = 0)
+/datum/track/New(url, title, duration, artist = "", genre = "", secret = 0, lobby = 0)
src.url = url
src.title = title
src.artist = artist
diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm
index 839cc9d1e1..0cc7f59e10 100644
--- a/code/modules/media/mediamanager.dm
+++ b/code/modules/media/mediamanager.dm
@@ -35,7 +35,7 @@
// Update when moving between areas.
// TODO - While this direct override might technically be faster, probably better code to use observer or hooks ~Leshana
-/area/Entered(var/mob/M)
+/area/Entered(mob/M)
// Note, we cannot call ..() first, because it would update lastarea.
if(!istype(M) || isEye(M))
return ..()
@@ -58,7 +58,7 @@
set desc = "Set jukebox volume"
set_new_volume(usr)
-/client/proc/set_new_volume(var/mob/user)
+/client/proc/set_new_volume(mob/user)
if(QDELETED(src.media) || !istype(src.media))
to_chat(user, span_warning("You have no media datum to change, if you're not in the lobby tell an admin."))
return
@@ -79,7 +79,7 @@
/mob/proc/stop_all_music()
client?.media.stop_music()
-/mob/proc/force_music(var/url, var/start, var/volume=1)
+/mob/proc/force_music(url, start, volume=1)
if (client?.media)
if(url == "")
client.media.forced = 0
@@ -114,7 +114,7 @@
var/playerstyle // Choice of which player plugin to use
var/const/WINDOW_ID = "rpane.mediapanel" // Which elem in skin.dmf to use
-/datum/media_manager/New(var/client/C)
+/datum/media_manager/New(client/C)
ASSERT(istype(C))
src.owner = C
@@ -138,7 +138,7 @@
MP_DEBUG(span_green("Sending update to mediapanel ([url], [(world.time - start_time) / 10], [volume * source_volume])..."))
owner << output(list2params(list(url, (world.time - start_time) / 10, volume * source_volume)), "[WINDOW_ID]:SetMusic")
-/datum/media_manager/proc/push_music(var/targetURL, var/targetStartTime, var/targetVolume)
+/datum/media_manager/proc/push_music(targetURL, targetStartTime, targetVolume)
if (url != targetURL || abs(targetStartTime - start_time) > 1 || abs(targetVolume - source_volume) > 0.1 /* 10% */)
url = targetURL
start_time = targetStartTime
@@ -148,7 +148,7 @@
/datum/media_manager/proc/stop_music()
push_music("", 0, 1)
-/datum/media_manager/proc/update_volume(var/value)
+/datum/media_manager/proc/update_volume(value)
volume = value
send_update()
diff --git a/code/modules/metric/activity.dm b/code/modules/metric/activity.dm
index 602f9cdfdf..2b73d341d5 100644
--- a/code/modules/metric/activity.dm
+++ b/code/modules/metric/activity.dm
@@ -1,6 +1,6 @@
// This checks an individual player's activity level. People who have been afk for a few minutes aren't punished as much as those
// who were afk for hours, as they're most likely gone for good.
-/datum/metric/proc/assess_player_activity(var/mob/M)
+/datum/metric/proc/assess_player_activity(mob/M)
. = 100
if(!M)
. = 0
@@ -22,7 +22,7 @@
. = max(. , 0) // No negative numbers, or else people could drag other, non-afk players down.
// This checks a whole department's collective activity.
-/datum/metric/proc/assess_department(var/department)
+/datum/metric/proc/assess_department(department)
if(!department)
return
var/departmental_activity = 0
@@ -36,7 +36,7 @@
departmental_activity = departmental_activity / departmental_size // Average it out.
return departmental_activity
-/datum/metric/proc/assess_all_departments(var/cutoff_number = 3, var/list/department_blacklist = list())
+/datum/metric/proc/assess_all_departments(cutoff_number = 3, list/department_blacklist = list())
var/list/activity = list()
for(var/department in departments)
activity[department] = assess_department(department)
diff --git a/code/modules/metric/count.dm b/code/modules/metric/count.dm
index ebf38bde7a..a99d572def 100644
--- a/code/modules/metric/count.dm
+++ b/code/modules/metric/count.dm
@@ -2,7 +2,7 @@
* Procs for counting active players in different situations. Returns the number of active players within the given cutoff.
*/
-/datum/metric/proc/count_all_outdoor_mobs(var/cutoff = 75)
+/datum/metric/proc/count_all_outdoor_mobs(cutoff = 75)
var/num = 0
for(var/mob/living/L in GLOB.player_list)
var/turf/T = get_turf(L)
@@ -11,7 +11,7 @@
num++
return num
-/datum/metric/proc/count_all_space_mobs(var/cutoff = 75, var/respect_z = TRUE)
+/datum/metric/proc/count_all_space_mobs(cutoff = 75, respect_z = TRUE)
var/num = 0
for(var/mob/living/L in GLOB.player_list)
var/turf/T = get_turf(L)
diff --git a/code/modules/metric/department.dm b/code/modules/metric/department.dm
index 2f49c7e75c..1d0f400e4f 100644
--- a/code/modules/metric/department.dm
+++ b/code/modules/metric/department.dm
@@ -1,6 +1,6 @@
// This proc tries to find the department of an arbitrary mob.
-/datum/metric/proc/guess_department(var/mob/M)
+/datum/metric/proc/guess_department(mob/M)
var/list/found_roles = list()
. = DEPARTMENT_UNKNOWN
@@ -53,14 +53,14 @@
// Feed this proc the name of a job, and it will try to figure out what department they are apart of.
// Improved with the addition of SSjob, which has departments be an actual thing and not a virtual concept.
-/datum/metric/proc/role_name_to_department(var/role_name)
+/datum/metric/proc/role_name_to_department(role_name)
var/datum/job/J = SSjob.get_job(role_name)
if(istype(J))
if(LAZYLEN(J.departments))
return J.departments
return list(DEPARTMENT_UNKNOWN)
-/datum/metric/proc/count_people_in_department(var/department, cutoff = 75)
+/datum/metric/proc/count_people_in_department(department, cutoff = 75)
var/list/L = get_people_in_department(department, cutoff)
return L.len
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 602bc0bda2..43aea4cc3f 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -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
diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 0cb6592ba1..6064da919d 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -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."))
diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm
index 335d8753c5..d75368fc46 100644
--- a/code/modules/mining/drilling/scanner.dm
+++ b/code/modules/mining/drilling/scanner.dm
@@ -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,
diff --git a/code/modules/mining/kinetic_crusher.dm b/code/modules/mining/kinetic_crusher.dm
index 308cb84e74..2e3d1471c7 100644
--- a/code/modules/mining/kinetic_crusher.dm
+++ b/code/modules/mining/kinetic_crusher.dm
@@ -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)
diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm
index 0fd9c3e60e..3132289dfe 100644
--- a/code/modules/mining/machinery/machine_processing.dm
+++ b/code/modules/mining/machinery/machine_processing.dm
@@ -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
diff --git a/code/modules/mining/machinery/machine_stacking.dm b/code/modules/mining/machinery/machine_stacking.dm
index b89a33d583..77910bff93 100644
--- a/code/modules/mining/machinery/machine_stacking.dm
+++ b/code/modules/mining/machinery/machine_stacking.dm
@@ -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
diff --git a/code/modules/mining/machinery/machine_unloading.dm b/code/modules/mining/machinery/machine_unloading.dm
index d20536131c..5042b06028 100644
--- a/code/modules/mining/machinery/machine_unloading.dm
+++ b/code/modules/mining/machinery/machine_unloading.dm
@@ -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
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 0d2a73e9fd..af2bcecd41 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -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))
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 270c186e46..8d9d150e33 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -192,7 +192,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)
@@ -230,7 +230,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??)
@@ -312,7 +312,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
@@ -557,7 +557,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.
@@ -566,7 +566,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
@@ -634,7 +634,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)
@@ -678,7 +678,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)
@@ -709,7 +709,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!
@@ -733,7 +733,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
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index 9cf15c3b9f..bdc7b664bf 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -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
..()
diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
index 6273c6acb5..96caf682b6 100644
--- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
@@ -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)
diff --git a/code/modules/mining/resonator.dm b/code/modules/mining/resonator.dm
index f4dab87574..988af2c526 100644
--- a/code/modules/mining/resonator.dm
+++ b/code/modules/mining/resonator.dm
@@ -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
diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm
index 7f95679b05..f84b6f3c42 100644
--- a/code/modules/mining/shelter_atoms_vr.dm
+++ b/code/modules/mining/shelter_atoms_vr.dm
@@ -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!
diff --git a/code/modules/mining/shelters_vr.dm b/code/modules/mining/shelters_vr.dm
index 4ae99d1af6..aaa990a6c9 100644
--- a/code/modules/mining/shelters_vr.dm
+++ b/code/modules/mining/shelters_vr.dm
@@ -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
diff --git a/code/modules/mob/_modifiers/cloning.dm b/code/modules/mob/_modifiers/cloning.dm
index f51d1eab17..7c4840520c 100644
--- a/code/modules/mob/_modifiers/cloning.dm
+++ b/code/modules/mob/_modifiers/cloning.dm
@@ -84,7 +84,7 @@
stacks = MODIFIER_STACK_ALLOWED //You have somehow had the surgery done twice. Your brain is very, very fucked, but I won't say no.
-/datum/modifier/franken_sickness/can_apply(var/mob/living/L)
+/datum/modifier/franken_sickness/can_apply(mob/living/L)
if(!ishuman(L))
return FALSE
if(L.isSynthetic()) //Nonhumans and Machines cannot be Frankensteined, at this time.
@@ -106,7 +106,7 @@
stacks = MODIFIER_STACK_ALLOWED
-/datum/modifier/franken_recovery/can_apply(var/mob/living/L)
+/datum/modifier/franken_recovery/can_apply(mob/living/L)
if(!ishuman(L))
return FALSE
if(L.isSynthetic()) //Nonhumans and Machines cannot be Frankensteined, at this time.
diff --git a/code/modules/mob/_modifiers/crusher_mark.dm b/code/modules/mob/_modifiers/crusher_mark.dm
index 67a6b36a7f..d9fe168337 100644
--- a/code/modules/mob/_modifiers/crusher_mark.dm
+++ b/code/modules/mob/_modifiers/crusher_mark.dm
@@ -7,7 +7,7 @@
var/mutable_appearance/marked_underlay
var/obj/item/kinetic_crusher/hammer_synced
-/datum/modifier/crusher_mark/New(var/new_holder, var/new_origin)
+/datum/modifier/crusher_mark/New(new_holder, new_origin)
. = ..()
if(isliving(new_origin))
var/mob/living/origin = new_origin
diff --git a/code/modules/mob/_modifiers/feysight.dm b/code/modules/mob/_modifiers/feysight.dm
index aac6d286d3..b2fb2bf59d 100644
--- a/code/modules/mob/_modifiers/feysight.dm
+++ b/code/modules/mob/_modifiers/feysight.dm
@@ -22,7 +22,7 @@
holder.vis_enabled -= VIS_GHOSTS
holder.recalculate_vis()
-/datum/modifier/feysight/can_apply(var/mob/living/L)
+/datum/modifier/feysight/can_apply(mob/living/L)
if(L.stat)
to_chat(L, span_warning("You can't be unconscious or dead to experience tranquility."))
return FALSE
diff --git a/code/modules/mob/_modifiers/horror.dm b/code/modules/mob/_modifiers/horror.dm
index 2ca28fce83..8033051873 100644
--- a/code/modules/mob/_modifiers/horror.dm
+++ b/code/modules/mob/_modifiers/horror.dm
@@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(redspace_areas, list(
holder.vis_enabled -= VIS_GHOSTS
holder.recalculate_vis()
-/datum/modifier/redsight/can_apply(var/mob/living/L)
+/datum/modifier/redsight/can_apply(mob/living/L)
if(L.stat)
to_chat(L, span_warning("You can't be unconscious or dead to see the unknown."))
return FALSE
@@ -640,7 +640,7 @@ GLOBAL_LIST_INIT(redspace_areas, list(
qdel(blade) //failed, sad.
//shamelessly stolen from changeling/armor.dm
-/datum/modifier/redspace_corruption/proc/equip_flesh_armor(var/armor_type, var/helmet_type, var/boot_type, var/glove_type)
+/datum/modifier/redspace_corruption/proc/equip_flesh_armor(armor_type, helmet_type, boot_type, glove_type)
var/mob/living/carbon/human/M = unfortunate_soul
diff --git a/code/modules/mob/_modifiers/modifiers.dm b/code/modules/mob/_modifiers/modifiers.dm
index 0929176196..d2b0b782fa 100644
--- a/code/modules/mob/_modifiers/modifiers.dm
+++ b/code/modules/mob/_modifiers/modifiers.dm
@@ -64,7 +64,7 @@
var/vision_flags // Vision flags to add to the mob. SEE_MOB, SEE_OBJ, etc.
-/datum/modifier/New(var/new_holder, var/new_origin)
+/datum/modifier/New(new_holder, new_origin)
holder = new_holder
if(new_origin)
origin = WEAKREF(new_origin)
@@ -78,7 +78,7 @@
// Checks if the modifier should be allowed to be applied to the mob before attaching it.
// Override for special criteria, e.g. forbidding robots from receiving it.
-/datum/modifier/proc/can_apply(var/mob/living/L, var/suppress_output = FALSE)
+/datum/modifier/proc/can_apply(mob/living/L, suppress_output = FALSE)
return TRUE
// Checks to see if this datum should continue existing.
@@ -86,7 +86,7 @@
if(expire_at && expire_at < world.time) // Is our time up?
src.expire()
-/datum/modifier/proc/expire(var/silent = FALSE)
+/datum/modifier/proc/expire(silent = FALSE)
if(on_expired_text && !silent)
to_chat(holder, on_expired_text)
on_expire()
@@ -131,7 +131,7 @@
// Third argument is the 'source' of the modifier, if it's from someone else. If null, it will default to the mob being applied to.
// The SECONDS/MINUTES macro is very helpful for this. E.g. M.add_modifier(/datum/modifier/example, 5 MINUTES)
// The fourth argument is a boolean to suppress failure messages, set it to true if the modifier is repeatedly applied (as chem-based modifiers are) to prevent chat-spam
-/mob/living/proc/add_modifier(var/modifier_type, var/expire_at = null, var/mob/living/origin = null, var/suppress_failure = FALSE)
+/mob/living/proc/add_modifier(modifier_type, expire_at = null, mob/living/origin = null, suppress_failure = FALSE)
// First, check if the mob already has this modifier.
for(var/datum/modifier/M in modifiers)
if(ispath(modifier_type, M))
@@ -170,33 +170,33 @@
return mod
// Removes a specific instance of modifier
-/mob/living/proc/remove_specific_modifier(var/datum/modifier/M, var/silent = FALSE)
+/mob/living/proc/remove_specific_modifier(datum/modifier/M, silent = FALSE)
M.expire(silent)
// Removes one modifier of a type
-/mob/living/proc/remove_a_modifier_of_type(var/modifier_type, var/silent = FALSE)
+/mob/living/proc/remove_a_modifier_of_type(modifier_type, silent = FALSE)
for(var/datum/modifier/M in modifiers)
if(ispath(M.type, modifier_type))
M.expire(silent)
break
// Removes all modifiers of a type
-/mob/living/proc/remove_modifiers_of_type(var/modifier_type, var/silent = FALSE)
+/mob/living/proc/remove_modifiers_of_type(modifier_type, silent = FALSE)
for(var/datum/modifier/M in modifiers)
if(ispath(M.type, modifier_type))
M.expire(silent)
// Removes all modifiers, useful if the mob's being deleted
-/mob/living/proc/remove_all_modifiers(var/silent = FALSE)
+/mob/living/proc/remove_all_modifiers(silent = FALSE)
for(var/datum/modifier/M in modifiers)
M.expire(silent)
// Checks if the mob has a modifier type.
-/mob/living/proc/has_modifier_of_type(var/modifier_type)
+/mob/living/proc/has_modifier_of_type(modifier_type)
return get_modifier_of_type(modifier_type) ? TRUE : FALSE
// Gets the first instance of a specific modifier type or subtype.
-/mob/living/proc/get_modifier_of_type(var/modifier_type)
+/mob/living/proc/get_modifier_of_type(modifier_type)
for(var/datum/modifier/M in modifiers)
if(istype(M, modifier_type))
return M
@@ -272,7 +272,7 @@
// Helper to format multiplers (e.g. 1.4) to percentages (like '40%')
-/proc/multipler_to_percentage(var/multi, var/abs = FALSE)
+/proc/multipler_to_percentage(multi, abs = FALSE)
if(abs)
return "[abs( ((multi - 1) * 100) )]%"
return "[((multi - 1) * 100)]%"
diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm
index 355a0bd1bb..55c1f39620 100644
--- a/code/modules/mob/_modifiers/modifiers_misc.dm
+++ b/code/modules/mob/_modifiers/modifiers_misc.dm
@@ -113,7 +113,7 @@ the artifact triggers the rage.
var/mob/living/carbon/human/H = holder
H.shock_stage = last_shock_stage
-/datum/modifier/berserk/can_apply(var/mob/living/L, var/suppress_failure = FALSE)
+/datum/modifier/berserk/can_apply(mob/living/L, suppress_failure = FALSE)
if(L.stat)
if(!suppress_failure)
to_chat(L, span_warning("You can't be unconscious or dead to berserk."))
diff --git a/code/modules/mob/_modifiers/traits_phobias.dm b/code/modules/mob/_modifiers/traits_phobias.dm
index 71aee1602c..89cd94ec1c 100644
--- a/code/modules/mob/_modifiers/traits_phobias.dm
+++ b/code/modules/mob/_modifiers/traits_phobias.dm
@@ -24,7 +24,7 @@
else
adjust_fear(-fear_decay_rate)
-/datum/modifier/trait/phobia/proc/adjust_fear(var/amount)
+/datum/modifier/trait/phobia/proc/adjust_fear(amount)
var/last_fear = current_fear
current_fear = between(0, current_fear + amount, max_fear)
@@ -595,7 +595,7 @@
return list()
-/datum/modifier/trait/phobia/xenophobia/proc/make_message(var/mob/living/L)
+/datum/modifier/trait/phobia/xenophobia/proc/make_message(mob/living/L)
return "Someone forgot to override this output message."
@@ -618,7 +618,7 @@
xenos += H
return xenos
-/datum/modifier/trait/phobia/xenophobia/generic/make_message(var/mob/living/carbon/human/H)
+/datum/modifier/trait/phobia/xenophobia/generic/make_message(mob/living/carbon/human/H)
// Do special responses first if possible.
// if(H.stat == DEAD)
// return pick( list("Unsurprising to see a weak and inferior [H.species.name] fail to survive.", "If that [H.species.name] were a [holder.species.name], this wouldn't've have happened.") )
@@ -655,7 +655,7 @@
humans += H
return humans
-/datum/modifier/trait/phobia/xenophobia/human/make_message(var/mob/living/carbon/human/H)
+/datum/modifier/trait/phobia/xenophobia/human/make_message(mob/living/carbon/human/H)
// Do special responses first if possible.
// Generic responses if none of the above apply.
@@ -684,7 +684,7 @@
skrell += H
return skrell
-/datum/modifier/trait/phobia/xenophobia/skrell/make_message(var/mob/living/carbon/human/H)
+/datum/modifier/trait/phobia/xenophobia/skrell/make_message(mob/living/carbon/human/H)
// Do special responses first if possible.
// Generic responses if none of the above apply.
diff --git a/code/modules/mob/_modifiers/unholy.dm b/code/modules/mob/_modifiers/unholy.dm
index 0f4ab94db9..7f90611aad 100644
--- a/code/modules/mob/_modifiers/unholy.dm
+++ b/code/modules/mob/_modifiers/unholy.dm
@@ -156,7 +156,7 @@
on_expired_text = span_notice("The blaze of hunger inside you has been snuffed.")
stacks = MODIFIER_STACK_EXTEND
-/datum/modifier/gluttonyregeneration/can_apply(var/mob/living/L)
+/datum/modifier/gluttonyregeneration/can_apply(mob/living/L)
if(L.stat == DEAD)
to_chat(L, span_warning("You can't be dead to consume."))
return FALSE
diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm
index 393eaab1d4..88cd13b88c 100644
--- a/code/modules/mob/animations.dm
+++ b/code/modules/mob/animations.dm
@@ -2,7 +2,7 @@
/mob/var/is_floating = 0
/mob/var/floatiness = 0
-/mob/proc/update_floating(var/dense_object=0)
+/mob/proc/update_floating(dense_object=0)
if(anchored||buckled)
make_floating(0)
@@ -32,7 +32,7 @@
make_floating(1)
return
-/mob/proc/make_floating(var/n)
+/mob/proc/make_floating(n)
if(buckled)
if(is_floating)
stop_floating()
@@ -65,7 +65,7 @@
//reset the pixel offsets to zero
is_floating = 0
-/atom/movable/proc/fade_towards(atom/A,var/time = 2)
+/atom/movable/proc/fade_towards(atom/A,time = 2)
set waitfor = FALSE
var/pixel_x_diff = 0
diff --git a/code/modules/mob/dead/observer/chunk.dm b/code/modules/mob/dead/observer/chunk.dm
index 5efe8fcd5b..f91cc73349 100644
--- a/code/modules/mob/dead/observer/chunk.dm
+++ b/code/modules/mob/dead/observer/chunk.dm
@@ -27,7 +27,7 @@
if(visible > 0)
visible--
-/datum/chunk/ghost/acquireVisibleTurfs(var/list/invisible)
+/datum/chunk/ghost/acquireVisibleTurfs(list/invisible)
for(var/area/A in hidden_areas)
diff --git a/code/modules/mob/dead/observer/ghostnet.dm b/code/modules/mob/dead/observer/ghostnet.dm
index b9e6952d19..2ea7004eea 100644
--- a/code/modules/mob/dead/observer/ghostnet.dm
+++ b/code/modules/mob/dead/observer/ghostnet.dm
@@ -70,7 +70,7 @@
else
majorChunkChange(A, 0)
-/datum/visualnet/ghost/majorChunkChange(area/A, var/choice)
+/datum/visualnet/ghost/majorChunkChange(area/A, choice)
if(choice == 2)
return
for(var/entry in chunks)
@@ -81,7 +81,7 @@
gchunk.hasChanged(TRUE)
break
-/datum/visualnet/ghost/onMajorChunkChange(atom/c, var/choice, var/datum/chunk/ghost/chunk)
+/datum/visualnet/ghost/onMajorChunkChange(atom/c, choice, datum/chunk/ghost/chunk)
// Only add actual areas to the list of areas
if(istype(c, /area))
if(choice == 0)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 76339aea80..24c332b7e8 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -132,7 +132,7 @@
/mob/observer/dead/CanPass(atom/movable/mover, turf/target)
return TRUE
-/mob/observer/dead/set_stat(var/new_stat)
+/mob/observer/dead/set_stat(new_stat)
if(new_stat != DEAD)
CRASH("It is best if observers stay dead, thank you.")
@@ -183,7 +183,7 @@ Works together with spawning an observer, noted above.
forceMove(O.loc)
//RS Port #658 End
-/mob/proc/ghostize(var/can_reenter_corpse = 1, var/aghost = FALSE)
+/mob/proc/ghostize(can_reenter_corpse = 1, aghost = FALSE)
reset_perspective(src) // End any remoteview we're in
if(key)
if(ishuman(src))
@@ -450,7 +450,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return ..()
// This is the ghost's follow verb with an argument
-/mob/observer/dead/proc/ManualFollow(var/atom/movable/target)
+/mob/observer/dead/proc/ManualFollow(atom/movable/target)
if(!target)
return
@@ -573,10 +573,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
update_following()
return ..()
-/mob/proc/check_holy(var/turf/T)
+/mob/proc/check_holy(turf/T)
return FALSE
-/mob/observer/dead/check_holy(var/turf/T)
+/mob/observer/dead/check_holy(turf/T)
if(check_rights_for(src.client, R_ADMIN|R_FUN|R_EVENT))
return FALSE
@@ -775,7 +775,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
span_warning("You get the feeling that the ghost can't become any more visible.") \
)
-/mob/observer/dead/proc/toggle_icon(var/icon)
+/mob/observer/dead/proc/toggle_icon(icon)
if(!client)
return
@@ -811,7 +811,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set category = "Ghost.Settings"
toggle_ghost_visibility()
-/mob/observer/dead/proc/toggle_ghost_visibility(var/forced = FALSE)
+/mob/observer/dead/proc/toggle_ghost_visibility(forced = FALSE)
if(!is_manifest)
to_chat(src, span_filter_notice("You are not strong enough to pierce the veil..."))
return
@@ -879,7 +879,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
plane_holder.set_vis(VIS_LIGHTING, lighting_alpha)
plane_holder.set_vis(VIS_GHOSTS, ghostvision)
-/mob/observer/dead/MayRespawn(var/feedback = FALSE)
+/mob/observer/dead/MayRespawn(feedback = FALSE)
if(!client)
return FALSE
if(mind && mind.current && mind.current.stat != DEAD && can_reenter_corpse)
@@ -895,15 +895,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/atom/proc/extra_ghost_link()
return
-/mob/extra_ghost_link(var/atom/ghost)
+/mob/extra_ghost_link(atom/ghost)
if(client && eyeobj)
return "|eye"
-/mob/observer/dead/extra_ghost_link(var/atom/ghost)
+/mob/observer/dead/extra_ghost_link(atom/ghost)
if(mind && mind.current)
return "|body"
-/proc/ghost_follow_link(var/atom/target, var/atom/ghost)
+/proc/ghost_follow_link(atom/target, atom/ghost)
if((!target) || (!ghost)) return
. = "follow"
. += target.extra_ghost_link(ghost)
@@ -1013,7 +1013,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
// Lets a ghost know someone's trying to bring them back, and for them to get into their body.
// Mostly the same as TG's sans the hud element, since we don't have TG huds.
-/mob/observer/dead/proc/notify_revive(var/message, var/sound, flashwindow = TRUE, var/atom/source)
+/mob/observer/dead/proc/notify_revive(message, sound, flashwindow = TRUE, atom/source)
if((last_revive_notification + 2 MINUTES) > world.time)
return
last_revive_notification = world.time
diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm
index 25075d5a92..a08a254347 100644
--- a/code/modules/mob/dead/observer/say.dm
+++ b/code/modules/mob/dead/observer/say.dm
@@ -1,4 +1,4 @@
-/mob/observer/dead/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/observer/dead/say(message, datum/language/speaking = null, whispering = 0)
message = sanitize(message)
if(!message)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 96c298eb89..7af814ed54 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -1,11 +1,11 @@
// Shortcuts for above proc
-/mob/proc/visible_emote(var/act_desc)
+/mob/proc/visible_emote(act_desc)
custom_emote(VISIBLE_MESSAGE, act_desc)
-/mob/proc/audible_emote(var/act_desc)
+/mob/proc/audible_emote(act_desc)
custom_emote(AUDIBLE_MESSAGE, act_desc)
-/mob/proc/emote_dead(var/message)
+/mob/proc/emote_dead(message)
if(client.prefs.muted & MUTE_DEADCHAT)
to_chat(src, span_danger("You cannot send deadchat emotes (muted)."))
diff --git a/code/modules/mob/freelook/ai/cameranet.dm b/code/modules/mob/freelook/ai/cameranet.dm
index d1b395d823..c42e3dde76 100644
--- a/code/modules/mob/freelook/ai/cameranet.dm
+++ b/code/modules/mob/freelook/ai/cameranet.dm
@@ -33,7 +33,7 @@
//else
// majorChunkChange(c, 0)
-/datum/visualnet/camera/onMajorChunkChange(atom/c, var/choice, var/datum/chunk/camera/chunk)
+/datum/visualnet/camera/onMajorChunkChange(atom/c, choice, datum/chunk/camera/chunk)
// Only add actual cameras to the list of cameras
if(istype(c, /obj/machinery/camera))
if(choice == 0)
diff --git a/code/modules/mob/freelook/ai/chunk.dm b/code/modules/mob/freelook/ai/chunk.dm
index cb8104513a..52f4a75f26 100644
--- a/code/modules/mob/freelook/ai/chunk.dm
+++ b/code/modules/mob/freelook/ai/chunk.dm
@@ -6,7 +6,7 @@
/datum/chunk/camera
var/list/cameras = list()
-/datum/chunk/camera/acquireVisibleTurfs(var/list/visible)
+/datum/chunk/camera/acquireVisibleTurfs(list/visible)
for(var/obj/machinery/camera/c as anything in cameras)
if(!istype(c))
diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm
index a2d97fd7c4..994376e77c 100644
--- a/code/modules/mob/freelook/ai/eye.dm
+++ b/code/modules/mob/freelook/ai/eye.dm
@@ -20,7 +20,7 @@
visualnet = null
. = ..()
-/mob/observer/eye/aiEye/setLoc(var/T, var/cancel_tracking = 1)
+/mob/observer/eye/aiEye/setLoc(T, cancel_tracking = 1)
if(owner)
T = get_turf(T)
loc = T
@@ -51,7 +51,7 @@
/mob/living/silicon/ai
var/obj/machinery/hologram/holopad/holo = null
-/mob/living/silicon/ai/proc/destroy_eyeobj(var/atom/new_eye)
+/mob/living/silicon/ai/proc/destroy_eyeobj(atom/new_eye)
if(!eyeobj) return
if(!new_eye)
new_eye = src
@@ -59,7 +59,7 @@
eyeobj = null
reset_perspective(new_eye)
-/mob/living/silicon/ai/proc/create_eyeobj(var/newloc)
+/mob/living/silicon/ai/proc/create_eyeobj(newloc)
if(eyeobj)
destroy_eyeobj()
if(!newloc)
diff --git a/code/modules/mob/freelook/ai/update_triggers.dm b/code/modules/mob/freelook/ai/update_triggers.dm
index 34395183f9..ad186af0c5 100644
--- a/code/modules/mob/freelook/ai/update_triggers.dm
+++ b/code/modules/mob/freelook/ai/update_triggers.dm
@@ -35,7 +35,7 @@
// An addition to deactivate which removes/adds the camera from the chunk list based on if it works or not.
-/obj/machinery/camera/deactivate(user as mob, var/choice = 1)
+/obj/machinery/camera/deactivate(user as mob, choice = 1)
..(user, choice)
if(src.can_use())
GLOB.cameranet.addCamera(src)
diff --git a/code/modules/mob/freelook/chunk.dm b/code/modules/mob/freelook/chunk.dm
index 6f1b12568a..15c39e2ea0 100644
--- a/code/modules/mob/freelook/chunk.dm
+++ b/code/modules/mob/freelook/chunk.dm
@@ -58,7 +58,7 @@
// Updates the chunk, makes sure that it doesn't update too much. If the chunk isn't being watched it will
// instead be flagged to update the next time an AI Eye moves near it.
-/datum/chunk/proc/hasChanged(var/update_now = 0)
+/datum/chunk/proc/hasChanged(update_now = 0)
if(visible || update_now)
if(!updating)
updating = 1
@@ -112,7 +112,7 @@
client.images += t.obfuscations[obfuscation.type]
updating = 0
-/datum/chunk/proc/acquireVisibleTurfs(var/list/visible)
+/datum/chunk/proc/acquireVisibleTurfs(list/visible)
// Create a new camera chunk, since the chunks are made as they are needed.
diff --git a/code/modules/mob/freelook/eye.dm b/code/modules/mob/freelook/eye.dm
index 2b042b06cf..24a151cbc0 100644
--- a/code/modules/mob/freelook/eye.dm
+++ b/code/modules/mob/freelook/eye.dm
@@ -58,7 +58,7 @@
// Use this when setting the eye's location.
// It will also stream the chunk that the new loc is in.
-/mob/observer/eye/proc/setLoc(var/T)
+/mob/observer/eye/proc/setLoc(T)
if(owner)
T = get_turf(T)
if(T != loc)
diff --git a/code/modules/mob/freelook/mask/chunk.dm b/code/modules/mob/freelook/mask/chunk.dm
index cf4aae1f49..38e03e12fc 100644
--- a/code/modules/mob/freelook/mask/chunk.dm
+++ b/code/modules/mob/freelook/mask/chunk.dm
@@ -9,7 +9,7 @@
/datum/chunk/cult
obfuscation = new /datum/obfuscation/cult()
-/datum/chunk/cult/acquireVisibleTurfs(var/list/visible)
+/datum/chunk/cult/acquireVisibleTurfs(list/visible)
for(var/mob/living/L in GLOB.living_mob_list)
for(var/turf/t in L.seen_cult_turfs())
visible[t] = t
@@ -31,6 +31,6 @@
/mob/living/simple_mob/construct/shade/seen_cult_turfs()
return view(2, src)
-/proc/seen_turfs_in_range(var/source, var/range)
+/proc/seen_turfs_in_range(source, range)
var/turf/pos = get_turf(source)
return hear(range, pos)
diff --git a/code/modules/mob/freelook/mask/cultnet.dm b/code/modules/mob/freelook/mask/cultnet.dm
index 6d2f248a2e..b8a74cff14 100644
--- a/code/modules/mob/freelook/mask/cultnet.dm
+++ b/code/modules/mob/freelook/mask/cultnet.dm
@@ -5,7 +5,7 @@
/datum/visualnet/cult
chunk_type = /datum/chunk/cult
-/datum/visualnet/cult/proc/provides_vision(var/mob/living/L)
+/datum/visualnet/cult/proc/provides_vision(mob/living/L)
return L.provides_cult_vision()
/mob/living/proc/provides_cult_vision()
diff --git a/code/modules/mob/freelook/mask/update_triggers.dm b/code/modules/mob/freelook/mask/update_triggers.dm
index dc6d25e30e..c239408b06 100644
--- a/code/modules/mob/freelook/mask/update_triggers.dm
+++ b/code/modules/mob/freelook/mask/update_triggers.dm
@@ -34,12 +34,12 @@
// If true, the mob went from living to dead (assuming everyone has been overriding as they should...)
GLOB.cultnet.updateVisibility(src)
-/datum/antagonist/add_antagonist(var/datum/mind/player)
+/datum/antagonist/add_antagonist(datum/mind/player)
. = ..()
if(src == GLOB.cult)
GLOB.cultnet.updateVisibility(player.current, 0)
-/datum/antagonist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
+/datum/antagonist/remove_antagonist(datum/mind/player, show_message, implanted)
..()
if(src == GLOB.cult)
GLOB.cultnet.updateVisibility(player.current, 0)
diff --git a/code/modules/mob/freelook/update_triggers.dm b/code/modules/mob/freelook/update_triggers.dm
index 957219defd..137c405de3 100644
--- a/code/modules/mob/freelook/update_triggers.dm
+++ b/code/modules/mob/freelook/update_triggers.dm
@@ -2,7 +2,7 @@
// TURFS
-/proc/updateVisibility(atom/A, var/opacity_check = 1)
+/proc/updateVisibility(atom/A, opacity_check = 1)
if(SSticker)
for(var/datum/visualnet/VN in GLOB.visual_nets)
VN.updateVisibility(A, opacity_check)
diff --git a/code/modules/mob/freelook/visualnet.dm b/code/modules/mob/freelook/visualnet.dm
index 1fc0219591..8b42c493da 100644
--- a/code/modules/mob/freelook/visualnet.dm
+++ b/code/modules/mob/freelook/visualnet.dm
@@ -90,7 +90,7 @@
// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open.
-/datum/visualnet/proc/updateVisibility(atom/A, var/opacity_check = 1)
+/datum/visualnet/proc/updateVisibility(atom/A, opacity_check = 1)
if(!SSticker || (opacity_check && !A.opacity))
return
@@ -109,7 +109,7 @@
// Setting the choice to 0 will remove the camera from the chunks.
// If you want to update the chunks around an object, without adding/removing a camera, use choice 2.
-/datum/visualnet/proc/majorChunkChange(atom/c, var/choice)
+/datum/visualnet/proc/majorChunkChange(atom/c, choice)
// 0xf = 15
if(!c)
return
@@ -130,7 +130,7 @@
onMajorChunkChange(c, choice, chunk)
chunk.hasChanged()
-/datum/visualnet/proc/onMajorChunkChange(atom/c, var/choice, var/datum/chunk/chunk)
+/datum/visualnet/proc/onMajorChunkChange(atom/c, choice, datum/chunk/chunk)
// Will check if a mob is on a viewable turf. Returns 1 if it is, otherwise returns 0.
@@ -139,7 +139,7 @@
var/turf/position = get_turf(target)
return checkTurfVis(position)
-/datum/visualnet/proc/checkTurfVis(var/turf/position)
+/datum/visualnet/proc/checkTurfVis(turf/position)
var/datum/chunk/chunk = getChunk(position.x, position.y, position.z)
if(chunk)
if(chunk.changed)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index cd1fa5ac12..e3393d0783 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -1,5 +1,5 @@
// At minimum every mob has a hear_say proc.
-/mob/proc/combine_message(var/list/message_pieces, var/verb, var/mob/speaker, always_stars = FALSE, var/radio = FALSE)
+/mob/proc/combine_message(list/message_pieces, verb, mob/speaker, always_stars = FALSE, radio = FALSE)
var/iteration_count = 0
var/msg = "" // This is to make sure that the pieces have actually added something
var/raw_msg = ""
@@ -62,7 +62,7 @@
else
return stars(SP.message)
-/mob/proc/hear_say(var/list/message_pieces, var/verb = "says", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol)
+/mob/proc/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol)
if(!client && !teleop)
return FALSE
@@ -132,12 +132,12 @@
return TRUE
// Done here instead of on_hear_say() since that is NOT called if the mob is clientless (which includes most AI mobs).
-/mob/living/hear_say(var/list/message_pieces, var/verb = "says", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol)
+/mob/living/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null, sound/speech_sound, sound_vol)
.=..()
if(has_AI()) // Won't happen if no ai_holder exists or there's a player inside w/o autopilot active.
ai_holder.on_hear_say(speaker, multilingual_to_message(message_pieces))
-/mob/proc/on_hear_say(var/message, var/mob/speaker = null)
+/mob/proc/on_hear_say(message, mob/speaker = null)
if(client)
message = span_game(span_say(message))
if(speaker && !speaker.client)
@@ -150,7 +150,7 @@
else
to_chat(src, span_game(span_say(message)))
-/mob/living/silicon/on_hear_say(var/message, var/mob/speaker = null)
+/mob/living/silicon/on_hear_say(message, mob/speaker = null)
if(client)
message = span_game(span_say(message))
if(speaker && !speaker.client)
@@ -164,7 +164,7 @@
to_chat(src, span_game(span_say(message)))
// Checks if the mob's own name is included inside message. Handles both first and last names.
-/mob/proc/check_mentioned(var/message)
+/mob/proc/check_mentioned(message)
var/not_included = list("A", "The", "Of", "In", "For", "Through", "Throughout", "Therefore", "Here", "There", "Then", "Now", "I", "You", "They", "He", "She", "By")
var/list/valid_names = splittext(real_name, " ") // Should output list("John", "Doe") as an example.
valid_names -= not_included
@@ -192,7 +192,7 @@
return tagged_message
-/mob/proc/hear_radio(var/list/message_pieces, var/verb = "says", var/part_a, var/part_b, var/part_c, var/part_d, var/part_e, var/mob/speaker = null, var/hard_to_hear = 0, var/vname = "")
+/mob/proc/hear_radio(list/message_pieces, verb = "says", part_a, part_b, part_c, part_d, part_e, mob/speaker = null, hard_to_hear = 0, vname = "")
if(!client)
return
@@ -249,7 +249,7 @@
final_message = "[time][part_a][final_message][part_e]"
to_chat(src, final_message)
-/mob/proc/hear_signlang(var/message, var/verb = "gestures", var/verb_understood = "gestures", var/datum/language/language, var/mob/speaker = null, var/speech_type = 1)
+/mob/proc/hear_signlang(message, verb = "gestures", verb_understood = "gestures", datum/language/language, mob/speaker = null, speech_type = 1)
if(!client)
return
@@ -270,7 +270,7 @@
show_message(message, type = speech_type) // Type 1 is visual message
-/mob/proc/hear_sleep(var/message)
+/mob/proc/hear_sleep(message)
var/heard = ""
if(prob(15))
var/list/punctuation = list(",", "!", ".", ";", "?")
@@ -309,7 +309,7 @@
/mob/proc/handle_track(message, verb = "says", mob/speaker = null, speaker_name, hard_to_hear)
return
-/mob/proc/hear_holopad_talk(list/message_pieces, var/verb = "says", var/mob/speaker = null)
+/mob/proc/hear_holopad_talk(list/message_pieces, verb = "says", mob/speaker = null)
var/list/combined = combine_message(message_pieces, verb, speaker)
var/message = combined["formatted"]
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index edd77f7bee..0ac8119314 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -299,7 +299,7 @@
hitsound = 'sound/effects/slime_squish.ogg'
slot_flags = SLOT_HOLSTER
-/obj/item/holder/fish/afterattack(var/atom/target, var/mob/living/user, proximity)
+/obj/item/holder/fish/afterattack(atom/target, mob/living/user, proximity)
if(!target)
return
if(!proximity)
@@ -326,7 +326,7 @@
//Mob procs and vars for scooping up
/mob/living/var/holder_type
-/mob/living/MouseDrop(var/atom/over_object)
+/mob/living/MouseDrop(atom/over_object)
var/mob/living/carbon/human/H = over_object
if(holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) //VOREStation Edit
if(!issmall(H) || !ishuman(src))
@@ -334,7 +334,7 @@
return
return ..()
-/mob/living/proc/get_scooped(var/mob/living/carbon/grabber, var/self_grab)
+/mob/living/proc/get_scooped(mob/living/carbon/grabber, self_grab)
if(!holder_type || buckled || pinned.len)
return
@@ -375,7 +375,7 @@
add_attack_logs(grabber, H.held_mob, "Scooped up", FALSE) // Not important enough to notify admins, but still helpful.
return H
-/obj/item/holder/proc/sync(var/mob/living/M)
+/obj/item/holder/proc/sync(mob/living/M)
dir = 2
overlays.Cut()
if(M.item_state)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 001826e1af..98fda17006 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return equip_to_slot_if_possible(W, slot, 1, 1, 0)
//Checks if a given slot can be accessed at this time, either to equip or unequip I
-/mob/proc/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null)
+/mob/proc/slot_is_accessible(slot, obj/item/I, mob/user=null)
return 1
//puts the item "W" into an appropriate slot in a human's inventory
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return list()
//Puts the item into your l_hand if possible and calls all necessary triggers/updates. returns 1 on success.
-/mob/proc/put_in_l_hand(var/obj/item/W)
+/mob/proc/put_in_l_hand(obj/item/W)
if(!istype(W))
return FALSE
if(QDELETED(W))
@@ -139,7 +139,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return TRUE
//Puts the item into your r_hand if possible and calls all necessary triggers/updates. returns 1 on success.
-/mob/proc/put_in_r_hand(var/obj/item/W)
+/mob/proc/put_in_r_hand(obj/item/W)
if(!istype(W))
return FALSE
if(QDELETED(W))
@@ -149,17 +149,17 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return TRUE
//Puts the item into our active hand if possible. returns 1 on success.
-/mob/proc/put_in_active_hand(var/obj/item/W)
+/mob/proc/put_in_active_hand(obj/item/W)
return 0 // Moved to human procs because only they need to use hands.
//Puts the item into our inactive hand if possible. returns 1 on success.
-/mob/proc/put_in_inactive_hand(var/obj/item/W)
+/mob/proc/put_in_inactive_hand(obj/item/W)
return 0 // As above.
//Puts the item our active hand if possible. Failing that it tries our inactive hand. Returns 1 on success.
//If both fail it drops it on the floor and returns 0.
//This is probably the main one you need to know :)
-/mob/proc/put_in_hands(var/obj/item/I)
+/mob/proc/put_in_hands(obj/item/I)
if(!I)
return 0
I.forceMove(drop_location())
@@ -170,7 +170,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
// Removes an item from inventory and places it in the target atom.
// If canremove or other conditions need to be checked then use unEquip instead.
-/mob/proc/drop_from_inventory(var/obj/item/W, var/atom/target)
+/mob/proc/drop_from_inventory(obj/item/W, atom/target)
if(!W)
return FALSE
if(isnull(target) && isdisposalpacket(src.loc))
@@ -186,15 +186,15 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return TRUE
//Drops the item in our left hand
-/mob/proc/drop_l_hand(var/atom/Target)
+/mob/proc/drop_l_hand(atom/Target)
return 0
//Drops the item in our right hand
-/mob/proc/drop_r_hand(var/atom/Target)
+/mob/proc/drop_r_hand(atom/Target)
return 0
//Drops the item in our active hand. TODO: rename this to drop_active_hand or something
-/mob/proc/drop_item(var/atom/Target)
+/mob/proc/drop_item(atom/Target)
return
/*
Removes the object from any slots the mob might have, calling the appropriate icon update proc.
@@ -230,7 +230,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
//This differs from remove_from_mob() in that it checks if the item can be unequipped first.
-/mob/proc/unEquip(obj/item/I, force = 0, var/atom/target) //Force overrides NODROP for things like wizarditis and admin undress.
+/mob/proc/unEquip(obj/item/I, force = 0, atom/target) //Force overrides NODROP for things like wizarditis and admin undress.
if(!(force || canUnEquip(I)))
return FALSE
drop_from_inventory(I, target)
@@ -249,7 +249,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return SLOT_BACK
//Attemps to remove an object on a mob.
-/mob/proc/remove_from_mob(var/obj/item_dropping, var/atom/target)
+/mob/proc/remove_from_mob(obj/item_dropping, atom/target)
if(!item_dropping) // Nothing to remove, so we succeed.
return 1
src.u_equip(item_dropping)
@@ -268,7 +268,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list(
return TRUE
//Returns the item equipped to the specified slot, if any.
-/mob/proc/get_equipped_item(var/slot)
+/mob/proc/get_equipped_item(slot)
return null
//Outdated but still in use apparently. This should at least be a human proc.
diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm
index f05da2c101..cd92a48e43 100644
--- a/code/modules/mob/language/generic.dm
+++ b/code/modules/mob/language/generic.dm
@@ -12,7 +12,7 @@
// if you make a loud noise (screams etc), you'll be heard from 4 tiles over instead of two
return (copytext(message, length(message)) == "!") ? 4 : 2
-/datum/language/noise/can_speak_special(var/mob/speaker)
+/datum/language/noise/can_speak_special(mob/speaker)
return TRUE //Audible emotes
// 'basic' language; spoken by default.
@@ -29,7 +29,7 @@
partial_understanding = list(LANGUAGE_SKRELLIAN = 30, LANGUAGE_SOL_COMMON = 30)
//TODO flag certain languages to use the mob-type specific say_quote and then get rid of these.
-/datum/language/common/get_spoken_verb(var/msg_end)
+/datum/language/common/get_spoken_verb(msg_end)
switch(msg_end)
if("!")
return pick("exclaims","shouts","yells") //TODO: make the basic proc handle lists of verbs.
@@ -133,17 +133,17 @@
key = "s"
flags = SIGNLANG|NO_STUTTER|NONVERBAL
-/datum/language/sign/can_speak_special(var/mob/speaker) // TODO: If ever we make external organs assist languages, convert this over to the new format
+/datum/language/sign/can_speak_special(mob/speaker) // TODO: If ever we make external organs assist languages, convert this over to the new format
var/obj/item/organ/external/hand/hands = locate() in speaker //you can't sign without hands
return (hands || !iscarbon(speaker))
-/datum/language/sign/scramble(var/input, var/list/known_languages)
+/datum/language/sign/scramble(input, list/known_languages)
return stars(input)
// This is a little weird because broadcast is traditionally for hivemind languages
// But in practice, it's just a way for a language to override all other languages and bypass hear_say
// which is exactly what sign language does.
-/datum/language/sign/broadcast(var/mob/living/speaker, var/message, var/speaker_mask)
+/datum/language/sign/broadcast(mob/living/speaker, message, speaker_mask)
speaker.log_talk("(SIGN) [message]", LOG_SAY)
var/verb_to_use = pick(signlang_verb)
speaker.say_signlang(message, verb_to_use, verb_to_use, src)
@@ -219,5 +219,5 @@
"his", "ing", "ion", "ith", "not", "ome", "oul", "our", "sho", "ted", "ter", "tha", "the", "thi"
)
-/datum/language/gibberish/can_speak_special(var/mob/speaker)
+/datum/language/gibberish/can_speak_special(mob/speaker)
return TRUE //Anyone can speak gibberish
diff --git a/code/modules/mob/language/horror.dm b/code/modules/mob/language/horror.dm
index d0ef69c60f..e170e64f53 100644
--- a/code/modules/mob/language/horror.dm
+++ b/code/modules/mob/language/horror.dm
@@ -15,7 +15,7 @@
"d'rekkathnor", "khari'd", "gual'te", "nikka", "nikt'o", "barada", "kla'atu", "barhah", "hra" ,"zar'garis", "spiri", "malum")
//Special, spooky effects when you speak.
-/datum/language/redspace/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+/datum/language/redspace/broadcast(mob/living/speaker,message,speaker_mask)
if(prob(10))
speaker.hallucination += 5
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index 0cbeb9e548..7c87e78fcf 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -23,7 +23,7 @@
var/list/partial_understanding // List of languages that can /somehwat/ understand it, format is: name = chance of understanding a word
var/ignore_adverb = FALSE // For inaudible languages that we dont want adverb for
-/datum/language/proc/get_random_name(var/gender, name_count=2, syllable_count=4, syllable_divisor=2)
+/datum/language/proc/get_random_name(gender, name_count=2, syllable_count=4, syllable_divisor=2)
if(!syllables || !syllables.len)
if(gender==FEMALE)
return capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
@@ -45,7 +45,7 @@
var/list/scramble_cache = list()
/* CHOMPEdit: moved to modular_chomp because it was edited so much.
-/datum/language/proc/scramble(var/input, var/list/known_languages)
+/datum/language/proc/scramble(input, list/known_languages)
var/understand_chance = 0
for(var/datum/language/L in known_languages)
if(partial_understanding && partial_understanding[L.name])
@@ -80,7 +80,7 @@
return scrambled_text
-/datum/language/proc/scramble_word(var/input)
+/datum/language/proc/scramble_word(input)
if(!syllables || !syllables.len)
return stars(input)
@@ -129,7 +129,7 @@
// if you yell, you'll be heard from two tiles over instead of one
return (copytext(message, length(message)) == "!") ? 2 : 1
-/datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+/datum/language/proc/broadcast(mob/living/speaker,message,speaker_mask)
speaker.log_talk("(HIVE) [message]", LOG_SAY)
add_verb(speaker, /mob/proc/adjust_hive_range)
@@ -154,24 +154,24 @@
player.hear_broadcast(src, speaker, speaker_mask, message)
//VOREStation Edit End
-/mob/proc/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
+/mob/proc/hear_broadcast(datum/language/language, mob/speaker, speaker_name, message)
if((language in languages) && language.check_special_condition(src))
var/msg = span_hivemind("[language.name], " + span_name("[speaker_name]") + " [message]")
to_chat(src,msg)
-/mob/new_player/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
+/mob/new_player/hear_broadcast(datum/language/language, mob/speaker, speaker_name, message)
return
-/mob/observer/dead/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
+/mob/observer/dead/hear_broadcast(datum/language/language, mob/speaker, speaker_name, message)
if(speaker.name == speaker_name || antagHUD)
to_chat(src, span_hivemind("[language.name], " + span_name("[speaker_name]") + " ([ghost_follow_link(speaker, src)]) [message]"))
else
to_chat(src, span_hivemind("[language.name], " + span_name("[speaker_name]") + " [message]"))
-/datum/language/proc/check_special_condition(var/mob/other)
+/datum/language/proc/check_special_condition(mob/other)
return 1
-/datum/language/proc/get_spoken_verb(var/msg_end)
+/datum/language/proc/get_spoken_verb(msg_end)
switch(msg_end)
if("!")
return exclaim_verb
@@ -179,7 +179,7 @@
return ask_verb
return speech_verb
-/datum/language/proc/can_speak_special(var/mob/speaker)
+/datum/language/proc/can_speak_special(mob/speaker)
. = TRUE
if(name != "Noise") // Audible Emotes
if(ishuman(speaker))
@@ -197,7 +197,7 @@
. = TRUE
// Language handling.
-/mob/proc/add_language(var/language)
+/mob/proc/add_language(language)
var/datum/language/new_language = GLOB.all_languages[language]
@@ -210,7 +210,7 @@
return 1
-/mob/proc/remove_language(var/rem_language)
+/mob/proc/remove_language(rem_language)
var/datum/language/L = GLOB.all_languages[rem_language]
. = (L in languages)
var/prefix = get_custom_prefix_by_lang(src, L)
@@ -252,7 +252,7 @@
return CONFIG_GET(str_list/language_prefixes)[1]
-/mob/proc/is_language_prefix(var/prefix)
+/mob/proc/is_language_prefix(prefix)
if(client && client.prefs.language_prefixes && client.prefs.language_prefixes.len)
return prefix in client.prefs.language_prefixes
@@ -324,7 +324,7 @@
else
return ..()
-/proc/transfer_languages(var/mob/source, var/mob/target, var/except_flags)
+/proc/transfer_languages(mob/source, mob/target, except_flags)
for(var/datum/language/L in source.languages)
if(L.flags & except_flags)
continue
@@ -334,7 +334,7 @@
if(!(key in target.language_keys))
target.language_keys[key] = L
-/proc/get_custom_prefix_by_lang(var/mob/our_mob, var/language)
+/proc/get_custom_prefix_by_lang(mob/our_mob, language)
if(!our_mob || !our_mob.language_keys.len || !language)
return
diff --git a/code/modules/mob/language/outsider.dm b/code/modules/mob/language/outsider.dm
index 1e1796753f..f11205dc2e 100644
--- a/code/modules/mob/language/outsider.dm
+++ b/code/modules/mob/language/outsider.dm
@@ -7,7 +7,7 @@
machine_understands = 0
flags = RESTRICTED | HIVEMIND
-/datum/language/ling/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+/datum/language/ling/broadcast(mob/living/speaker,message,speaker_mask)
var/datum/component/antag/changeling/comp = speaker.GetComponent(/datum/component/antag/changeling)
if(speaker.mind && comp)
..(speaker,message,comp.changelingID)
@@ -25,7 +25,7 @@
machine_understands = 0
flags = RESTRICTED | HIVEMIND
-/datum/language/corticalborer/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+/datum/language/corticalborer/broadcast(mob/living/speaker,message,speaker_mask)
var/mob/living/simple_mob/animal/borer/B
@@ -96,7 +96,7 @@
key = "a"
flags = /*RESTRICTED |*/ HIVEMIND // CHOMPedit: Restricted makes it inaccessible.
-/datum/language/xenos/check_special_condition(var/mob/other)
+/datum/language/xenos/check_special_condition(mob/other)
var/mob/living/carbon/M = other
if(!istype(M))
@@ -133,7 +133,7 @@
"danya","da","mied","zan","das","krem","myka","cyka","blyat","to","st","no","na","ni",
"ko","ne","en","po","ra","li","on","byl","cto","eni","ost","ol","ego","ver","stv","pro")
-/datum/language/corticalborer/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+/datum/language/corticalborer/broadcast(mob/living/speaker,message,speaker_mask)
var/mob/living/simple_mob/animal/borer/B
diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm
index 1793f5acdf..6a0945ed84 100644
--- a/code/modules/mob/language/station.dm
+++ b/code/modules/mob/language/station.dm
@@ -64,7 +64,7 @@
"ka","aasi","far","wa","baq","ara","qara","zir","saam","mak","hrar","nja","rir","khan","jun","dar","rik","kah",
"hal","ket","jurl","mah","tul","cresh","azu","ragh","mro","mra","mrro","mrra")
-/datum/language/tajaran/get_random_name(var/gender)
+/datum/language/tajaran/get_random_name(gender)
var/new_name = ..(gender,1)
if(prob(50))
new_name += " [pick(list("Hadii","Kaytam","Nazkiin","Zhan-Khazan","Hharar","Njarir'Akhan","Faaira'Nrezi","Rhezar","Mi'dynh","Rrhazkal","Bayan","Al'Manq","Mi'jri","Chur'eech","Sanu'dra","Ii'rka"))]"
@@ -95,12 +95,12 @@
key = "l"
flags = WHITELISTED | SIGNLANG | NO_STUTTER //nonverbal define was not needed here, and i need to use it ~Layne
-/datum/language/tajsign/broadcast(var/mob/living/speaker, var/message, var/speaker_mask)
+/datum/language/tajsign/broadcast(mob/living/speaker, message, speaker_mask)
speaker.log_talk("(SIGN) [message]", LOG_SAY)
var/verb_to_use = pick(signlang_verb)
speaker.say_signlang(message, verb_to_use, verb_to_use, src)
-/datum/language/tajsign/can_speak_special(var/mob/speaker) // TODO: If ever we make external organs assist languages, convert this over to the new format
+/datum/language/tajsign/can_speak_special(mob/speaker) // TODO: If ever we make external organs assist languages, convert this over to the new format
var/list/allowed_species = list(SPECIES_TAJARAN, SPECIES_TESHARI) // Need a tail and ears and such to use this.
if(iscarbon(speaker))
var/obj/item/organ/external/hand/hands = locate() in speaker //you can't sign without hands
@@ -126,7 +126,7 @@
// flags = WHITELISTED (YWEdit)
syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix")
-/datum/language/skrell/get_random_name(var/gender)
+/datum/language/skrell/get_random_name(gender)
var/list/first_names = world.file2list('strings/names/first_name_skrell.txt')
var/list/last_names = world.file2list('strings/names/last_name_skrell.txt')
return "[pick(first_names)] [pick(last_names)]"
@@ -141,7 +141,7 @@
// flags = WHITELISTED (YWEdit)
//syllables are at the bottom of the file
-/datum/language/human/get_spoken_verb(var/msg_end)
+/datum/language/human/get_spoken_verb(msg_end)
switch(msg_end)
if("!")
return pick("exclaims","shouts","yells") //TODO: make the basic proc handle lists of verbs.
@@ -149,7 +149,7 @@
return ask_verb
return speech_verb
-/datum/language/human/get_random_name(var/gender)
+/datum/language/human/get_random_name(gender)
if (prob(80))
if(gender==FEMALE)
return capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm
index bd0b83bfdc..d23ee9ed8b 100644
--- a/code/modules/mob/language/station_vr.dm
+++ b/code/modules/mob/language/station_vr.dm
@@ -178,7 +178,7 @@
flags = INAUDIBLE
ignore_adverb = TRUE
-/datum/language/echosong/scramble(var/input, var/list/known_languages)
+/datum/language/echosong/scramble(input, list/known_languages)
return stars(input)
/datum/language/lleill
@@ -196,7 +196,7 @@
machine_understands = FALSE
flags = WHITELISTED
-/datum/language/echosong/broadcast(var/mob/living/speaker, var/message, var/speaker_mask)
+/datum/language/echosong/broadcast(mob/living/speaker, message, speaker_mask)
speaker.log_talk("(INAUDIBLE) [message]", LOG_SAY)
speaker.say_signlang(format_message(message), pick(signlang_verb), pick(signlang_verb_understood), src, 2)
diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm
index 9dfde1098d..88cf73f160 100644
--- a/code/modules/mob/language/synthetic.dm
+++ b/code/modules/mob/language/synthetic.dm
@@ -10,7 +10,7 @@
flags = RESTRICTED | HIVEMIND
var/drone_only
-/datum/language/binary/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+/datum/language/binary/broadcast(mob/living/speaker,message,speaker_mask)
if(!speaker.binarycheck())
return
diff --git a/code/modules/mob/living/bot/SLed209bot.dm b/code/modules/mob/living/bot/SLed209bot.dm
index d181a4ea15..7d3488f80c 100644
--- a/code/modules/mob/living/bot/SLed209bot.dm
+++ b/code/modules/mob/living/bot/SLed209bot.dm
@@ -30,7 +30,7 @@
else
icon_state = "sled209[on]"
-/mob/living/bot/secbot/ed209/slime/RangedAttack(var/atom/A)
+/mob/living/bot/secbot/ed209/slime/RangedAttack(atom/A)
if(last_shot + shot_delay > world.time)
to_chat(src, "You are not ready to fire yet!")
return
@@ -48,7 +48,7 @@
P.old_style_target(A)
P.fire()
-/mob/living/bot/secbot/ed209/slime/UnarmedAttack(var/mob/living/L, var/proximity)
+/mob/living/bot/secbot/ed209/slime/UnarmedAttack(mob/living/L, proximity)
..()
if(istype(L, /mob/living/simple_mob/slime/xenobio))
@@ -65,7 +65,7 @@
item_state = "buildpipe"
created_name = "SL-ED-209 Security Robot"
-/obj/item/secbot_assembly/ed209_assembly/slime/attackby(var/obj/item/W, var/mob/user) // Here in the event it's added into a PoI or some such. Standard construction relies on the standard ED up until taser.
+/obj/item/secbot_assembly/ed209_assembly/slime/attackby(obj/item/W, mob/user) // Here in the event it's added into a PoI or some such. Standard construction relies on the standard ED up until taser.
if(istype(W, /obj/item/pen))
var/t = sanitizeSafe(tgui_input_text(user, "Enter new robot name", name, created_name, MAX_NAME_LEN, encode = FALSE), MAX_NAME_LEN)
if(!t)
diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index be66346f47..c39a6c4928 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -119,7 +119,7 @@
/mob/living/bot/death()
explode()
-/mob/living/bot/attackby(var/obj/item/O, var/mob/user)
+/mob/living/bot/attackby(obj/item/O, mob/user)
if(O.GetID())
if(access_scanner.allowed(user) && !open)
locked = !locked
@@ -181,16 +181,16 @@
else
..()
-/mob/living/bot/attack_ai(var/mob/user)
+/mob/living/bot/attack_ai(mob/user)
return attack_hand(user)
-/mob/living/bot/say_quote(var/message, var/datum/language/speaking = null)
+/mob/living/bot/say_quote(message, datum/language/speaking = null)
return "beeps"
/mob/living/bot/speech_bubble_appearance()
return "machine"
-/mob/living/bot/Bump(var/atom/A)
+/mob/living/bot/Bump(atom/A)
if(on && botcard && istype(A, /obj/machinery/door))
var/obj/machinery/door/D = A
if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && !istype(D, /obj/machinery/door/airlock/lift) && D.check_access(botcard))
@@ -198,7 +198,7 @@
else
..()
-/mob/living/bot/emag_act(var/remaining_charges, var/mob/user)
+/mob/living/bot/emag_act(remaining_charges, mob/user)
return 0
/mob/living/bot/proc/handleAI()
@@ -322,7 +322,7 @@
/mob/living/bot/proc/lookForTargets()
return
-/mob/living/bot/proc/confirmTarget(var/atom/A)
+/mob/living/bot/proc/confirmTarget(atom/A)
if(A.invisibility >= INVISIBILITY_LEVEL_ONE)
return 0
if(A in ignore_list)
@@ -385,7 +385,7 @@
ignore_past.Remove(target) //CHOMPEdit
return
-/mob/living/bot/proc/makeStep(var/list/path)
+/mob/living/bot/proc/makeStep(list/path)
if(!path.len)
return 0
var/turf/T = path[1]
@@ -438,7 +438,7 @@
// Returns the surrounding GLOB.cardinal turfs with open links
// Including through doors openable with the ID
-/turf/proc/CardinalTurfsWithAccess(var/obj/item/card/id/ID)
+/turf/proc/CardinalTurfsWithAccess(obj/item/card/id/ID)
var/L[] = new()
// for(var/turf/simulated/t in oview(src,1))
@@ -465,7 +465,7 @@
return L
// Similar to above but not restricted to just GLOB.cardinal directions.
-/turf/proc/TurfsWithAccess(var/obj/item/card/id/ID)
+/turf/proc/TurfsWithAccess(obj/item/card/id/ID)
var/L[] = new()
for(var/d in GLOB.alldirs)
@@ -507,7 +507,7 @@
// Returns true if direction is blocked from loc
// Checks doors against access with given ID
-/proc/DirBlockedWithAccess(turf/loc,var/dir,var/obj/item/card/id/ID)
+/proc/DirBlockedWithAccess(turf/loc,dir,obj/item/card/id/ID)
for(var/obj/structure/window/D in loc)
if(!D.density) continue
if(D.dir == SOUTHWEST) return 1
@@ -584,7 +584,7 @@
if(user)
to_chat(user, span_notice("You eject the card from \the [initial(src.name)]."))
-/mob/living/bot/verb/bot_nom(var/mob/living/T in oview(1))
+/mob/living/bot/verb/bot_nom(mob/living/T in oview(1))
set name = "Bot Nom"
set category = "Bot Commands"
set desc = "Allows you to eat someone. Yum."
diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm
index 087227838b..dd2a7a95e0 100644
--- a/code/modules/mob/living/bot/cleanbot.dm
+++ b/code/modules/mob/living/bot/cleanbot.dm
@@ -44,7 +44,7 @@
ignore_list += gib
addtimer(CALLBACK(src,PROC_REF(clear_ignored_gib), gib), 1 MINUTE, TIMER_DELETE_ME)
-/mob/living/bot/cleanbot/proc/clear_ignored_gib(var/obj/gibref)
+/mob/living/bot/cleanbot/proc/clear_ignored_gib(obj/gibref)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
ignore_list -= gibref
@@ -89,7 +89,7 @@
GLOB.cleanbot_reserved_turfs -= target
..()
-/mob/living/bot/cleanbot/confirmTarget(var/obj/effect/decal/cleanable/D)
+/mob/living/bot/cleanbot/confirmTarget(obj/effect/decal/cleanable/D)
if(!..())
return FALSE
if(D.loc in GLOB.cleanbot_reserved_turfs)
@@ -104,8 +104,8 @@
if(get_turf(target) == src.loc)
UnarmedAttack(target)
-//mob/living/bot/cleanbot/UnarmedAttack(var/obj/effect/decal/cleanable/D, var/proximity)
-/mob/living/bot/cleanbot/UnarmedAttack(atom/D, var/proximity)
+//mob/living/bot/cleanbot/UnarmedAttack(obj/effect/decal/cleanable/D, proximity)
+/mob/living/bot/cleanbot/UnarmedAttack(atom/D, proximity)
if(!..())
return
@@ -177,7 +177,7 @@
else
icon_state = "cleanbot[on]"
-/mob/living/bot/cleanbot/attack_hand(var/mob/user)
+/mob/living/bot/cleanbot/attack_hand(mob/user)
tgui_interact(user)
/mob/living/bot/cleanbot/tgui_interact(mob/user, datum/tgui/ui)
@@ -231,7 +231,7 @@
to_chat(ui.user, span_notice("You press the weird button."))
. = TRUE
-/mob/living/bot/cleanbot/emag_act(var/remaining_uses, var/mob/user)
+/mob/living/bot/cleanbot/emag_act(remaining_uses, mob/user)
. = ..()
if(!wet_floors || !spray_blood)
if(user)
@@ -258,7 +258,7 @@
w_class = ITEMSIZE_NORMAL
var/created_name = "Cleanbot"
-/obj/item/bucket_sensor/attackby(var/obj/item/W, var/mob/user)
+/obj/item/bucket_sensor/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm) || (istype(W, /obj/item/organ/external/arm) && ((W.name == "robotic left arm") || (W.name == "robotic right arm"))))
user.drop_item()
diff --git a/code/modules/mob/living/bot/ed209bot.dm b/code/modules/mob/living/bot/ed209bot.dm
index 95a31893ff..7e7691547a 100644
--- a/code/modules/mob/living/bot/ed209bot.dm
+++ b/code/modules/mob/living/bot/ed209bot.dm
@@ -54,7 +54,7 @@
/mob/living/bot/secbot/ed209/handleRangedTarget()
RangedAttack(target)
-/mob/living/bot/secbot/ed209/RangedAttack(var/atom/A)
+/mob/living/bot/secbot/ed209/RangedAttack(atom/A)
if(last_shot + shot_delay > world.time)
to_chat(src, "You are not ready to fire yet!")
return
@@ -83,7 +83,7 @@
created_name = "ED-209 Security Robot"
var/lasercolor = ""
-/obj/item/secbot_assembly/ed209_assembly/attackby(var/obj/item/W, var/mob/user)
+/obj/item/secbot_assembly/ed209_assembly/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/pen))
diff --git a/code/modules/mob/living/bot/edCLNbot.dm b/code/modules/mob/living/bot/edCLNbot.dm
index 04521dd836..c6cd964faf 100644
--- a/code/modules/mob/living/bot/edCLNbot.dm
+++ b/code/modules/mob/living/bot/edCLNbot.dm
@@ -98,7 +98,7 @@
to_chat(ui.user, span_notice("You flip the blue switch [blue_switch ? "on" : "off"]."))
. = TRUE
-/mob/living/bot/cleanbot/edCLN/emag_act(var/remaining_uses, var/mob/user)
+/mob/living/bot/cleanbot/edCLN/emag_act(remaining_uses, mob/user)
. = ..()
if(!emagged)
if(user)
@@ -117,7 +117,7 @@
item_state = "buildpipe"
created_name = "ED-CLN Security Robot"
-/obj/item/secbot_assembly/edCLN_assembly/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/secbot_assembly/edCLN_assembly/attackby(obj/item/W as obj, mob/user as mob)
..()
if(istype(W, /obj/item/pen))
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index 0b427ba0ed..67aced2e25 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -23,7 +23,7 @@
var/obj/structure/reagent_dispensers/watertank/tank
-/mob/living/bot/farmbot/Initialize(mapload, var/newTank)
+/mob/living/bot/farmbot/Initialize(mapload, newTank)
. = ..()
if(!newTank)
newTank = new /obj/structure/reagent_dispensers/watertank(src)
@@ -70,7 +70,7 @@
return
tgui_interact(user)
-/mob/living/bot/farmbot/emag_act(var/remaining_charges, var/mob/user)
+/mob/living/bot/farmbot/emag_act(remaining_charges, mob/user)
. = ..()
if(!emagged)
if(user)
@@ -171,7 +171,7 @@
makeStep(target_path)
return
-/mob/living/bot/farmbot/UnarmedAttack(var/atom/A, var/proximity)
+/mob/living/bot/farmbot/UnarmedAttack(atom/A, proximity)
if(!..())
return
@@ -289,7 +289,7 @@
return ..()
-/mob/living/bot/farmbot/confirmTarget(var/atom/targ)
+/mob/living/bot/farmbot/confirmTarget(atom/targ)
if(!..())
return 0
@@ -337,7 +337,7 @@
w_class = ITEMSIZE_NORMAL
-/obj/item/farmbot_arm_assembly/Initialize(mapload, var/theTank)
+/obj/item/farmbot_arm_assembly/Initialize(mapload, theTank)
. = ..()
if(!theTank) // If an admin spawned it, it won't have a watertank it, so lets make one for em!
tank = new /obj/structure/reagent_dispensers/watertank(src)
@@ -345,7 +345,7 @@
tank = theTank
tank.forceMove(src)
-/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/robot_parts/S, mob/user as mob)
+/obj/structure/reagent_dispensers/watertank/attackby(obj/item/robot_parts/S, mob/user as mob)
if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
..()
return
@@ -358,7 +358,7 @@
new /obj/item/farmbot_arm_assembly(loc, src)
-/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/organ/external/S, mob/user as mob)
+/obj/structure/reagent_dispensers/watertank/attackby(obj/item/organ/external/S, mob/user as mob)
if ((!istype(S, /obj/item/organ/external/arm)) || S.robotic != ORGAN_ROBOT)
..()
return
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index 702d9e5572..befe69a517 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -60,10 +60,10 @@
data["bmode"] = dir2text(targetdirection)
return data
-/mob/living/bot/floorbot/attack_hand(var/mob/user)
+/mob/living/bot/floorbot/attack_hand(mob/user)
tgui_interact(user)
-/mob/living/bot/floorbot/emag_act(var/remaining_charges, var/mob/user)
+/mob/living/bot/floorbot/emag_act(remaining_charges, mob/user)
. = ..()
if(!emagged)
emagged = 1
@@ -160,7 +160,7 @@
target = S
return
-/mob/living/bot/floorbot/confirmTarget(var/atom/A) // The fact that we do some checks twice may seem confusing but remember that the bot's settings may be toggled while it's moving and we want them to stop in that case
+/mob/living/bot/floorbot/confirmTarget(atom/A) // The fact that we do some checks twice may seem confusing but remember that the bot's settings may be toggled while it's moving and we want them to stop in that case
if(!..())
return 0
@@ -193,7 +193,7 @@
var/turf/simulated/floor/T = A
return (istype(T) && (T.broken || T.burnt || (improvefloors && !T.flooring)) && (get_turf(T) == loc || prob(40)))
-/mob/living/bot/floorbot/UnarmedAttack(var/atom/A, var/proximity)
+/mob/living/bot/floorbot/UnarmedAttack(atom/A, proximity)
if(!..())
return
@@ -305,7 +305,7 @@
//qdel(src)
return ..()
-/mob/living/bot/floorbot/proc/addTiles(var/am)
+/mob/living/bot/floorbot/proc/addTiles(am)
amount += am
if(amount < 0)
amount = 0
@@ -340,7 +340,7 @@
/* Assembly */
-/obj/item/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/floor/T, mob/living/user as mob)
+/obj/item/storage/toolbox/mechanical/attackby(obj/item/stack/tile/floor/T, mob/living/user as mob)
if(!istype(T, /obj/item/stack/tile/floor))
..()
return
@@ -371,7 +371,7 @@
w_class = ITEMSIZE_NORMAL
var/created_name = "Floorbot"
-/obj/item/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
+/obj/item/toolbox_tiles/attackby(obj/item/W, mob/user as mob)
..()
if(isprox(W))
qdel(W)
@@ -401,7 +401,7 @@
w_class = ITEMSIZE_NORMAL
var/created_name = "Floorbot"
-/obj/item/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
+/obj/item/toolbox_tiles_sensor/attackby(obj/item/W, mob/user as mob)
..()
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm) || (istype(W, /obj/item/organ/external/arm) && ((W.name == "robotic right arm") || (W.name == "robotic left arm"))))
qdel(W)
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 82ee953a05..06b0b60a90 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -127,7 +127,7 @@
last_newpatient_speak = world.time
break
-/mob/living/bot/medbot/UnarmedAttack(var/mob/living/carbon/human/H)
+/mob/living/bot/medbot/UnarmedAttack(mob/living/carbon/human/H)
if(!..())
return
@@ -249,7 +249,7 @@
ui = new(user, src, "Medbot", name)
ui.open()
-/mob/living/bot/medbot/attackby(var/obj/item/O, var/mob/user)
+/mob/living/bot/medbot/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/reagent_containers/glass))
if(locked)
to_chat(user, span_notice("You cannot insert a beaker because the panel is locked."))
@@ -312,7 +312,7 @@
declare_treatment = !declare_treatment
. = TRUE
-/mob/living/bot/medbot/emag_act(var/remaining_uses, var/mob/user)
+/mob/living/bot/medbot/emag_act(remaining_uses, mob/user)
. = ..()
if(!emagged)
if(user)
@@ -434,7 +434,7 @@
if(MEDBOT_PANIC_FUCK to INFINITY)
. += span_boldwarning("They are freaking out from being tipped over!")
-/mob/living/bot/medbot/confirmTarget(var/mob/living/carbon/human/H)
+/mob/living/bot/medbot/confirmTarget(mob/living/carbon/human/H)
if(!..())
return 0
@@ -471,7 +471,7 @@
/* Construction */
-/obj/item/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob)
+/obj/item/storage/firstaid/attackby(obj/item/robot_parts/S, mob/user as mob)
if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm)))
..()
return
@@ -494,7 +494,7 @@
user.drop_from_inventory(src)
qdel(src)
-/obj/item/storage/firstaid/attackby(var/obj/item/organ/external/S, mob/user as mob)
+/obj/item/storage/firstaid/attackby(obj/item/organ/external/S, mob/user as mob)
if (!istype(S, /obj/item/organ/external/arm) || S.robotic != ORGAN_ROBOT)
..()
return
diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm
index 7c8bfde4e9..58a5159bf7 100644
--- a/code/modules/mob/living/bot/mulebot.dm
+++ b/code/modules/mob/living/bot/mulebot.dm
@@ -51,7 +51,7 @@
name = "Mulebot #[suffix]"
-/mob/living/bot/mulebot/MouseDrop_T(var/atom/movable/C, var/mob/user)
+/mob/living/bot/mulebot/MouseDrop_T(atom/movable/C, mob/user)
if(user.stat)
return
@@ -60,7 +60,7 @@
load(C)
-/mob/living/bot/mulebot/attack_hand(var/mob/user)
+/mob/living/bot/mulebot/attack_hand(mob/user)
tgui_interact(user)
/mob/living/bot/mulebot/tgui_interact(mob/user, datum/tgui/ui)
@@ -140,11 +140,11 @@
safety = !safety
. = TRUE
-/mob/living/bot/mulebot/attackby(var/obj/item/O, var/mob/user)
+/mob/living/bot/mulebot/attackby(obj/item/O, mob/user)
..()
update_icons()
-/mob/living/bot/mulebot/proc/obeyCommand(mob/user, var/command)
+/mob/living/bot/mulebot/proc/obeyCommand(mob/user, command)
switch(command)
if("Home")
resetTarget()
@@ -166,7 +166,7 @@
if("Stop")
paused = 1
-/mob/living/bot/mulebot/emag_act(var/remaining_charges, var/user)
+/mob/living/bot/mulebot/emag_act(remaining_charges, user)
locked = !locked
to_chat(user, span_notice("You [locked ? "lock" : "unlock"] the mulebot's controls!"))
flick("mulebot-emagged", src)
@@ -217,18 +217,18 @@
return
..()
-/mob/living/bot/mulebot/UnarmedAttack(var/turf/T)
+/mob/living/bot/mulebot/UnarmedAttack(turf/T)
if(T == src.loc)
unload(dir)
-/mob/living/bot/mulebot/Bump(var/mob/living/M)
+/mob/living/bot/mulebot/Bump(mob/living/M)
if(!safety && istype(M))
visible_message(span_warning("[src] knocks over [M]!"))
M.Stun(8)
M.Weaken(5)
..()
-/mob/living/bot/mulebot/proc/runOver(var/mob/living/M)
+/mob/living/bot/mulebot/proc/runOver(mob/living/M)
if(istype(M)) // At this point, MULEBot has somehow crossed over onto your tile with you still on it. CRRRNCH.
visible_message(span_warning("[src] drives over [M]!"))
playsound(src, 'sound/effects/splat.ogg', 50, 1)
@@ -243,7 +243,7 @@
blood_splatter(src, M, 1)
-/mob/living/bot/mulebot/relaymove(var/mob/user, var/direction)
+/mob/living/bot/mulebot/relaymove(mob/user, direction)
if(load == user)
unload(direction)
@@ -274,7 +274,7 @@
beaconlist[N.location] = N
return beaconlist
-/mob/living/bot/mulebot/proc/load(var/atom/movable/C)
+/mob/living/bot/mulebot/proc/load(atom/movable/C)
if(busy || load || get_dist(C, src) > 1 || !isturf(C.loc))
return
@@ -307,7 +307,7 @@
busy = 0
-/mob/living/bot/mulebot/proc/unload(var/dirn = 0)
+/mob/living/bot/mulebot/proc/unload(dirn = 0)
if(!load || busy)
return
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index 37279e7de5..fa7d0cbdad 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -123,7 +123,7 @@
return data
-/mob/living/bot/secbot/attack_hand(var/mob/user)
+/mob/living/bot/secbot/attack_hand(mob/user)
tgui_interact(user)
/mob/living/bot/secbot/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
@@ -165,7 +165,7 @@
declare_arrests = !declare_arrests
. = TRUE
-/mob/living/bot/secbot/emag_act(var/remaining_uses, var/mob/user)
+/mob/living/bot/secbot/emag_act(remaining_uses, mob/user)
. = ..()
if(!emagged)
if(user)
@@ -177,13 +177,13 @@
else
to_chat(user, span_notice("\The [src] is already corrupt."))
-/mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user)
+/mob/living/bot/secbot/attackby(obj/item/O, mob/user)
var/curhealth = health
. = ..()
if(health < curhealth && on == TRUE)
react_to_attack(user)
-/mob/living/bot/secbot/bullet_act(var/obj/item/projectile/P)
+/mob/living/bot/secbot/bullet_act(obj/item/projectile/P)
var/curhealth = health
var/mob/shooter = P.firer
. = ..()
@@ -191,7 +191,7 @@
if(!target && health < curhealth && shooter && (shooter in view(world.view, src)))
react_to_attack(shooter)
-/mob/living/bot/secbot/attack_generic(var/mob/attacker)
+/mob/living/bot/secbot/attack_generic(mob/attacker)
if(attacker)
react_to_attack(attacker)
..()
@@ -207,7 +207,7 @@
attacked = TRUE
// Say "freeze!" and demand surrender
-/mob/living/bot/secbot/proc/demand_surrender(mob/target, var/threat)
+/mob/living/bot/secbot/proc/demand_surrender(mob/target, threat)
var/suspect_name = target_name(target)
if(declare_arrests)
GLOB.global_announcer.autosay("[src] is [arrest_type ? "detaining" : "arresting"] a level [threat] suspect [suspect_name] in [get_area(src)].", "[src]", "Security")
@@ -237,7 +237,7 @@
return
..()
-/mob/living/bot/secbot/confirmTarget(var/atom/A)
+/mob/living/bot/secbot/confirmTarget(atom/A)
if(!..())
return FALSE
check_threat(A)
@@ -298,7 +298,7 @@
return .
// So Beepsky talks while beating up simple mobs.
-/mob/living/bot/secbot/proc/insult(var/mob/living/L)
+/mob/living/bot/secbot/proc/insult(mob/living/L)
if(can_next_insult > world.time)
return
if(threat >= 10)
@@ -309,7 +309,7 @@
can_next_insult = world.time + 5 SECONDS
-/mob/living/bot/secbot/UnarmedAttack(var/mob/M, var/proximity)
+/mob/living/bot/secbot/UnarmedAttack(mob/M, proximity)
if(!..())
return
@@ -358,7 +358,7 @@
visible_message(span_warning("\The [M] was beaten by \the [src] with a stun baton!"))
insult(L)
-/mob/living/bot/secbot/slime/UnarmedAttack(var/mob/living/L, var/proximity)
+/mob/living/bot/secbot/slime/UnarmedAttack(mob/living/L, proximity)
..()
if(istype(L, /mob/living/simple_mob/slime/xenobio))
@@ -392,7 +392,7 @@
return H.get_id_name("unidentified person")
return "unidentified lifeform"
-/mob/living/bot/secbot/proc/check_threat(var/mob/living/M)
+/mob/living/bot/secbot/proc/check_threat(mob/living/M)
if(!M || !istype(M) || M.stat == DEAD || src == M)
threat = 0
@@ -406,7 +406,7 @@
//Secbot Construction
-/obj/item/clothing/head/helmet/attackby(var/obj/item/assembly/signaler/S, mob/user as mob)
+/obj/item/clothing/head/helmet/attackby(obj/item/assembly/signaler/S, mob/user as mob)
..()
if(!issignaler(S))
..()
@@ -438,7 +438,7 @@
var/build_step = 0
var/created_name = "Securitron"
-/obj/item/secbot_assembly/attackby(var/obj/item/W, var/mob/user)
+/obj/item/secbot_assembly/attackby(obj/item/W, mob/user)
..()
if(W.has_tool_quality(TOOL_WELDER) && !build_step)
var/obj/item/weldingtool/WT = W.get_welder()
diff --git a/code/modules/mob/living/butchering.dm b/code/modules/mob/living/butchering.dm
index 11524a04ce..2ff3c9ab69 100644
--- a/code/modules/mob/living/butchering.dm
+++ b/code/modules/mob/living/butchering.dm
@@ -13,7 +13,7 @@
var/being_butchered = FALSE // No multiproccing
// Harvest an animal's delicious byproducts
-/mob/living/proc/harvest(var/mob/user, var/obj/item/I)
+/mob/living/proc/harvest(mob/user, obj/item/I)
if(meat_type && meat_amount>0 && (stat == DEAD) && !being_butchered)
being_butchered = TRUE
while(meat_amount > 0 && do_after(user, 0.5 SECONDS * (mob_size / 10), target = src))
@@ -29,13 +29,13 @@
handle_butcher(user, I)
being_butchered = FALSE
-/mob/living/proc/can_butcher(var/mob/user, var/obj/item/I) // Override for special butchering checks.
+/mob/living/proc/can_butcher(mob/user, obj/item/I) // Override for special butchering checks.
if(((meat_type && meat_amount) || LAZYLEN(butchery_loot)) && stat == DEAD)
return TRUE
return FALSE
-/mob/living/proc/handle_butcher(var/mob/user, var/obj/item/I)
+/mob/living/proc/handle_butcher(mob/user, obj/item/I)
if(!user || do_after(user, 2 SECONDS * mob_size / 10, target = src))
if(LAZYLEN(butchery_loot))
if(LAZYLEN(butchery_loot))
diff --git a/code/modules/mob/living/carbon/addictions.dm b/code/modules/mob/living/carbon/addictions.dm
index 497963cc96..561fd8a837 100644
--- a/code/modules/mob/living/carbon/addictions.dm
+++ b/code/modules/mob/living/carbon/addictions.dm
@@ -119,7 +119,7 @@
LAZYREMOVE(addictions,C)
LAZYREMOVE(addiction_counters,C)
-/mob/living/carbon/proc/addict_to_reagent(var/reagentid, var/round_start)
+/mob/living/carbon/proc/addict_to_reagent(reagentid, round_start)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(isSynthetic()) // Should this be allowed? I guess you can roleplay Bender as an FBP? Trait in the future?
@@ -132,7 +132,7 @@
LAZYADD(addictions,reagentid)
LAZYSET(addiction_counters,reagentid,ADDICTION_PEAK)
-/mob/living/carbon/proc/get_addiction_to_reagent(var/reagentid) // returns counter's value or 0
+/mob/living/carbon/proc/get_addiction_to_reagent(reagentid) // returns counter's value or 0
SHOULD_NOT_OVERRIDE(TRUE)
return LAZYACCESS(addiction_counters,reagentid)
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index dcdd74e8f7..669b60c9c9 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -54,7 +54,7 @@
return default_language
return GLOB.all_languages[LANGUAGE_XENOLINGUA]
-/mob/living/carbon/alien/say_quote(var/message, var/datum/language/speaking = null)
+/mob/living/carbon/alien/say_quote(message, datum/language/speaking = null)
var/verb = "hisses"
var/ending = copytext(message, length(message))
diff --git a/code/modules/mob/living/carbon/alien/diona/diona.dm b/code/modules/mob/living/carbon/alien/diona/diona.dm
index 21c39b4aff..13fecc81f6 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona.dm
@@ -56,18 +56,18 @@ GLOBAL_LIST_INIT(nymph_default_emotes, list(
add_language(LANGUAGE_GALCOM)
add_verb(src, /mob/living/carbon/alien/diona/proc/merge)
-/mob/living/carbon/alien/diona/put_in_hands(var/obj/item/W) // No hands.
+/mob/living/carbon/alien/diona/put_in_hands(obj/item/W) // No hands.
W.loc = get_turf(src)
return 1
-/mob/living/carbon/alien/diona/proc/wear_hat(var/obj/item/new_hat)
+/mob/living/carbon/alien/diona/proc/wear_hat(obj/item/new_hat)
if(hat)
return
hat = new_hat
new_hat.loc = src
update_icons()
-/mob/living/carbon/alien/diona/proc/handle_npc(var/mob/living/carbon/alien/diona/D)
+/mob/living/carbon/alien/diona/proc/handle_npc(mob/living/carbon/alien/diona/D)
if(D.stat != CONSCIOUS)
return
if(prob(33) && D.canmove && isturf(D.loc) && !D.pulledby) //won't move if being pulled
diff --git a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
index 6ec69a9478..9b15e5ea5b 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/diona/MouseDrop(var/atom/over_object)
+/mob/living/carbon/alien/diona/MouseDrop(atom/over_object)
var/mob/living/carbon/human/H = over_object
if(!istype(H) || !Adjacent(H))
return ..()
@@ -11,7 +11,7 @@
else
return ..()
-/mob/living/carbon/alien/diona/attackby(var/obj/item/W, var/mob/user)
+/mob/living/carbon/alien/diona/attackby(obj/item/W, mob/user)
if(user.a_intent == I_HELP && istype(W, /obj/item/clothing/head))
if(hat)
to_chat(user, span_warning("\The [src] is already wearing \the [hat]."))
diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm
index 6021f2ba3c..fc94b2919a 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm
@@ -29,7 +29,7 @@
else if(!do_merge(M))
to_chat(src, "You fail to merge with \the [M]...")
-/mob/living/carbon/alien/diona/proc/do_merge(var/mob/living/carbon/human/H)
+/mob/living/carbon/alien/diona/proc/do_merge(mob/living/carbon/human/H)
if(!istype(H) || !src || !(src.Adjacent(H)))
return 0
to_chat(H, "You feel your being twine with that of \the [src] as it merges with your biomass.")
diff --git a/code/modules/mob/living/carbon/alien/diona/say_understands.dm b/code/modules/mob/living/carbon/alien/diona/say_understands.dm
index 0041701935..4e7bada8b6 100644
--- a/code/modules/mob/living/carbon/alien/diona/say_understands.dm
+++ b/code/modules/mob/living/carbon/alien/diona/say_understands.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/diona/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/living/carbon/alien/diona/say_understands(mob/other, datum/language/speaking = null)
if(ishuman(other) && !speaking)
if(languages.len >= 2) // They have sucked down some blood.
return TRUE
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 457b94b5e6..bfbc44a727 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -1,6 +1,6 @@
//Larvae regenerate health and nutrition from plasma and alien weeds.
-/mob/living/carbon/alien/larva/handle_environment(var/datum/gas_mixture/environment)
+/mob/living/carbon/alien/larva/handle_environment(datum/gas_mixture/environment)
if(!environment) return
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 774e1f5a4c..36a9676fc1 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -149,7 +149,7 @@
else
healths.icon_state = "health6"
-/mob/living/carbon/alien/handle_environment(var/datum/gas_mixture/environment)
+/mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment)
// Both alien subtypes survive in vaccum and suffer in high temperatures,
// so I'll just define this once, for both (see radiation comment above)
if(!environment) return
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 0f0dd6dc1e..5efb9d3db4 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -46,7 +46,7 @@
else
to_chat (usr, "You were unable to toggle the [src]'s radio.")
-/obj/item/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/mmi/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O,/obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO
var/obj/item/organ/internal/brain/B = O
@@ -129,7 +129,7 @@
icon_state = "mmi_empty"
name = "Man-Machine Interface"
-/obj/item/mmi/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people.
+/obj/item/mmi/proc/transfer_identity(mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people.
brainmob = new(src)
brainmob.name = H.real_name
brainmob.real_name = H.real_name
@@ -146,7 +146,7 @@
locked = 1
return
-/obj/item/mmi/relaymove(var/mob/user, var/direction)
+/obj/item/mmi/relaymove(mob/user, direction)
if(user.stat || user.stunned)
return
var/obj/item/rig/rig = src.get_rig()
@@ -208,7 +208,7 @@
src.brainmob.silent = 0
GLOB.dead_mob_list -= src.brainmob
-/obj/item/mmi/digital/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/mmi/digital/attackby(obj/item/O as obj, mob/user as mob)
return //Doesn't do anything right now because none of the things that can be done to a regular MMI make any sense for these
/obj/item/mmi/digital/examine(mob/user)
@@ -226,7 +226,7 @@
else
. += span_deadsay("It appears to be completely inactive.")
-/obj/item/mmi/digital/transfer_identity(var/mob/living/carbon/H)
+/obj/item/mmi/digital/transfer_identity(mob/living/carbon/H)
QDEL_SWAP(brainmob.dna, H.dna.Clone())
brainmob.timeofhostdeath = H.timeofdeath
brainmob.set_stat(CONSCIOUS)
@@ -274,7 +274,7 @@
for (var/mob/M in viewers(T))
M.show_message(span_blue("\The [src] buzzes quietly, and the golden lights fade away. Perhaps you could try again?"))
-/obj/item/mmi/digital/proc/transfer_personality(var/mob/candidate)
+/obj/item/mmi/digital/proc/transfer_personality(mob/candidate)
announce_ghost_joinleave(candidate, 0, "They are occupying a synthetic brain now.")
src.searching = 0
if(candidate.mind)
@@ -307,7 +307,7 @@
src.brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN","NJS","SKS","DRD","IOS","CRM","IBM","TEX","LVM","BSD",))]-[rand(1000, 9999)]"
src.brainmob.real_name = src.brainmob.name
-/obj/item/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H)
+/obj/item/mmi/digital/robot/transfer_identity(mob/living/carbon/H)
..()
if(brainmob.mind)
brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE
@@ -328,7 +328,7 @@
..()
-/obj/item/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H)
+/obj/item/mmi/digital/posibrain/transfer_identity(mob/living/carbon/H)
..()
if(brainmob.mind)
brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN
@@ -336,7 +336,7 @@
icon_state = "posibrain-occupied"
return
-/obj/item/mmi/digital/posibrain/transfer_personality(var/mob/candidate)
+/obj/item/mmi/digital/posibrain/transfer_personality(mob/candidate)
..()
icon_state = "posibrain-occupied"
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index d272c84756..2fcda42c0a 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -30,7 +30,7 @@
qdel(dna)
return ..()
-/mob/living/carbon/brain/say_understands(var/other)//Goddamn is this hackish, but this say code is so odd
+/mob/living/carbon/brain/say_understands(other)//Goddamn is this hackish, but this say code is so odd
if(istype(container, /obj/item/mmi))
if(issilicon(other))
return TRUE
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index e7b87a4147..04f1af09f8 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -35,7 +35,7 @@
if(O.client.prefs.be_special & BE_AI)
question(O.client)
-/obj/item/mmi/digital/posibrain/proc/question(var/client/C)
+/obj/item/mmi/digital/posibrain/proc/question(client/C)
spawn(0)
if(!C) return
var/response = tgui_alert(C, "Someone is requesting a personality for a positronic brain. Would you like to play as one?", "Positronic brain request", list("Yes", "No", "Never for this round"))
@@ -48,7 +48,7 @@
C.prefs.be_special ^= BE_AI
-/obj/item/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H)
+/obj/item/mmi/digital/posibrain/transfer_identity(mob/living/carbon/H)
..()
if(brainmob.mind)
brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN
@@ -56,7 +56,7 @@
icon_state = "posibrain-occupied"
return
-/obj/item/mmi/digital/posibrain/proc/transfer_personality(var/mob/candidate)
+/obj/item/mmi/digital/posibrain/proc/transfer_personality(mob/candidate)
announce_ghost_joinleave(candidate, 0, "They are occupying a positronic brain now.")
src.searching = 0
src.brainmob.mind = candidate.mind
diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm
index 7fc4e5d4bc..39b8251f5b 100644
--- a/code/modules/mob/living/carbon/brain/robot.dm
+++ b/code/modules/mob/living/carbon/brain/robot.dm
@@ -12,7 +12,7 @@
brainmob.real_name = brainmob.name
name = "robotic intelligence circuit ([brainmob.name])"
-/obj/item/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H)
+/obj/item/mmi/digital/robot/transfer_identity(mob/living/carbon/H)
..()
if(brainmob.mind)
brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE
diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm
index 42d81a0dc8..30cae3aea4 100644
--- a/code/modules/mob/living/carbon/brain/say.dm
+++ b/code/modules/mob/living/carbon/brain/say.dm
@@ -1,5 +1,5 @@
//TODO: Convert this over for languages.
-/mob/living/carbon/brain/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/carbon/brain/say(message, datum/language/speaking = null, whispering = 0)
if(silent)
return
diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm
index 7651e48cf1..07ea7d92e0 100644
--- a/code/modules/mob/living/carbon/breathe.dm
+++ b/code/modules/mob/living/carbon/breathe.dm
@@ -38,7 +38,7 @@
handle_breath(breath)
handle_post_breath(breath)
-/mob/living/carbon/proc/get_breath_from_internal(var/volume_needed=BREATH_VOLUME) //hopefully this will allow overrides to specify a different default volume without breaking any cases where volume is passed in.
+/mob/living/carbon/proc/get_breath_from_internal(volume_needed=BREATH_VOLUME) //hopefully this will allow overrides to specify a different default volume without breaking any cases where volume is passed in.
if(internal)
if (!contents.Find(internal))
internal = null
@@ -53,7 +53,7 @@
internals.icon_state = "internal0"
return null
-/mob/living/carbon/proc/get_breath_from_environment(var/volume_needed=BREATH_VOLUME)
+/mob/living/carbon/proc/get_breath_from_environment(volume_needed=BREATH_VOLUME)
var/datum/gas_mixture/breath = null
var/datum/gas_mixture/environment
@@ -74,7 +74,7 @@
return null
//Handle possble chem smoke effect
-/mob/living/carbon/proc/handle_chemical_smoke(var/datum/gas_mixture/environment)
+/mob/living/carbon/proc/handle_chemical_smoke(datum/gas_mixture/environment)
if(wear_mask && (wear_mask.item_flags & BLOCK_GAS_SMOKE_EFFECT))
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index c002cc04ea..6e873c4443 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -132,7 +132,7 @@
if(species.emp_sensitivity & EMP_OXY_DMG)
src.adjustOxyLoss(rand(25-(severity*5),35-(severity*5)) * species.emp_dmg_mod)
-/mob/living/carbon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null, var/stun = 1)
+/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null, stun = 1)
if(SEND_SIGNAL(src, COMSIG_BEING_ELECTROCUTED, shock_damage, source, siemens_coeff, def_zone, stun) & COMPONENT_CARBON_CANCEL_ELECTROCUTE)
return 0 // Cancelled by a component
if(def_zone == BP_L_HAND || def_zone == BP_R_HAND) //Diona (And any other potential plant people) hands don't get shocked.
@@ -326,7 +326,7 @@
/mob/living/carbon/proc/getDNA()
return dna
-/mob/living/carbon/proc/setDNA(var/datum/dna/newDNA)
+/mob/living/carbon/proc/setDNA(datum/dna/newDNA)
dna = newDNA
// ++++ROCKDTBEN++++ MOB PROCS //END
@@ -367,7 +367,7 @@
//generates realistic-ish pulse output based on preset levels
-/mob/living/carbon/proc/get_pulse(var/method) //method 0 is for hands, 1 is for machines, more accurate
+/mob/living/carbon/proc/get_pulse(method) //method 0 is for hands, 1 is for machines, more accurate
var/temp = 0 //see setup.dm:694
switch(src.pulse)
if(PULSE_NONE)
@@ -401,7 +401,7 @@
/mob/living/carbon/cannot_use_vents()
return
-/mob/living/carbon/slip(var/slipped_on,stun_duration=8)
+/mob/living/carbon/slip(slipped_on,stun_duration=8)
SEND_SIGNAL(src, COMSIG_ON_CARBON_SLIP, slipped_on, stun_duration)
if(buckled)
return FALSE
@@ -415,13 +415,13 @@
Weaken(FLOOR(stun_duration/2, 1))
return TRUE
-/mob/living/carbon/proc/add_chemical_effect(var/effect, var/magnitude = 1)
+/mob/living/carbon/proc/add_chemical_effect(effect, magnitude = 1)
if(effect in chem_effects)
chem_effects[effect] += magnitude
else
chem_effects[effect] = magnitude
-/mob/living/carbon/proc/remove_chemical_effect(var/effect, var/magnitude)
+/mob/living/carbon/proc/remove_chemical_effect(effect, magnitude)
if(effect in chem_effects)
chem_effects[effect] = magnitude ? max(0,chem_effects[effect]-magnitude) : 0
@@ -437,10 +437,10 @@
return species.default_language ? GLOB.all_languages[species.default_language] : GLOB.all_languages[LANGUAGE_GIBBERISH]
-/mob/living/carbon/proc/should_have_organ(var/organ_check)
+/mob/living/carbon/proc/should_have_organ(organ_check)
return 0
-/mob/living/carbon/can_feel_pain(var/check_organ)
+/mob/living/carbon/can_feel_pain(check_organ)
if(!species) //CHOMPEdit
return 0
if(isSynthetic())
@@ -542,7 +542,7 @@
if(src.wear_mask.wash(clean_types))
src.update_inv_wear_mask(0)
-/mob/living/carbon/proc/food_preference(var/allergen_type) //RS edit
+/mob/living/carbon/proc/food_preference(allergen_type) //RS edit
if(!species) // carbon/brains have no species
return FALSE
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index dc2b49391d..ad882f50cf 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,10 +1,10 @@
//Called when the mob is hit with an item in combat.
-/mob/living/carbon/resolve_item_attack(obj/item/I, mob/living/user, var/effective_force, var/hit_zone)
+/mob/living/carbon/resolve_item_attack(obj/item/I, mob/living/user, effective_force, hit_zone)
if(check_neckgrab_attack(I, user, hit_zone))
return null
..()
-/mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
+/mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, effective_force, blocked, hit_zone)
if(!effective_force || blocked >= 100)
return 0
@@ -35,7 +35,7 @@
return 1
// Attacking someone with a weapon while they are neck-grabbed
-/mob/living/carbon/proc/check_neckgrab_attack(obj/item/W, mob/user, var/hit_zone)
+/mob/living/carbon/proc/check_neckgrab_attack(obj/item/W, mob/user, hit_zone)
if(user.a_intent == I_HURT)
for(var/obj/item/grab/G in src.grabbed_by)
if(G.assailant == user)
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index e1ada168c7..0f00b35fa9 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -1,10 +1,10 @@
-/mob/living/verb/give(var/mob/living/target in living_mobs_in_view(1))
+/mob/living/verb/give(mob/living/target in living_mobs_in_view(1))
set category = "IC.Game"
set name = "Give"
do_give(target)
-/mob/living/proc/do_give(var/mob/living/carbon/human/target)
+/mob/living/proc/do_give(mob/living/carbon/human/target)
if(src.incapacitated())
return
diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index 92ac922b4b..301e444fc3 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -8,7 +8,7 @@
AC.flags = flags
AC.tgui_interact(user, custom_state = state)
-/mob/living/carbon/human/proc/change_species(var/new_species)
+/mob/living/carbon/human/proc/change_species(new_species)
if(!new_species)
return
@@ -22,7 +22,7 @@
reset_hair()
return 1
-/mob/living/carbon/human/proc/change_gender(var/gender)
+/mob/living/carbon/human/proc/change_gender(gender)
if(src.gender == gender)
return
@@ -32,14 +32,14 @@
update_icons_body()
return 1
-/mob/living/carbon/human/proc/change_gender_identity(var/identifying_gender)
+/mob/living/carbon/human/proc/change_gender_identity(identifying_gender)
if(src.identifying_gender == identifying_gender)
return
src.identifying_gender = identifying_gender
return 1
-/mob/living/carbon/human/proc/change_hair(var/hair_style)
+/mob/living/carbon/human/proc/change_hair(hair_style)
if(!hair_style)
return
@@ -54,7 +54,7 @@
update_hair()
return 1
-/mob/living/carbon/human/proc/change_hair_gradient(var/hair_gradient)
+/mob/living/carbon/human/proc/change_hair_gradient(hair_gradient)
if(!hair_gradient)
return
@@ -69,7 +69,7 @@
update_hair()
return 1
-/mob/living/carbon/human/proc/change_facial_hair(var/facial_hair_style)
+/mob/living/carbon/human/proc/change_facial_hair(facial_hair_style)
if(!facial_hair_style)
return
@@ -102,7 +102,7 @@
update_hair()
-/mob/living/carbon/human/proc/change_eye_color(var/red, var/green, var/blue)
+/mob/living/carbon/human/proc/change_eye_color(red, green, blue)
if(red == r_eyes && green == g_eyes && blue == b_eyes)
return
@@ -114,7 +114,7 @@
update_icons_body()
return 1
-/mob/living/carbon/human/proc/change_hair_color(var/red, var/green, var/blue)
+/mob/living/carbon/human/proc/change_hair_color(red, green, blue)
if(red == r_hair && green == g_hair && blue == b_hair)
return
@@ -125,7 +125,7 @@
update_hair()
return 1
-/mob/living/carbon/human/proc/change_grad_color(var/red, var/green, var/blue)
+/mob/living/carbon/human/proc/change_grad_color(red, green, blue)
if(red == r_grad && green == g_grad && blue == b_grad)
return
@@ -136,7 +136,7 @@
update_hair()
return 1
-/mob/living/carbon/human/proc/change_facial_hair_color(var/red, var/green, var/blue)
+/mob/living/carbon/human/proc/change_facial_hair_color(red, green, blue)
if(red == r_facial && green == g_facial && blue == b_facial)
return
@@ -147,7 +147,7 @@
update_hair()
return 1
-/mob/living/carbon/human/proc/change_skin_color(var/red, var/green, var/blue)
+/mob/living/carbon/human/proc/change_skin_color(red, green, blue)
if(red == r_skin && green == g_skin && blue == b_skin || !(species.appearance_flags & HAS_SKIN_COLOR))
return
@@ -159,7 +159,7 @@
update_icons_body()
return 1
-/mob/living/carbon/human/proc/change_skin_tone(var/tone)
+/mob/living/carbon/human/proc/change_skin_tone(tone)
if(s_tone == tone || !(species.appearance_flags & HAS_SKIN_TONE))
return
@@ -174,7 +174,7 @@
dna.ResetUIFrom(src) // Do not call ready_dna here: it resets ALL SE blocks, wiping trait gene state
sync_organ_dna()
-/mob/living/carbon/human/proc/generate_valid_species(var/check_whitelist = 1, var/list/whitelist = list(), var/list/blacklist = list())
+/mob/living/carbon/human/proc/generate_valid_species(check_whitelist = 1, list/whitelist = list(), list/blacklist = list())
var/list/valid_species = new()
for(var/current_species_name in GLOB.all_species)
var/datum/species/current_species = GLOB.all_species[current_species_name]
@@ -193,7 +193,7 @@
return valid_species
-/mob/living/carbon/human/proc/generate_valid_hairstyles(var/check_gender = 1)
+/mob/living/carbon/human/proc/generate_valid_hairstyles(check_gender = 1)
var/use_species = species.get_bodytype(src)
var/obj/item/organ/external/head/H = get_organ(BP_HEAD)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 7ff335d0f1..2e53b7a7f1 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -486,7 +486,7 @@ GLOBAL_LIST_INIT(simple_mob_default_emotes, list(
popup.set_content(HTML)
popup.open()
-/mob/living/carbon/human/proc/toggle_tail(var/setting,var/message = 0)
+/mob/living/carbon/human/proc/toggle_tail(setting,message = 0)
if(!tail_style || !tail_style.ani_state)
if(message)
to_chat(src, span_warning("You don't have a tail that supports this."))
@@ -498,7 +498,7 @@ GLOBAL_LIST_INIT(simple_mob_default_emotes, list(
update_tail_showing()
return 1
-/mob/living/carbon/human/proc/toggle_wing(var/setting,var/message = 0)
+/mob/living/carbon/human/proc/toggle_wing(setting,message = 0)
if(!wing_style || !wing_style.ani_state)
if(message)
to_chat(src, span_warning("You don't have a wingtype that supports this."))
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index b6d0812be2..44ecd36438 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -34,7 +34,7 @@
var/list/datum/genetics/side_effect/genetic_side_effects = list() //For any genetic side effects we currently have.
var/last_chew = 0
-/mob/living/carbon/human/Initialize(mapload, var/new_species = null)
+/mob/living/carbon/human/Initialize(mapload, new_species = null)
if(!dna)
dna = new /datum/dna(null)
// Species name is handled by set_species()
@@ -133,7 +133,7 @@
species.get_status_tab_items(src)
-/mob/proc/RigPanel(var/obj/item/rig/R)
+/mob/proc/RigPanel(obj/item/rig/R)
if(R && !R.canremove && R.installed_modules.len)
var/list/L = list()
var/cell_status = R.cell ? "[R.cell.charge]/[R.cell.maxcharge]" : "ERROR"
@@ -281,7 +281,7 @@
// called when something steps onto a human
// this handles mobs on fire - mulebot and vehicle code has been relocated to /mob/living/Crossed()
-/mob/living/carbon/human/Crossed(var/atom/movable/AM)
+/mob/living/carbon/human/Crossed(atom/movable/AM)
if(AM.is_incorporeal())
return
@@ -290,7 +290,7 @@
..() // call parent because we moved behavior to parent
// Get rank from ID, ID inside PDA, PDA, ID in wallet, etc.
-/mob/living/carbon/human/proc/get_authentification_rank(var/if_no_id = "No id", var/if_no_job = "No job")
+/mob/living/carbon/human/proc/get_authentification_rank(if_no_id = "No id", if_no_job = "No job")
var/obj/item/pda/pda = wear_id
if (istype(pda))
if (pda.id)
@@ -306,7 +306,7 @@
//gets assignment from ID or ID inside PDA or PDA itself
//Useful when player do something with computers
-/mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job")
+/mob/living/carbon/human/proc/get_assignment(if_no_id = "No id", if_no_job = "No job")
var/obj/item/pda/pda = wear_id
if (istype(pda))
if (pda.id)
@@ -322,7 +322,7 @@
//gets name from ID or ID inside PDA or PDA itself
//Useful when player do something with computers
-/mob/living/carbon/human/proc/get_authentification_name(var/if_no_id = "Unknown")
+/mob/living/carbon/human/proc/get_authentification_name(if_no_id = "Unknown")
var/obj/item/pda/pda = wear_id
if (istype(pda))
if (pda.id)
@@ -361,7 +361,7 @@
//gets name from ID or PDA itself, ID inside PDA doesn't matter
//Useful when player is being seen by other mobs
-/mob/living/carbon/human/proc/get_id_name(var/if_no_id = "Unknown")
+/mob/living/carbon/human/proc/get_id_name(if_no_id = "Unknown")
. = if_no_id
if(istype(wear_id,/obj/item/pda))
var/obj/item/pda/P = wear_id
@@ -379,7 +379,7 @@
//Removed the horrible safety parameter. It was only being used by ninja code anyways.
//Now checks siemens_coefficient of the affected area by default
-/mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null, var/stun)
+/mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null, stun)
if(SEND_SIGNAL(src, COMSIG_BEING_ELECTROCUTED, shock_damage, source, siemens_coeff, def_zone, stun) & COMPONENT_CARBON_CANCEL_ELECTROCUTE)
return 0 // Cancelled by a component
@@ -793,7 +793,7 @@
I.additional_flash_effects(number)
return number
-/mob/living/carbon/human/flash_eyes(var/intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /atom/movable/screen/fullscreen/flash)
+/mob/living/carbon/human/flash_eyes(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE, type = /atom/movable/screen/fullscreen/flash)
if(internal_organs_by_name[O_EYES]) // Eyes are fucked, not a 'weak point'.
var/obj/item/organ/internal/eyes/I = internal_organs_by_name[O_EYES]
I.additional_flash_effects(intensity)
@@ -819,7 +819,7 @@
//Used by various things that knock people out by applying blunt trauma to the head.
//Checks that the species has a "head" (brain containing organ) and that hit_zone refers to it.
-/mob/living/carbon/human/proc/headcheck(var/target_zone, var/brain_tag = O_BRAIN)
+/mob/living/carbon/human/proc/headcheck(target_zone, brain_tag = O_BRAIN)
var/obj/item/organ/affecting = internal_organs_by_name[brain_tag]
@@ -837,7 +837,7 @@
return 1
-/mob/living/carbon/human/IsAdvancedToolUser(var/silent)
+/mob/living/carbon/human/IsAdvancedToolUser(silent)
if(get_feralness())
to_chat(src, span_warning("Your primitive mind can't grasp the concept of that thing."))
return 0
@@ -847,7 +847,7 @@
to_chat(src, span_warning("You don't have the dexterity to use that!"))
return 0
-/mob/living/carbon/human/abiotic(var/full_body = 0)
+/mob/living/carbon/human/abiotic(full_body = 0)
if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves)))
return 1
@@ -1082,7 +1082,7 @@
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
return L && L.is_bruised()
-/mob/living/carbon/human/proc/rupture_lung(var/gradual)
+/mob/living/carbon/human/proc/rupture_lung(gradual)
var/obj/item/organ/internal/lungs/L = internal_organs_by_name[O_LUNGS]
if(L)
@@ -1164,7 +1164,7 @@
update_bloodied()
-/mob/living/carbon/human/get_visible_implants(var/class = 0)
+/mob/living/carbon/human/get_visible_implants(class = 0)
var/list/visible_implants = list()
for(var/obj/item/organ/external/organ in src.organs)
@@ -1233,7 +1233,7 @@
else
to_chat(usr, span_warning("You failed to check the pulse. Try again."))
-/mob/living/carbon/human/proc/set_species(var/new_species)
+/mob/living/carbon/human/proc/set_species(new_species)
if(!dna)
if(!new_species)
@@ -1389,7 +1389,7 @@
W.message = message
W.add_fingerprint(src)
-/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE)
+/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, ignore_thickness = FALSE)
. = 1
if(!target_zone)
@@ -1425,7 +1425,7 @@
fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into."
to_chat(user, span_warning("[fail_msg]"))
-/mob/living/carbon/human/print_flavor_text(var/shrink = 1)
+/mob/living/carbon/human/print_flavor_text(shrink = 1)
var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes)
var/head_exposed = 1
var/face_exposed = 1
@@ -1486,7 +1486,7 @@
return TRUE
return FALSE
-/mob/living/carbon/human/slip(var/slipped_on, stun_duration=8)
+/mob/living/carbon/human/slip(slipped_on, stun_duration=8)
var/list/equipment = list(src.w_uniform,src.wear_suit,src.shoes)
var/footcoverage_check = FALSE
for(var/obj/item/clothing/C in equipment)
@@ -1555,7 +1555,7 @@
to_chat(S, span_danger("[U] pops your [current_limb.joint] back in!"))
current_limb.relocate()
-/mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/target = null)
+/mob/living/carbon/human/drop_from_inventory(obj/item/W, atom/target = null)
if(W in organs)
return FALSE
if(isnull(target) && isdisposalpacket(src.loc))
@@ -1570,14 +1570,14 @@
return 0
//Puts the item into our active hand if possible. returns 1 on success.
-/mob/living/carbon/human/put_in_active_hand(var/obj/item/W)
+/mob/living/carbon/human/put_in_active_hand(obj/item/W)
return (hand ? put_in_l_hand(W) : put_in_r_hand(W))
//Puts the item into our inactive hand if possible. returns 1 on success.
-/mob/living/carbon/human/put_in_inactive_hand(var/obj/item/W)
+/mob/living/carbon/human/put_in_inactive_hand(obj/item/W)
return (hand ? put_in_r_hand(W) : put_in_l_hand(W))
-/mob/living/carbon/human/put_in_hands(var/obj/item/W)
+/mob/living/carbon/human/put_in_hands(obj/item/W)
if(!W)
return 0
if(put_in_active_hand(W))
@@ -1591,7 +1591,7 @@
else
return ..()
-/mob/living/carbon/human/put_in_l_hand(var/obj/item/W)
+/mob/living/carbon/human/put_in_l_hand(obj/item/W)
if(!..() || l_hand)
return 0
W.forceMove(src)
@@ -1601,7 +1601,7 @@
update_inv_l_hand()
return 1
-/mob/living/carbon/human/put_in_r_hand(var/obj/item/W)
+/mob/living/carbon/human/put_in_r_hand(obj/item/W)
if(!..() || r_hand)
return 0
W.forceMove(src)
@@ -1653,7 +1653,7 @@
to_chat(src, span_notice("You are now [pulling ? "pulling your punches" : "not pulling your punches"]."))
return
-/mob/living/carbon/human/should_have_organ(var/organ_check)
+/mob/living/carbon/human/should_have_organ(organ_check)
var/obj/item/organ/external/affecting
if(organ_check in list(O_HEART, O_LUNGS))
@@ -1682,7 +1682,7 @@
return name
return FALSE
-/mob/living/carbon/human/can_feel_pain(var/obj/item/organ/check_organ)
+/mob/living/carbon/human/can_feel_pain(obj/item/organ/check_organ)
if(isSynthetic())
return 0
if(!digest_pain)
@@ -1813,7 +1813,7 @@
// Drag damage is handled in a parent
-/mob/living/carbon/human/dragged(var/mob/living/dragger, var/oldloc, trigged_bleeding)
+/mob/living/carbon/human/dragged(mob/living/dragger, oldloc, trigged_bleeding)
if(..())
if(species?.flags & NO_BLOOD)
return
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index ae88763243..24215a89ce 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -1,7 +1,7 @@
/mob/living/carbon/human
var/datum/unarmed_attack/default_attack
-/mob/living/carbon/human/proc/get_unarmed_attack(var/mob/living/carbon/human/target, var/hit_zone)
+/mob/living/carbon/human/proc/get_unarmed_attack(mob/living/carbon/human/target, hit_zone)
if(nif && nif.flag_check(NIF_C_HARDCLAWS,NIF_FLAGS_COMBAT))
return GLOB.unarmed_hardclaws
if(src.default_attack && src.default_attack.is_usable(src, target, hit_zone))
@@ -104,7 +104,7 @@
/// This condenses them and makes it less of a cluster.
///Help Intent
-/mob/living/carbon/human/proc/attack_hand_help_intent(var/mob/living/carbon/human/H, var/mob/living/M, var/has_hands)
+/mob/living/carbon/human/proc/attack_hand_help_intent(mob/living/carbon/human/H, mob/living/M, has_hands)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(M.restrained()) //If we're restrained, we can't help them. If you want to add snowflake stuff that you can do while restrained, add it here.
@@ -150,7 +150,7 @@
return TRUE
//Disarm Intent
-/mob/living/carbon/human/proc/attack_hand_disarm_intent(var/mob/living/carbon/human/H, var/mob/living/M as mob, var/has_hands)
+/mob/living/carbon/human/proc/attack_hand_disarm_intent(mob/living/carbon/human/H, mob/living/M as mob, has_hands)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(M.restrained()) //If we're restrained, we can't disarm them. If you want to add snowflake stuff that you can do while restrained, add it here.
@@ -234,7 +234,7 @@
else
visible_message(span_filter_combat("[span_red(span_bold("[M] attempted to disarm [src]!"))]"))
//Grab Intent
-/mob/living/carbon/human/proc/attack_hand_grab_intent(var/mob/living/carbon/human/H, var/mob/living/M as mob, var/has_hands)
+/mob/living/carbon/human/proc/attack_hand_grab_intent(mob/living/carbon/human/H, mob/living/M as mob, has_hands)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(M.restrained()) //If we're restrained, we can't grab them. If you want to add snowflake stuff that you can do while restrained, add it here.
@@ -264,7 +264,7 @@
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
visible_message(span_warning("[M] has grabbed [src] [(M.zone_sel.selecting == BP_L_HAND || M.zone_sel.selecting == BP_R_HAND)? "by [(gender==FEMALE)? "her" : ((gender==MALE)? "his": "their")] hands": "passively"]!"))
//Harm Intent
-/mob/living/carbon/human/proc/attack_hand_harm_intent(var/mob/living/carbon/human/H, var/mob/living/M as mob, var/has_hands)
+/mob/living/carbon/human/proc/attack_hand_harm_intent(mob/living/carbon/human/H, mob/living/M as mob, has_hands)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
//As a note: This intentionally doesn't immediately return if has_hands is false. This is because you can attack with kicks/bites!
@@ -416,7 +416,7 @@
/mob/living/carbon/human/proc/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
return
-/mob/living/carbon/human/attack_generic(var/mob/user, var/damage, var/attack_message, var/armor_type = "melee", var/armor_pen = 0, var/a_sharp = 0, var/a_edge = 0)
+/mob/living/carbon/human/attack_generic(mob/user, damage, attack_message, armor_type = "melee", armor_pen = 0, a_sharp = 0, a_edge = 0)
if(istype(user,/mob/living))
var/mob/living/L = user
if(touch_reaction_flags & SPECIES_TRAIT_THORNS)
@@ -441,7 +441,7 @@
return TRUE
//Used to attack a joint through grabbing
-/mob/living/carbon/human/proc/grab_joint(var/mob/living/user, var/def_zone)
+/mob/living/carbon/human/proc/grab_joint(mob/living/user, def_zone)
var/has_grab = 0
for(var/obj/item/grab/G in list(user.l_hand, user.r_hand))
if(G.affecting == src && G.state == GRAB_NECK)
@@ -495,7 +495,7 @@
If you are applying pressure to another and attempt to apply pressure to yourself, you'll have to switch to an empty hand which will also stop do_mob()
Changing targeted zones should also stop do_mob(), preventing you from applying pressure to more than one body part at once.
*/
-/mob/living/carbon/human/proc/apply_pressure(mob/living/user, var/target_zone)
+/mob/living/carbon/human/proc/apply_pressure(mob/living/user, target_zone)
var/obj/item/organ/external/organ = get_organ(target_zone)
if(!organ || !(organ.status & ORGAN_BLEEDING) || (organ.robotic >= ORGAN_ROBOT))
return FALSE
@@ -560,10 +560,10 @@
else
return ..()
-/mob/living/carbon/human/proc/set_default_attack(var/datum/unarmed_attack/u_attack)
+/mob/living/carbon/human/proc/set_default_attack(datum/unarmed_attack/u_attack)
default_attack = u_attack
-/mob/living/carbon/human/proc/perform_cpr(var/mob/living/carbon/human/reviver)
+/mob/living/carbon/human/proc/perform_cpr(mob/living/carbon/human/reviver)
// Check for sanity
if(!istype(reviver,/mob/living/carbon/human))
return
diff --git a/code/modules/mob/living/carbon/human/human_bellies.dm b/code/modules/mob/living/carbon/human/human_bellies.dm
index 5619bd27ac..f755b19a40 100644
--- a/code/modules/mob/living/carbon/human/human_bellies.dm
+++ b/code/modules/mob/living/carbon/human/human_bellies.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/human/update_fullness(var/returning = FALSE)
+/mob/living/carbon/human/update_fullness(returning = FALSE)
if(!returning)
if(updating_fullness)
return
@@ -29,7 +29,7 @@
if(vore_fullness_ex["taur belly"] != previous_taur_fullness)
update_vore_tail_sprite()
-/mob/living/carbon/human/vs_animate(var/belly_to_animate)
+/mob/living/carbon/human/vs_animate(belly_to_animate)
if(belly_to_animate == "stomach")
vore_belly_animation()
else if(belly_to_animate == "taur belly")
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 896046edba..126dc4dd52 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -52,7 +52,7 @@
handle_pain()
return
-/mob/living/carbon/human/adjustBrainLoss(var/amount)
+/mob/living/carbon/human/adjustBrainLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_BRAIN_DAMAGE, amount) & COMSIG_CANCEL_BRAIN_DAMAGE)
return 0 // Cancelled by a component
@@ -67,7 +67,7 @@
else
brainloss = 0
-/mob/living/carbon/human/setBrainLoss(var/amount)
+/mob/living/carbon/human/setBrainLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_BRAIN_DAMAGE, amount) & COMSIG_CANCEL_BRAIN_DAMAGE)
return 0 // Cancelled by a component
@@ -147,7 +147,7 @@
return amount
//'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs
-/mob/living/carbon/human/adjustBruteLoss(var/amount,var/include_robo)
+/mob/living/carbon/human/adjustBruteLoss(amount,include_robo)
if(SEND_SIGNAL(src, COMSIG_TAKING_BRUTE_DAMAGE, amount) & COMSIG_CANCEL_BRUTE_DAMAGE)
return 0 // Cancelled by a component
amount = amount*species.brute_mod
@@ -171,7 +171,7 @@
BITSET(hud_updateflag, HEALTH_HUD)
//'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs
-/mob/living/carbon/human/adjustFireLoss(var/amount,var/include_robo)
+/mob/living/carbon/human/adjustFireLoss(amount,include_robo)
amount = amount*species.burn_mod
if(amount > 0)
for(var/datum/modifier/M in modifiers)
@@ -192,7 +192,7 @@
heal_overall_damage(0, -amount, include_robo)
BITSET(hud_updateflag, HEALTH_HUD)
-/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
+/mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null)
amount = amount*species.brute_mod
if (organ_name in organs_by_name)
var/obj/item/organ/external/O = get_organ(organ_name)
@@ -218,7 +218,7 @@
BITSET(hud_updateflag, HEALTH_HUD)
-/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
+/mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null)
amount = amount*species.burn_mod
if (organ_name in organs_by_name)
var/obj/item/organ/external/O = get_organ(organ_name)
@@ -287,13 +287,13 @@
cloneloss = 0
return ..()
-/mob/living/carbon/human/setCloneLoss(var/amount)
+/mob/living/carbon/human/setCloneLoss(amount)
if((species.flags & NO_DNA) || isSynthetic())
cloneloss = 0
else
..()
-/mob/living/carbon/human/adjustCloneLoss(var/amount)
+/mob/living/carbon/human/adjustCloneLoss(amount)
..()
if((species.flags & NO_DNA) || isSynthetic())
@@ -334,20 +334,20 @@
oxyloss = 0
return ..()
-/mob/living/carbon/human/adjustOxyLoss(var/amount)
+/mob/living/carbon/human/adjustOxyLoss(amount)
if(!should_have_organ(O_LUNGS))
oxyloss = 0
else
amount = amount*species.oxy_mod
..(amount)
-/mob/living/carbon/human/setOxyLoss(var/amount)
+/mob/living/carbon/human/setOxyLoss(amount)
if(!should_have_organ(O_LUNGS))
oxyloss = 0
else
..()
-/mob/living/carbon/human/adjustHalLoss(var/amount)
+/mob/living/carbon/human/adjustHalLoss(amount)
if(species.flags & NO_PAIN)
halloss = 0
else
@@ -355,34 +355,34 @@
amount = amount*species.pain_mod
..(amount)
-/mob/living/carbon/human/setHalLoss(var/amount)
+/mob/living/carbon/human/setHalLoss(amount)
if(species.flags & NO_PAIN)
halloss = 0
else
..()
-/mob/living/carbon/human/Stun(var/amount, ignore_canstun = FALSE)
+/mob/living/carbon/human/Stun(amount, ignore_canstun = FALSE)
if(amount > 0) //only multiply it by the mod if it's positive, or else it takes longer to fade too!
amount = amount*species.stun_mod
..(amount)
-/mob/living/carbon/human/SetStunned(var/amount, ignore_canstun = FALSE)
+/mob/living/carbon/human/SetStunned(amount, ignore_canstun = FALSE)
..()
-/mob/living/carbon/human/AdjustStunned(var/amount, ignore_canstun = FALSE)
+/mob/living/carbon/human/AdjustStunned(amount, ignore_canstun = FALSE)
if(amount > 0) // Only multiply it if positive.
amount = amount*species.stun_mod
..(amount)
-/mob/living/carbon/human/Weaken(var/amount, ignore_canstun = FALSE)
+/mob/living/carbon/human/Weaken(amount, ignore_canstun = FALSE)
if(amount > 0) //only multiply it by the mod if it's positive, or else it takes longer to fade too!
amount = amount*species.weaken_mod
..(amount)
-/mob/living/carbon/human/SetWeakened(var/amount, ignore_canstun = FALSE)
+/mob/living/carbon/human/SetWeakened(amount, ignore_canstun = FALSE)
..()
-/mob/living/carbon/human/AdjustWeakened(var/amount, ignore_canstun = FALSE)
+/mob/living/carbon/human/AdjustWeakened(amount, ignore_canstun = FALSE)
if(amount > 0) // Only multiply it if positive.
amount = amount*species.weaken_mod
..(amount)
@@ -392,14 +392,14 @@
toxloss = 0
return ..()
-/mob/living/carbon/human/adjustToxLoss(var/amount)
+/mob/living/carbon/human/adjustToxLoss(amount)
if(species.flags & NO_POISON)
toxloss = 0
else
amount = amount*species.toxins_mod
..(amount)
-/mob/living/carbon/human/setToxLoss(var/amount)
+/mob/living/carbon/human/setToxLoss(amount)
if(species.flags & NO_POISON)
toxloss = 0
else
@@ -408,7 +408,7 @@
////////////////////////////////////////////
//Returns a list of damaged organs
-/mob/living/carbon/human/proc/get_damaged_organs(var/brute, var/burn)
+/mob/living/carbon/human/proc/get_damaged_organs(brute, burn)
var/list/obj/item/organ/external/parts = list()
for(var/obj/item/organ/external/O in organs)
if((brute && O.brute_dam) || (burn && O.burn_dam))
@@ -434,7 +434,7 @@
//Heals ONE external organ, organ gets randomly selected from damaged ones.
//It automatically updates damage overlays if necesary
//It automatically updates health status
-/mob/living/carbon/human/heal_organ_damage(var/brute, var/burn)
+/mob/living/carbon/human/heal_organ_damage(brute, burn)
var/list/obj/item/organ/external/parts = get_damaged_organs(brute,burn)
if(!parts.len) return
var/obj/item/organ/external/picked = pick(parts)
@@ -450,7 +450,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
//Damages ONE external organ, organ gets randomly selected from damagable ones.
//It automatically updates damage overlays if necesary
//It automatically updates health status
-/mob/living/carbon/human/take_organ_damage(var/brute, var/burn, var/sharp = FALSE, var/edge = FALSE)
+/mob/living/carbon/human/take_organ_damage(brute, burn, sharp = FALSE, edge = FALSE)
var/list/obj/item/organ/external/parts = get_damageable_organs()
if(!parts.len) return
var/obj/item/organ/external/picked = pick(parts)
@@ -462,7 +462,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
//Heal MANY external organs, in random order
//'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs
-/mob/living/carbon/human/heal_overall_damage(var/brute, var/burn, var/include_robo)
+/mob/living/carbon/human/heal_overall_damage(brute, burn, include_robo)
var/list/obj/item/organ/external/parts = get_damaged_organs(brute,burn)
var/update = 0
@@ -483,7 +483,7 @@ In most cases it makes more sense to use apply_damage() instead! And make sure t
if(update) UpdateDamageIcon()
// damage MANY external organs, in random order
-/mob/living/carbon/human/take_overall_damage(var/brute, var/burn, var/sharp = FALSE, var/edge = FALSE, var/used_weapon = null)
+/mob/living/carbon/human/take_overall_damage(brute, burn, sharp = FALSE, edge = FALSE, used_weapon = null)
var/list/obj/item/organ/external/parts = get_damageable_organs()
var/update = 0
while(parts.len && (brute>0 || burn>0) )
@@ -516,7 +516,7 @@ This function restores the subjects blood to max.
/*
This function restores all organs.
*/
-/mob/living/carbon/human/restore_all_organs(var/ignore_prosthetic_prefs)
+/mob/living/carbon/human/restore_all_organs(ignore_prosthetic_prefs)
for(var/obj/item/organ/external/current_organ in organs)
current_organ.rejuvenate(ignore_prosthetic_prefs)
@@ -531,7 +531,7 @@ This function restores all organs.
return
/*
-/mob/living/carbon/human/proc/get_organ(var/zone)
+/mob/living/carbon/human/proc/get_organ(zone)
if(!zone)
zone = BP_TORSO
else if (zone in list( O_EYES, O_MOUTH ))
@@ -539,7 +539,7 @@ This function restores all organs.
return organs_by_name[zone]
*/
-/mob/living/carbon/human/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = FALSE, var/edge = FALSE, var/obj/used_weapon = null, var/projectile = FALSE)
+/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = FALSE, edge = FALSE, obj/used_weapon = null, projectile = FALSE)
SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone, blocked, sharp, edge, used_weapon, projectile)
if(GLOB.Debug2)
log_world("## DEBUG: human/apply_damage() was called on [src], with [damage] damage, and an armor value of [blocked].")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index ba3f2ae571..69fe1d93e0 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -8,7 +8,7 @@ emp_act
*/
-/mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/carbon/human/bullet_act(obj/item/projectile/P, def_zone)
def_zone = check_zone(def_zone)
if(!has_organ(def_zone))
@@ -58,7 +58,7 @@ emp_act
return (..(P , def_zone))
-/mob/living/carbon/human/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null, var/electric = FALSE)
+/mob/living/carbon/human/stun_effect_act(stun_amount, agony_amount, def_zone, used_weapon=null, electric = FALSE)
var/obj/item/organ/external/affected = get_organ(check_zone(def_zone))
var/siemens_coeff = get_siemens_coefficient_organ(affected)
if(fire_stacks < 0) // Water makes you more conductive.
@@ -89,7 +89,7 @@ emp_act
..(stun_amount, agony_amount, def_zone, used_weapon, electric)
-/mob/living/carbon/human/getarmor(var/def_zone, var/type)
+/mob/living/carbon/human/getarmor(def_zone, type)
var/armorval = 0
var/total = 0
@@ -112,7 +112,7 @@ emp_act
return (armorval/max(total, 1))
//this proc returns the Siemens coefficient of electrical resistivity for a particular external organ.
-/mob/living/carbon/human/proc/get_siemens_coefficient_organ(var/obj/item/organ/external/def_zone)
+/mob/living/carbon/human/proc/get_siemens_coefficient_organ(obj/item/organ/external/def_zone)
if (!def_zone)
return 1.0
@@ -152,7 +152,7 @@ emp_act
return min(1 - get_siemens_coefficient_average(), 1) // Don't go above 1, but negatives are fine.
// Returns a list of clothing that is currently covering def_zone.
-/mob/living/carbon/human/proc/get_clothing_list_organ(var/obj/item/organ/external/def_zone, var/type)
+/mob/living/carbon/human/proc/get_clothing_list_organ(obj/item/organ/external/def_zone, type)
var/list/results = list()
var/list/clothing_items = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes)
for(var/obj/item/clothing/C in clothing_items)
@@ -161,7 +161,7 @@ emp_act
return results
//this proc returns the armour value for a particular external organ.
-/mob/living/carbon/human/proc/getarmor_organ(var/obj/item/organ/external/def_zone, var/type)
+/mob/living/carbon/human/proc/getarmor_organ(obj/item/organ/external/def_zone, type)
if(!type || !def_zone)
return 0
var/protection = 0
@@ -201,14 +201,14 @@ emp_act
return gear
return null
-/mob/living/carbon/human/proc/check_shields(var/damage = 0, var/atom/damage_source = null, var/mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/mob/living/carbon/human/proc/check_shields(damage = 0, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
for(var/obj/item/shield in list(l_hand, r_hand, wear_suit, l_ear, r_ear)) //CHOMPEdit - included ears for the headset/event item
if(!shield) continue
. = shield.handle_shield(src, damage, damage_source, attacker, def_zone, attack_text)
if(.) return
return 0
-/mob/living/carbon/human/resolve_item_attack(obj/item/I, mob/living/user, var/target_zone)
+/mob/living/carbon/human/resolve_item_attack(obj/item/I, mob/living/user, target_zone)
if(check_neckgrab_attack(I, user, target_zone))
return null
@@ -233,7 +233,7 @@ emp_act
return hit_zone
-/mob/living/carbon/human/hit_with_weapon(obj/item/I, mob/living/user, var/effective_force, var/hit_zone)
+/mob/living/carbon/human/hit_with_weapon(obj/item/I, mob/living/user, effective_force, hit_zone)
var/obj/item/organ/external/affecting = get_organ(hit_zone)
if(!affecting)
return //should be prevented by attacked_with_item() but for sanity.
@@ -246,7 +246,7 @@ emp_act
return blocked
-/mob/living/carbon/human/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
+/mob/living/carbon/human/standard_weapon_hit_effects(obj/item/I, mob/living/user, effective_force, blocked, hit_zone)
var/obj/item/organ/external/affecting = get_organ(hit_zone)
if(!affecting)
return 0
@@ -316,7 +316,7 @@ emp_act
return 1
-/mob/living/carbon/human/proc/attack_joint(var/obj/item/organ/external/organ, var/obj/item/W, var/effective_force, var/dislocate_mult, var/blocked)
+/mob/living/carbon/human/proc/attack_joint(obj/item/organ/external/organ, obj/item/W, effective_force, dislocate_mult, blocked)
if(!organ || (organ.dislocated == 1) || (organ.dislocated == -1) || blocked >= 100) //VOREStation Edit Bugfix
return 0
@@ -331,7 +331,7 @@ emp_act
return 1
return 0
-/mob/living/carbon/human/emag_act(var/remaining_charges, mob/user, var/emag_source)
+/mob/living/carbon/human/emag_act(remaining_charges, mob/user, emag_source)
var/obj/item/organ/external/affecting = get_organ(user.zone_sel.selecting)
if(!affecting || !(affecting.robotic >= ORGAN_ROBOT))
to_chat(user, span_warning("That limb isn't robotic."))
@@ -449,7 +449,7 @@ emp_act
src.pinned += thrown_object
// This does a prob check to catch the thing flying at you, with a minimum of 1%
-/mob/living/carbon/human/proc/can_catch(var/obj/item/O)
+/mob/living/carbon/human/proc/can_catch(obj/item/O)
if(!isitem(O))
return FALSE
if(!get_active_hand()) // If active hand is empty
@@ -476,7 +476,7 @@ emp_act
return TRUE
return FALSE
-/mob/living/carbon/human/embed(var/obj/O, var/def_zone=null)
+/mob/living/carbon/human/embed(obj/O, def_zone=null)
if(!def_zone) ..()
var/obj/item/organ/external/affecting = get_organ(def_zone)
@@ -484,7 +484,7 @@ emp_act
affecting.embed(O)
-/mob/living/carbon/human/proc/bloody_hands(var/mob/living/source, var/amount = 2)
+/mob/living/carbon/human/proc/bloody_hands(mob/living/source, amount = 2)
if (istype(gloves, /obj/item/clothing/gloves))
var/obj/item/clothing/gloves/gl = gloves
gl.add_blood(source)
@@ -494,7 +494,7 @@ emp_act
bloody_hands = amount
update_inv_gloves() //updates on-mob overlays for bloody hands and/or bloody gloves
-/mob/living/carbon/human/proc/bloody_body(var/mob/living/source)
+/mob/living/carbon/human/proc/bloody_body(mob/living/source)
if(wear_suit)
wear_suit.add_blood(source)
update_inv_wear_suit(0)
@@ -502,7 +502,7 @@ emp_act
w_uniform.add_blood(source)
update_inv_w_uniform(0)
-/mob/living/carbon/human/proc/handle_suit_punctures(var/damtype, var/damage, var/def_zone)
+/mob/living/carbon/human/proc/handle_suit_punctures(damtype, damage, def_zone)
// Tox and oxy don't matter to suits.
if(damtype != BURN && damtype != BRUTE) return
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 696b2e2c90..83e86f751b 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -2,7 +2,7 @@
#define HUMAN_EATING_NO_MOUTH 1
#define HUMAN_EATING_BLOCKED_MOUTH 2
-/mob/living/carbon/human/can_eat(var/food, var/feedback = 1)
+/mob/living/carbon/human/can_eat(food, feedback = 1)
var/list/status = can_eat_status()
if(status[1] == HUMAN_EATING_NO_ISSUE)
return 1
@@ -13,7 +13,7 @@
balloon_alert(src, "\the [status[2]] is in the way!")
return 0
-/mob/living/carbon/human/can_force_feed(var/feeder, var/food, var/feedback = 1)
+/mob/living/carbon/human/can_force_feed(feeder, food, feedback = 1)
var/list/status = can_eat_status()
if(status[1] == HUMAN_EATING_NO_ISSUE)
return 1
diff --git a/code/modules/mob/living/carbon/human/human_helpers_vr.dm b/code/modules/mob/living/carbon/human/human_helpers_vr.dm
index 3bed2db74b..0c91fe85f8 100644
--- a/code/modules/mob/living/carbon/human/human_helpers_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers_vr.dm
@@ -1,7 +1,7 @@
GLOBAL_DATUM_INIT(ingame_hud_vr, /icon, icon('icons/mob/hud_vr.dmi'))
GLOBAL_DATUM_INIT(ingame_hud_med_vr, /icon, icon('icons/mob/hud_med_vr.dmi'))
-/mob/living/carbon/human/proc/remove_marking(var/datum/sprite_accessory/marking/mark_datum)
+/mob/living/carbon/human/proc/remove_marking(datum/sprite_accessory/marking/mark_datum)
if (!mark_datum)
return FALSE
var/successful = FALSE
@@ -16,7 +16,7 @@ GLOBAL_DATUM_INIT(ingame_hud_med_vr, /icon, icon('icons/mob/hud_med_vr.dmi'))
return TRUE
return FALSE
-/mob/living/carbon/human/proc/add_marking(var/datum/sprite_accessory/marking/mark_datum, var/mark_color = "#000000")
+/mob/living/carbon/human/proc/add_marking(datum/sprite_accessory/marking/mark_datum, mark_color = "#000000")
if (!mark_datum)
return FALSE
var/success = FALSE
@@ -31,7 +31,7 @@ GLOBAL_DATUM_INIT(ingame_hud_med_vr, /icon, icon('icons/mob/hud_med_vr.dmi'))
update_icons_body()
return success
-/mob/living/carbon/human/proc/change_priority_of_marking(var/datum/sprite_accessory/marking/mark_datum, var/move_down, var/swap = TRUE) //move_down should be true/false
+/mob/living/carbon/human/proc/change_priority_of_marking(datum/sprite_accessory/marking/mark_datum, move_down, swap = TRUE) //move_down should be true/false
if (!mark_datum)
return FALSE
var/change = move_down ? 1 : -1
@@ -58,13 +58,13 @@ GLOBAL_DATUM_INIT(ingame_hud_med_vr, /icon, icon('icons/mob/hud_med_vr.dmi'))
update_icons_body()
return TRUE
-/mob/living/carbon/human/proc/change_priority_marking_to_priority(var/priority, var/to_priority)
+/mob/living/carbon/human/proc/change_priority_marking_to_priority(priority, to_priority)
for (var/obj/item/organ/external/O in organs)
for (var/marking in O.markings)
if (O.markings[marking]["priority"] == priority)
O.markings[marking]["priority"] = to_priority
-/mob/living/carbon/human/proc/change_marking_color(var/datum/sprite_accessory/marking/mark_datum, var/mark_color = "#000000")
+/mob/living/carbon/human/proc/change_marking_color(datum/sprite_accessory/marking/mark_datum, mark_color = "#000000")
if (!mark_datum)
return FALSE
var/success = FALSE
@@ -119,7 +119,7 @@ GLOBAL_DATUM_INIT(ingame_hud_med_vr, /icon, icon('icons/mob/hud_med_vr.dmi'))
//does not really need to happen, that kinda thing will only happen when putting another person's limb onto your own body
return sorted
-/mob/living/carbon/human/proc/transform_into_other_human(var/mob/living/carbon/human/character, var/copy_name, var/copy_flavour = TRUE, var/convert_to_prosthetics = FALSE, var/apply_bloodtype = TRUE)
+/mob/living/carbon/human/proc/transform_into_other_human(mob/living/carbon/human/character, copy_name, copy_flavour = TRUE, convert_to_prosthetics = FALSE, apply_bloodtype = TRUE)
/*
name, nickname, flavour, OOC notes
gender, sex
diff --git a/code/modules/mob/living/carbon/human/human_modular_limbs.dm b/code/modules/mob/living/carbon/human/human_modular_limbs.dm
index 44ef58787f..ca656c13d2 100644
--- a/code/modules/mob/living/carbon/human/human_modular_limbs.dm
+++ b/code/modules/mob/living/carbon/human/human_modular_limbs.dm
@@ -17,7 +17,7 @@
// Checks if a limb could theoretically be removed.
// Note that this does not currently bother checking if a child or internal organ is vital.
-/obj/item/organ/external/proc/can_remove_modular_limb(var/mob/living/carbon/human/user)
+/obj/item/organ/external/proc/can_remove_modular_limb(mob/living/carbon/human/user)
if(vital || cannot_amputate)
return FALSE
var/bodypart_cat = get_modular_limb_category()
@@ -30,12 +30,12 @@
. = (bodypart_cat != MODULAR_BODYPART_INVALID)
// Note that this proc is checking if the organ can be attached -to-, not attached itself.
-/obj/item/organ/external/proc/can_attach_modular_limb_here(var/mob/living/carbon/human/user)
+/obj/item/organ/external/proc/can_attach_modular_limb_here(mob/living/carbon/human/user)
var/list/limb_data = user?.species?.has_limbs[organ_tag]
if(islist(limb_data) && limb_data["has_children"] > 0)
. = (length(children) < limb_data["has_children"])
-/obj/item/organ/external/proc/can_be_attached_modular_limb(var/mob/living/carbon/user)
+/obj/item/organ/external/proc/can_be_attached_modular_limb(mob/living/carbon/user)
var/bodypart_cat = get_modular_limb_category()
if(bodypart_cat == MODULAR_BODYPART_INVALID)
return FALSE
@@ -51,13 +51,13 @@
return TRUE
// Checks if an organ (or the parent of one) is in a fit state for modular limb stuff to happen.
-/obj/item/organ/external/proc/check_modular_limb_damage(var/mob/living/carbon/human/user)
+/obj/item/organ/external/proc/check_modular_limb_damage(mob/living/carbon/human/user)
. = damage >= min_broken_damage || (status & ORGAN_BROKEN) || is_stump() // can't use is_broken() as the limb has ORGAN_CUT_AWAY
// Human mob procs:
// Checks the organ list for limbs meeting a predicate. Way overengineered for such a limited use
// case but I can see it being expanded in the future if meat limbs or doona limbs use it.
-/mob/living/carbon/human/proc/get_modular_limbs(var/return_first_found = FALSE, var/validate_proc)
+/mob/living/carbon/human/proc/get_modular_limbs(return_first_found = FALSE, validate_proc)
for(var/obj/item/organ/external/E in organs)
if(!validate_proc || call(E, validate_proc)(src) > MODULAR_BODYPART_INVALID)
LAZYADD(., E)
@@ -82,7 +82,7 @@
remove_verb(src, /mob/living/carbon/human/proc/detach_limb_verb)
// Proc helper for attachment verb.
-/mob/living/carbon/human/proc/check_can_attach_modular_limb(var/obj/item/organ/external/E)
+/mob/living/carbon/human/proc/check_can_attach_modular_limb(obj/item/organ/external/E)
if(world.time < last_special + (2 SECONDS) || get_active_hand() != E)
return FALSE
/*CHOMPRemove Start
@@ -121,7 +121,7 @@
return TRUE
// Proc helper for detachment verb.
-/mob/living/carbon/human/proc/check_can_detach_modular_limb(var/obj/item/organ/external/E)
+/mob/living/carbon/human/proc/check_can_detach_modular_limb(obj/item/organ/external/E)
if(world.time < last_special + (2 SECONDS))
return FALSE
/*CHOMPRemove Start
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 3bc79d5108..17263ddf74 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -271,7 +271,7 @@
return v.tank
-/mob/living/carbon/human/Process_Spacemove(var/check_drift = 0)
+/mob/living/carbon/human/Process_Spacemove(check_drift = 0)
//Can we act?
if(restrained()) return 0
@@ -295,13 +295,13 @@
return FALSE
// Handle footstep sounds
-/mob/living/carbon/human/handle_footstep(var/turf/T)
+/mob/living/carbon/human/handle_footstep(turf/T)
if(shoes && loc == T && get_gravity(loc) && !flying)
if(SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION, m_intent))
return
return
-/mob/living/carbon/human/set_dir(var/new_dir)
+/mob/living/carbon/human/set_dir(new_dir)
. = ..()
if(. && (species.tail || tail_style))
//update_tail_showing() this is already called by update_inv_wear_suit
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 2f390a8064..66beb154b4 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -193,7 +193,7 @@
O.trace_chemicals[A.name] = 100
// Traitgenes Init genes based on the traits currently active
-/mob/living/carbon/human/proc/sync_dna_traits(var/refresh_traits, var/hide_message = TRUE)
+/mob/living/carbon/human/proc/sync_dna_traits(refresh_traits, hide_message = TRUE)
SHOULD_NOT_OVERRIDE(TRUE) //Don't. Even. /Think/. About. It.
if(!dna || !species)
return
@@ -223,7 +223,7 @@
for(var/obj/item/organ/O in all_bits)
O.set_dna(dna)
-/mob/living/carbon/human/proc/set_gender(var/g)
+/mob/living/carbon/human/proc/set_gender(g)
if(g != gender)
gender = g
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 165491a783..f272e4f766 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -132,7 +132,7 @@
set category = "Abilities.Diona"
diona_split_into_nymphs(5) // Separate proc to void argments being supplied when used as a verb
-/mob/living/carbon/human/proc/diona_split_into_nymphs(var/number_of_resulting_nymphs)
+/mob/living/carbon/human/proc/diona_split_into_nymphs(number_of_resulting_nymphs)
var/turf/T = get_turf(src)
var/mob/living/carbon/alien/diona/S = new(T)
diff --git a/code/modules/mob/living/carbon/human/human_powers_vr.dm b/code/modules/mob/living/carbon/human/human_powers_vr.dm
index 8484553730..fcb0bda92a 100644
--- a/code/modules/mob/living/carbon/human/human_powers_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_powers_vr.dm
@@ -101,7 +101,7 @@
// Checks to make sure everything is fine to continue playing.
-/mob/living/carbon/human/proc/hand_games_check(var/mob/living/carbon/human/player1, var/mob/living/carbon/human/player2)
+/mob/living/carbon/human/proc/hand_games_check(mob/living/carbon/human/player1, mob/living/carbon/human/player2)
if(!istype(player1) || !istype(player2))
return 0
if(player1.stat || player2.stat) //Make sure they're still standing
@@ -113,7 +113,7 @@
///// A simple game of rock paper scissors, each player chooses an option and the choices are declared simultaneously.
-/mob/living/carbon/human/proc/game_rps(var/mob/living/carbon/human/player1, var/mob/living/carbon/human/player2)
+/mob/living/carbon/human/proc/game_rps(mob/living/carbon/human/player1, mob/living/carbon/human/player2)
if(!hand_games_check(player1,player2))
return
to_chat(player1, span_notice("Asking [player2] if they want to play Rock, Paper, Scissors!"))
@@ -143,7 +143,7 @@
/////// Arm wrestling! Each player gets a modifier based on their size and can choose the strength of their character, then a weighted roll is made.
-/mob/living/carbon/human/proc/game_armwrestle(var/mob/living/carbon/human/player1, var/mob/living/carbon/human/player2)
+/mob/living/carbon/human/proc/game_armwrestle(mob/living/carbon/human/player1, mob/living/carbon/human/player2)
if(!hand_games_check(player1,player2))
return
to_chat(player1, span_notice("Asking [player2] if they want to play Arm Wrestling!"))
@@ -188,7 +188,7 @@
/////// Slap Hands! Each player gets a modifier based on their size and can choose the reaction time of their character, then a weighted roll is made. This one gives the advantage to smaller players.
-/mob/living/carbon/human/proc/game_slaphands(var/mob/living/carbon/human/player1, var/mob/living/carbon/human/player2)
+/mob/living/carbon/human/proc/game_slaphands(mob/living/carbon/human/player1, mob/living/carbon/human/player2)
if(!hand_games_check(player1,player2))
return
to_chat(player1, span_notice("Asking [player2] if they want to play Slap Hands!"))
@@ -236,7 +236,7 @@
///// Thumb wars! This one is just pure chance to allow people to do just quick RNG.
-/mob/living/carbon/human/proc/game_thumbwars(var/mob/living/carbon/human/player1, var/mob/living/carbon/human/player2)
+/mob/living/carbon/human/proc/game_thumbwars(mob/living/carbon/human/player1, mob/living/carbon/human/player2)
if(!hand_games_check(player1,player2))
return
to_chat(player1, span_notice("Asking [player2] if they want to play Thumb Wars!"))
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 2db22b5f4a..4ee92e4fdb 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -374,7 +374,7 @@ This saves us from having to call add_fingerprint() any time something is put in
return 1
//Checks if a given slot can be accessed at this time, either to equip or unequip I
-/mob/living/carbon/human/slot_is_accessible(var/slot, var/obj/item/I, mob/user=null)
+/mob/living/carbon/human/slot_is_accessible(slot, obj/item/I, mob/user=null)
var/obj/item/covering = null
var/check_flags = 0
@@ -393,7 +393,7 @@ This saves us from having to call add_fingerprint() any time something is put in
return 0
return 1
-/mob/living/carbon/human/get_equipped_item(var/slot)
+/mob/living/carbon/human/get_equipped_item(slot)
switch(slot)
if(slot_back) return back
if(slot_legcuffed) return legcuffed
@@ -431,7 +431,7 @@ This saves us from having to call add_fingerprint() any time something is put in
if(r_hand)
. += r_hand
-/mob/living/carbon/human/proc/drop_all_clothing(var/remove_underwear = FALSE)
+/mob/living/carbon/human/proc/drop_all_clothing(remove_underwear = FALSE)
for(var/obj/item/equipped_thing in worn_clothing)
if(istype(equipped_thing,/obj/item/clothing/accessory/collar/shock/bluespace))
continue
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index b273e43bdc..5683a9c682 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -143,7 +143,7 @@
return pressure_adjustment_coefficient
// Calculate how much of the enviroment pressure-difference affects the human.
-/mob/living/carbon/human/calculate_affecting_pressure(var/pressure)
+/mob/living/carbon/human/calculate_affecting_pressure(pressure)
var/pressure_difference
// First get the absolute pressure difference.
@@ -470,7 +470,7 @@
/** breathing **/
-/mob/living/carbon/human/handle_chemical_smoke(var/datum/gas_mixture/environment)
+/mob/living/carbon/human/handle_chemical_smoke(datum/gas_mixture/environment)
if(wear_mask && (wear_mask.item_flags & BLOCK_GAS_SMOKE_EFFECT))
return
if(glasses && (glasses.item_flags & BLOCK_GAS_SMOKE_EFFECT))
@@ -821,7 +821,7 @@
breath.update_values()
return 1
-/mob/living/carbon/human/proc/play_inhale(var/mob/living/M, var/exhale)
+/mob/living/carbon/human/proc/play_inhale(mob/living/M, exhale)
var/suit_inhale_sound
if(species.suit_inhale_sound)
suit_inhale_sound = species.suit_inhale_sound
@@ -832,7 +832,7 @@
if(!exhale) // Did we fail exhale? If no, play it after inhale finishes.
addtimer(CALLBACK(src, PROC_REF(play_exhale), M), 5 SECONDS)
-/mob/living/carbon/human/proc/play_exhale(var/mob/living/M)
+/mob/living/carbon/human/proc/play_exhale(mob/living/M)
var/suit_exhale_sound
if(species.suit_exhale_sound)
suit_exhale_sound = species.suit_exhale_sound
@@ -1126,7 +1126,7 @@
. = 1 - .
. = min(., 1.0)
-/mob/living/carbon/human/proc/get_thermal_protection(var/flags)
+/mob/living/carbon/human/proc/get_thermal_protection(flags)
.=0
if(flags)
if(flags & HEAD)
@@ -1439,7 +1439,7 @@
return 1
-/mob/living/carbon/human/set_stat(var/new_stat)
+/mob/living/carbon/human/set_stat(new_stat)
. = ..()
if(. && stat)
update_skin(1)
@@ -1799,7 +1799,7 @@
// Call parent to handle signals
..()
-/mob/living/carbon/human/proc/process_glasses(var/obj/item/clothing/glasses/G)
+/mob/living/carbon/human/proc/process_glasses(obj/item/clothing/glasses/G)
. = FALSE
if(G && G.active)
if(G.darkness_view)
@@ -1819,7 +1819,7 @@
else if(!druggy && !seer)
see_invisible = see_invisible_default
-/mob/living/carbon/human/proc/process_nifsoft_vision(var/datum/nifsoft/NS)
+/mob/living/carbon/human/proc/process_nifsoft_vision(datum/nifsoft/NS)
. = FALSE
if(NS && NS.active)
if(NS.darkness_view)
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 9d537f936e..8993d1a99d 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -67,7 +67,7 @@
// NORMIE
return ..()
-/mob/living/carbon/human/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/living/carbon/human/say_understands(mob/other, datum/language/speaking = null)
if(has_brain_worms()) //Brain worms translate everything. Even mice and alien speak.
return TRUE
@@ -128,7 +128,7 @@
return formatted_name
return real_name
-/mob/living/carbon/human/proc/SetSpecialVoice(var/new_voice)
+/mob/living/carbon/human/proc/SetSpecialVoice(new_voice)
if(new_voice)
special_voice = new_voice
return
@@ -140,7 +140,7 @@
/mob/living/carbon/human/proc/GetSpecialVoice()
return special_voice
-/mob/living/carbon/human/handle_speech_problems(var/list/message_data)
+/mob/living/carbon/human/handle_speech_problems(list/message_data)
if(silent || (sdisabilities & MUTE) || is_paralyzed())
// MUTE shouldn't suppress noise language (audible say emotes), consistent with * emotes bypassing mute in say().
if((sdisabilities & MUTE) && !silent && !is_paralyzed())
diff --git a/code/modules/mob/living/carbon/human/species/lleill/hanner.dm b/code/modules/mob/living/carbon/human/species/lleill/hanner.dm
index 723686db5f..8374f722b1 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/hanner.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/hanner.dm
@@ -111,7 +111,7 @@
var/datum/power/lleill/LP = new power(src)
lleill_ability_datums.Add(LP)
-/datum/species/shapeshifter/hanner/proc/add_lleill_abilities(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/hanner/proc/add_lleill_abilities(mob/living/carbon/human/H)
if(!H.ability_master || !istype(H.ability_master, /atom/movable/screen/movable/ability_master/lleill))
H.ability_master = null
H.ability_master = new /atom/movable/screen/movable/ability_master/lleill(H)
@@ -130,6 +130,6 @@
H.lleill_display.invisibility = INVISIBILITY_NONE
H.lleill_display.icon_state = "lleill-4"
-/datum/species/shapeshifter/hanner/add_inherent_verbs(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/hanner/add_inherent_verbs(mob/living/carbon/human/H)
..()
add_lleill_abilities(H)
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill.dm
index 7d7e6ec609..6dc6bb335d 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill.dm
@@ -135,60 +135,60 @@
// Shapeshifters have some behaviour that doesn't play well with this species so I have taken the main parts needed for here.
-/datum/species/lleill/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_valid_shapeshifter_forms(mob/living/carbon/human/H)
return valid_transform_species
-/datum/species/lleill/get_icobase(var/mob/living/carbon/human/H, var/get_deform)
+/datum/species/lleill/get_icobase(mob/living/carbon/human/H, get_deform)
if(!H) return ..(null, get_deform)
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.type == src.type) return ..(H, get_deform)
return S.get_icobase(H,get_deform)
-/datum/species/lleill/get_race_key(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_race_key(mob/living/carbon/human/H)
return "[..()]-[GLOB.wrapped_species_by_ref["\ref[H]"]]"
-/datum/species/lleill/get_bodytype(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_bodytype(mob/living/carbon/human/H)
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!H || !S) return ..()
if(S.type == src.type) return ..(H)
return S.get_bodytype(H)
-/datum/species/lleill/get_blood_mask(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_blood_mask(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.name == src.name)
return ..()
return S?.get_blood_mask(H)
-/datum/species/lleill/get_damage_mask(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_damage_mask(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.name == src.name)
return ..()
return S?.get_damage_mask(H)
-/datum/species/lleill/get_damage_overlays(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_damage_overlays(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.name == src.name)
return ..()
return S?.get_damage_overlays(H)
-/datum/species/lleill/get_tail(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_tail(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.name == src.name)
return ..()
return S?.get_tail(H)
-/datum/species/lleill/get_tail_animation(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_tail_animation(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.name == src.name)
return ..()
return S?.get_tail_animation(H)
-/datum/species/lleill/get_tail_hair(var/mob/living/carbon/human/H)
+/datum/species/lleill/get_tail_hair(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
if(!S || S.name == src.name)
@@ -201,7 +201,7 @@
var/datum/power/lleill/LP = new power(src)
lleill_ability_datums.Add(LP)
-/datum/species/lleill/proc/add_lleill_abilities(var/mob/living/carbon/human/H)
+/datum/species/lleill/proc/add_lleill_abilities(mob/living/carbon/human/H)
if(!H.ability_master || !istype(H.ability_master, /atom/movable/screen/movable/ability_master/lleill))
H.ability_master = null
H.ability_master = new /atom/movable/screen/movable/ability_master/lleill(H)
@@ -220,7 +220,7 @@
H.lleill_display.invisibility = INVISIBILITY_NONE
H.lleill_display.icon_state = "lleill-4"
-/datum/species/proc/update_lleill_hud(var/mob/living/carbon/human/H)
+/datum/species/proc/update_lleill_hud(mob/living/carbon/human/H)
var/relative_energy = lleill_energy_max ? ((lleill_energy/lleill_energy_max)*100) : 0
if(H.lleill_display)
H.lleill_display.invisibility = INVISIBILITY_NONE
@@ -237,6 +237,6 @@
H.lleill_display.icon_state = "lleill-4"
return
-/datum/species/lleill/add_inherent_verbs(var/mob/living/carbon/human/H)
+/datum/species/lleill/add_inherent_verbs(mob/living/carbon/human/H)
..()
add_lleill_abilities(H)
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
index 4bb2b4ea36..ae51abd1f0 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_abilities.dm
@@ -53,7 +53,7 @@
return
lleill_change_shape(new_species)
-/mob/living/carbon/human/proc/lleill_change_shape(var/new_species = null)
+/mob/living/carbon/human/proc/lleill_change_shape(new_species = null)
if(!new_species)
return
@@ -78,7 +78,7 @@
return
lleill_set_colour(new_skin)
-/mob/living/carbon/human/proc/lleill_set_colour(var/new_skin)
+/mob/living/carbon/human/proc/lleill_set_colour(new_skin)
r_skin = hex2num(copytext(new_skin, 2, 4))
g_skin = hex2num(copytext(new_skin, 4, 6))
@@ -486,7 +486,7 @@
species.update_lleill_hud(src)
-/mob/living/carbon/human/proc/spawn_beast_mob(var/chosen_beast)
+/mob/living/carbon/human/proc/spawn_beast_mob(chosen_beast)
var/tf_type = chosen_beast
if(!ispath(tf_type))
return
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_hud.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_hud.dm
index 1a4da35679..164df14ac0 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill_hud.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_hud.dm
@@ -28,7 +28,7 @@
icon_state = "grey_spell_base"
background_base_state = "grey"
-/atom/movable/screen/movable/ability_master/proc/add_lleill_ability(var/object_given, var/verb_given, var/name_given, var/ability_icon_given, var/arguments)
+/atom/movable/screen/movable/ability_master/proc/add_lleill_ability(object_given, verb_given, name_given, ability_icon_given, arguments)
if(!object_given)
message_admins("ERROR: add_lleill_ability() was not given an object in its arguments.")
if(!verb_given)
diff --git a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm
index 7e36311baf..6367961443 100644
--- a/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm
+++ b/code/modules/mob/living/carbon/human/species/lleill/lleill_items.dm
@@ -24,7 +24,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/glamour_transparent/affect_blood(var/mob/living/carbon/target, var/removed)
+/datum/reagent/glamour_transparent/affect_blood(mob/living/carbon/target, removed)
if(!target.cloaked)
target.visible_message(span_infoplain(span_bold("\The [target]") + " vanishes from sight."))
target.cloak()
@@ -63,7 +63,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/glamour_scaling/affect_blood(var/mob/living/carbon/target, var/removed)
+/datum/reagent/glamour_scaling/affect_blood(mob/living/carbon/target, removed)
if(!(/mob/living/proc/set_size in target.verbs))
to_chat(target, span_warning("You feel as though you could change size at any moment."))
add_verb(target, /mob/living/proc/set_size)
@@ -97,7 +97,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/glamour_twinkling/affect_blood(var/mob/living/carbon/human/target, var/removed)
+/datum/reagent/glamour_twinkling/affect_blood(mob/living/carbon/human/target, removed)
if(target.species.darksight < 10)
to_chat(target, span_warning("You can suddenly see much better than before."))
target.species.darksight = 10
@@ -412,7 +412,7 @@
M.tf_into(new_mob)
-/obj/item/glamour_unstable/proc/spawn_mob(var/mob/living/target)
+/obj/item/glamour_unstable/proc/spawn_mob(mob/living/target)
var/choice = pick(tf_possible_types)
tf_type = tf_possible_types[choice]
if(!ispath(tf_type))
diff --git a/code/modules/mob/living/carbon/human/species/outsider/event.dm b/code/modules/mob/living/carbon/human/species/outsider/event.dm
index ae0dc3b23e..3b58bd7014 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/event.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/event.dm
@@ -115,7 +115,7 @@ Variables you may want to make use of are:
var/overcome_gravity = 0
var/hover = 0
-/datum/species/event1/proc/set_limbset(var/setnum = 1) //Will require existing ones to be respawned for changes to take effect.
+/datum/species/event1/proc/set_limbset(setnum = 1) //Will require existing ones to be respawned for changes to take effect.
switch(setnum)
if(1) //Normal.
has_limbs = list(
@@ -214,13 +214,13 @@ Variables you may want to make use of are:
/datum/species/event1/proc/toggle_plant() //Maybe it's a distant cousin of the Venus Fly Trap.
flags ^= IS_PLANT
-/datum/species/event1/get_bodytype(var/mob/living/carbon/human/H) //Default to human sprites, if they're based on another species, var edit use_bodyshape to the correct thing in _defines/mobs.dm of the species you want to use.
+/datum/species/event1/get_bodytype(mob/living/carbon/human/H) //Default to human sprites, if they're based on another species, var edit use_bodyshape to the correct thing in _defines/mobs.dm of the species you want to use.
return use_bodyshape
-/datum/species/event1/can_overcome_gravity(var/mob/living/carbon/human/H)
+/datum/species/event1/can_overcome_gravity(mob/living/carbon/human/H)
return overcome_gravity
-/datum/species/event1/can_fall(var/mob/living/carbon/human/H)
+/datum/species/event1/can_fall(mob/living/carbon/human/H)
return hover
/datum/species/event1/sub1
diff --git a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm
index cdf03522b2..54439bec9e 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/shadow.dm
@@ -32,7 +32,7 @@
species_component = list(/datum/component/burninlight/shadow) // Until a parent component like xenochimera have is needed, only handles burning in light.
-/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
+/datum/species/shadow/handle_death(mob/living/carbon/human/H)
spawn(1)
new /obj/effect/decal/cleanable/ash(H.loc)
qdel(H)
diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
index 01cec2f50c..699cb5c7ed 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm
@@ -91,11 +91,11 @@
)
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) //Get ya quills done did
-/datum/species/vox/get_random_name(var/gender)
+/datum/species/vox/get_random_name(gender)
var/datum/language/species_language = GLOB.all_languages[default_language]
return species_language.get_random_name(gender)
-/datum/species/vox/equip_survival_gear(var/mob/living/carbon/human/H, var/extendedtank = 0,var/comprehensive = 0)
+/datum/species/vox/equip_survival_gear(mob/living/carbon/human/H, extendedtank = 0,comprehensive = 0)
. = ..()
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
index 4d64dca3f2..dfd9517044 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm
@@ -103,7 +103,7 @@
species_component = list(/datum/component/shadekin/full, /datum/component/radiation_effects/radiation_immune) //CHOMPEdit: Enabling full shadekin & no-power radiation component.
component_requires_late_recalc = TRUE
-/datum/species/shadekin/handle_death(var/mob/living/carbon/human/H)
+/datum/species/shadekin/handle_death(mob/living/carbon/human/H)
var/special_handling = TRUE //varswitch for downstream //CHOMPEdit - Enable.
H.clear_dark_maws() //clear dark maws on death or similar
var/datum/component/shadekin/SK = H.get_shadekin_component()
@@ -216,7 +216,7 @@
/datum/species/shadekin/get_random_name()
return "shadekin"
-/datum/species/shadekin/post_spawn_special(var/mob/living/carbon/human/H)
+/datum/species/shadekin/post_spawn_special(mob/living/carbon/human/H)
.=..()
var/datum/component/shadekin/SK = H.get_shadekin_component()
@@ -241,7 +241,7 @@
H.health = H.getMaxHealth()
-/datum/species/shadekin/produceCopy(var/list/traits, var/mob/living/carbon/human/H, var/custom_base, var/reset_dna = TRUE) // Traitgenes reset_dna flag required, or genes get reset on resleeve
+/datum/species/shadekin/produceCopy(list/traits, mob/living/carbon/human/H, custom_base, reset_dna = TRUE) // Traitgenes reset_dna flag required, or genes get reset on resleeve
var/datum/species/shadekin/new_copy = ..()
new_copy.total_health = total_health
diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm
index 613b890ad6..7431520dd4 100644
--- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm
+++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin_hud.dm
@@ -28,7 +28,7 @@
background_base_state = "grey"
icon = 'icons/mob/shadekin_abilities.dmi'
-/atom/movable/screen/movable/ability_master/proc/add_shadekin_ability(var/object_given, var/verb_given, var/name_given, var/ability_icon_given, var/arguments)
+/atom/movable/screen/movable/ability_master/proc/add_shadekin_ability(object_given, verb_given, name_given, ability_icon_given, arguments)
if(!object_given)
message_admins("ERROR: add_shadekin_ability() was not given an object in its arguments.")
if(!verb_given)
@@ -48,7 +48,7 @@
toggle_open(2) //forces the icons to refresh on screen
-/atom/movable/screen/movable/ability_master/proc/remove_shadekin_ability(var/object_given, var/verb_given, var/arguments)
+/atom/movable/screen/movable/ability_master/proc/remove_shadekin_ability(object_given, verb_given, arguments)
if(!object_given)
message_admins("ERROR: remove_shadekin_ability() was not given an object in its arguments.")
if(!verb_given)
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index ea3d0524e0..119691cb81 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -412,10 +412,10 @@
else if(spawn_flags & SPECIES_IS_WHITELISTED)
sort_hint = SPECIES_SORT_WHITELISTED
-/datum/species/proc/sanitize_name(var/name, var/robot = 0)
+/datum/species/proc/sanitize_name(name, robot = 0)
return sanitizeName(name, MAX_NAME_LEN, robot)
-/datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 0,var/comprehensive = 0)
+/datum/species/proc/equip_survival_gear(mob/living/carbon/human/H,extendedtank = 0,comprehensive = 0)
var/boxtype = /obj/item/storage/box/survival //Default survival box
var/synth = H.isSynthetic()
@@ -500,7 +500,7 @@
for(var/obj/item/organ/O in H.internal_organs)
O.set_initial_meat()
-/datum/species/proc/hug(var/mob/living/carbon/human/H, var/mob/living/target)
+/datum/species/proc/hug(mob/living/carbon/human/H, mob/living/target)
var/t_him = "them"
if(ishuman(target))
@@ -575,35 +575,35 @@
H.visible_message(span_notice("[H] hugs [target] to make [t_him] feel better!"), \
span_notice("You hug [target] to make [t_him] feel better!"))
-/datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H)
+/datum/species/proc/remove_inherent_verbs(mob/living/carbon/human/H)
if(inherent_verbs)
for(var/verb_path in inherent_verbs)
remove_verb(H, verb_path)
return
-/datum/species/proc/add_inherent_verbs(var/mob/living/carbon/human/H)
+/datum/species/proc/add_inherent_verbs(mob/living/carbon/human/H)
if(inherent_verbs)
for(var/verb_path in inherent_verbs)
add_verb(H, verb_path)
return
-/datum/species/proc/handle_post_spawn(var/mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
+/datum/species/proc/handle_post_spawn(mob/living/carbon/human/H) //Handles anything not already covered by basic species assignment.
add_inherent_verbs(H)
H.mob_bump_flag = bump_flag
H.mob_swap_flags = swap_flags
H.mob_push_flags = push_flags
H.pass_flags = pass_flags
-/datum/species/proc/handle_death(var/mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
+/datum/species/proc/handle_death(mob/living/carbon/human/H) //Handles any species-specific death events (such as dionaea nymph spawns).
return
// Used for traits and species that have special environmental effects.
-/datum/species/proc/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/proc/handle_environment_special(mob/living/carbon/human/H)
for(var/datum/trait/env_trait in env_traits)
env_trait.handle_environment_special(H)
return
-/datum/species/proc/handle_species_components(var/mob/living/carbon/human/H)
+/datum/species/proc/handle_species_components(mob/living/carbon/human/H)
SHOULD_NOT_OVERRIDE(TRUE)
//Xenochimera Species Component
@@ -620,24 +620,24 @@
SEND_SIGNAL(H, COMSIG_SHADEKIN_COMPONENT)
// Used to update alien icons for aliens.
-/datum/species/proc/handle_login_special(var/mob/living/carbon/human/H)
+/datum/species/proc/handle_login_special(mob/living/carbon/human/H)
return
// As above.
-/datum/species/proc/handle_logout_special(var/mob/living/carbon/human/H)
+/datum/species/proc/handle_logout_special(mob/living/carbon/human/H)
return
// Builds the HUD using species-specific icons and usable slots.
-/datum/species/proc/build_hud(var/mob/living/carbon/human/H)
+/datum/species/proc/build_hud(mob/living/carbon/human/H)
return
//Used by xenos understanding larvae and dionaea understanding nymphs.
-/datum/species/proc/can_understand(var/mob/other)
+/datum/species/proc/can_understand(mob/other)
return
// Called when using the shredding behavior, returning unarmed damage value
//CheckHighDamage returns the damage value of the attack if it meets at least the noted value
-/datum/species/proc/can_shred(var/mob/living/carbon/human/H, var/ignore_intent, var/checkhighdamage = 0)
+/datum/species/proc/can_shred(mob/living/carbon/human/H, ignore_intent, checkhighdamage = 0)
if(!ignore_intent && H.a_intent != I_HURT)
return 0
@@ -656,7 +656,7 @@
return shreds
// Called in life() when the mob has no client.
-/datum/species/proc/handle_npc(var/mob/living/carbon/human/H)
+/datum/species/proc/handle_npc(mob/living/carbon/human/H)
if(H.stat == CONSCIOUS && H.ai_holder)
if(H.resting)
H.resting = FALSE
@@ -672,23 +672,23 @@
return bad_swimmer
// Impliments different trails for species depending on if they're wearing shoes.
-/datum/species/proc/get_move_trail(var/mob/living/carbon/human/H)
+/datum/species/proc/get_move_trail(mob/living/carbon/human/H)
if( H.shoes || ( H.wear_suit && (H.wear_suit.body_parts_covered & FEET) ) )
return /obj/effect/decal/cleanable/blood/tracks/footprints
else
return move_trail
-/datum/species/proc/update_skin(var/mob/living/carbon/human/H)
+/datum/species/proc/update_skin(mob/living/carbon/human/H)
return
-/datum/species/proc/get_eyes(var/mob/living/carbon/human/H)
+/datum/species/proc/get_eyes(mob/living/carbon/human/H)
return
-/datum/species/proc/can_overcome_gravity(var/mob/living/carbon/human/H)
+/datum/species/proc/can_overcome_gravity(mob/living/carbon/human/H)
return FALSE
// Used for any extra behaviour when falling and to see if a species will fall at all.
-/datum/species/proc/can_fall(var/mob/living/carbon/human/H)
+/datum/species/proc/can_fall(mob/living/carbon/human/H)
return TRUE
// Used to find a special target for falling on, such as pouncing on someone from above.
@@ -696,14 +696,14 @@
return FALSE
// Used to override normal fall behaviour. Use only when the species does fall down a level.
-/datum/species/proc/fall_impact_special(var/mob/living/carbon/human/H, var/atom/A)
+/datum/species/proc/fall_impact_special(mob/living/carbon/human/H, atom/A)
return FALSE
// Allow species to display interesting information in the human stat panels
-/datum/species/proc/get_status_tab_items(var/mob/living/carbon/human/H)
+/datum/species/proc/get_status_tab_items(mob/living/carbon/human/H)
return ""
-/datum/species/proc/handle_water_damage(var/mob/living/carbon/human/H, var/amount = 0)
+/datum/species/proc/handle_water_damage(mob/living/carbon/human/H, amount = 0)
amount *= 1 - H.get_water_protection()
amount *= water_damage_mod
if(amount > 0)
@@ -762,10 +762,10 @@
/datum/species/proc/post_spawn_special(mob/living/carbon/human/H)
return
-/datum/species/proc/update_misc_tabs(var/mob/living/carbon/human/H)
+/datum/species/proc/update_misc_tabs(mob/living/carbon/human/H)
return
-/datum/species/proc/handle_base_eyes(var/mob/living/carbon/human/H, var/custom_base)
+/datum/species/proc/handle_base_eyes(mob/living/carbon/human/H, custom_base)
if(selects_bodytype && custom_base) // only bother if our src species datum allows bases and one is assigned
var/datum/species/S = GLOB.all_species[custom_base]
@@ -796,12 +796,12 @@
for(var/u_type in unarmed_types)
unarmed_attacks += new u_type()
-/datum/species/proc/apply_components(var/mob/living/carbon/human/H)
+/datum/species/proc/apply_components(mob/living/carbon/human/H)
if(LAZYLEN(species_component))
for(var/component in species_component)
H.LoadComponent(component)
-/datum/species/proc/produceCopy(var/list/traits, var/mob/living/carbon/human/H, var/custom_base, var/reset_dna = TRUE) // Traitgenes reset_dna flag required, or genes get reset on resleeve
+/datum/species/proc/produceCopy(list/traits, mob/living/carbon/human/H, custom_base, reset_dna = TRUE) // Traitgenes reset_dna flag required, or genes get reset on resleeve
ASSERT(src)
ASSERT(istype(H))
var/datum/species/new_copy = new src.type()
@@ -848,7 +848,7 @@
return new_copy
//We REALLY don't need to go through every variable. Doing so makes this lag like hell on 515
-/datum/species/proc/copy_variables(var/datum/species/S, var/list/whitelist)
+/datum/species/proc/copy_variables(datum/species/S, list/whitelist)
//List of variables to ignore, trying to copy type will runtime.
//var/list/blacklist = list(BLACKLISTED_COPY_VARS)
//Makes thorough copy of species datum.
diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm
index 677d64c816..9b35520482 100644
--- a/code/modules/mob/living/carbon/human/species/species_attack.dm
+++ b/code/modules/mob/living/carbon/human/species/species_attack.dm
@@ -25,7 +25,7 @@
sharp = TRUE
edge = TRUE
-/datum/unarmed_attack/claws/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/claws/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
attack_damage = CLAMP(attack_damage, 1, 5)
@@ -67,7 +67,7 @@
damage = 10
shredding = 0
-/datum/unarmed_attack/claws/strong/xeno/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/claws/strong/xeno/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
attack_damage = CLAMP(attack_damage, 1, 5)
@@ -119,7 +119,7 @@
attack_noun = list("body")
damage = 2
-/datum/unarmed_attack/slime_glomp/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
+/datum/unarmed_attack/slime_glomp/apply_effects(mob/living/carbon/human/user,mob/living/carbon/human/target,armour,attack_damage,zone)
..()
user.apply_stored_shock_to(target)
@@ -130,7 +130,7 @@
/datum/unarmed_attack/stomp/weak/get_unarmed_damage()
return damage
-/datum/unarmed_attack/stomp/weak/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/stomp/weak/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
user.visible_message(span_warning("[user] jumped up and down on \the [target]'s [affecting.name]!"))
playsound(user, attack_sound, 25, 1, -1)
@@ -144,7 +144,7 @@
sharp = TRUE
edge = TRUE
-/datum/unarmed_attack/bite/sharp/numbing/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/bite/sharp/numbing/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
attack_damage = CLAMP(attack_damage, 1, 5)
@@ -185,7 +185,7 @@
/datum/unarmed_attack/claws/shadekin
-/datum/unarmed_attack/claws/shadekin/apply_effects(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/claws/shadekin/apply_effects(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
..()
if(!(target == user))
var/datum/component/shadekin/SK = user.get_shadekin_component()
@@ -194,7 +194,7 @@
/datum/unarmed_attack/bite/sharp/shadekin
-/datum/unarmed_attack/bite/sharp/shadekin/apply_effects(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/bite/sharp/shadekin/apply_effects(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
..()
if(!(target == user))
var/datum/component/shadekin/SK = user.get_shadekin_component()
@@ -204,12 +204,12 @@
/datum/unarmed_attack/claws/chimera //special feral attack that gets stronger as they get angrier
sparring_variant_type = /datum/unarmed_attack/claws/chimera
-/datum/unarmed_attack/claws/chimera/get_unarmed_damage(var/mob/living/carbon/human/user)
+/datum/unarmed_attack/claws/chimera/get_unarmed_damage(mob/living/carbon/human/user)
if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS) && !user.get_feralness())//don't add extra species strength when pulling punches, but can't pull punches when feral
return damage
return user.species.unarmed_bonus + damage + min(user.get_feralness()/5, 40)
-/datum/unarmed_attack/claws/chimera/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
+/datum/unarmed_attack/claws/chimera/apply_effects(mob/living/carbon/human/user,mob/living/carbon/human/target,armour,attack_damage,zone)
..()
if(user.get_feralness() && !(target == user))
var/selfdamage = (min((user.get_feralness()/10), 20)-7.5)
diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm
index 3ec5e9bc5b..7f0e7d599c 100644
--- a/code/modules/mob/living/carbon/human/species/species_getters.dm
+++ b/code/modules/mob/living/carbon/human/species/species_getters.dm
@@ -1,31 +1,31 @@
-/datum/species/proc/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H)
+/datum/species/proc/get_valid_shapeshifter_forms(mob/living/carbon/human/H)
return list()
-/datum/species/proc/get_additional_examine_text(var/mob/living/carbon/human/H)
+/datum/species/proc/get_additional_examine_text(mob/living/carbon/human/H)
return
-/datum/species/proc/get_tail(var/mob/living/carbon/human/H)
+/datum/species/proc/get_tail(mob/living/carbon/human/H)
return tail
-/datum/species/proc/get_tail_animation(var/mob/living/carbon/human/H)
+/datum/species/proc/get_tail_animation(mob/living/carbon/human/H)
return tail_animation
-/datum/species/proc/get_tail_hair(var/mob/living/carbon/human/H)
+/datum/species/proc/get_tail_hair(mob/living/carbon/human/H)
return tail_hair
-/datum/species/proc/get_blood_mask(var/mob/living/carbon/human/H)
+/datum/species/proc/get_blood_mask(mob/living/carbon/human/H)
return blood_mask
-/datum/species/proc/get_damage_overlays(var/mob/living/carbon/human/H)
+/datum/species/proc/get_damage_overlays(mob/living/carbon/human/H)
return damage_overlays
-/datum/species/proc/get_damage_mask(var/mob/living/carbon/human/H)
+/datum/species/proc/get_damage_mask(mob/living/carbon/human/H)
return damage_mask
-/datum/species/proc/get_examine_name(var/mob/living/carbon/human/H)
+/datum/species/proc/get_examine_name(mob/living/carbon/human/H)
return name
-/datum/species/proc/get_icobase(var/mob/living/carbon/human/H, var/get_deform)
+/datum/species/proc/get_icobase(mob/living/carbon/human/H, get_deform)
if(base_species == name) //We don't have a custom base_species? Return the normal icobase.
return (get_deform ? deform : icobase)
else
@@ -38,22 +38,22 @@
/datum/species/proc/get_station_variant()
return name
-/datum/species/proc/get_race_key(var/mob/living/carbon/human/H)
+/datum/species/proc/get_race_key(mob/living/carbon/human/H)
return race_key
-/datum/species/proc/get_bodytype(var/mob/living/carbon/human/H)
+/datum/species/proc/get_bodytype(mob/living/carbon/human/H)
return name
-/datum/species/proc/get_knockout_message(var/mob/living/carbon/human/H)
+/datum/species/proc/get_knockout_message(mob/living/carbon/human/H)
return ((H && H.isSynthetic()) ? "encounters a hardware fault and suddenly reboots!" : knockout_message)
-/datum/species/proc/get_death_message(var/mob/living/carbon/human/H)
+/datum/species/proc/get_death_message(mob/living/carbon/human/H)
if(CONFIG_GET(flag/show_human_death_message))
return ((H && H.isSynthetic()) ? "gives one shrill beep before falling lifeless." : death_message)
else
return DEATHGASP_NO_MESSAGE
-/datum/species/proc/get_ssd(var/mob/living/carbon/human/H)
+/datum/species/proc/get_ssd(mob/living/carbon/human/H)
if(H)
if(H.looksSynthetic())
return "flashing a 'system offline' light"
@@ -62,7 +62,7 @@
else
return
-/datum/species/proc/get_blood_colour(var/mob/living/carbon/human/H)
+/datum/species/proc/get_blood_colour(mob/living/carbon/human/H)
if(H)
var/datum/robolimb/company = H.isSynthetic()
if(company)
@@ -70,7 +70,7 @@
else
return blood_color
-/datum/species/proc/get_blood_name(var/mob/living/carbon/human/H)
+/datum/species/proc/get_blood_name(mob/living/carbon/human/H)
if(H)
var/datum/robolimb/company = H.isSynthetic()
if(company)
@@ -78,13 +78,13 @@
else
return blood_name
-/datum/species/proc/get_virus_immune(var/mob/living/carbon/human/H)
+/datum/species/proc/get_virus_immune(mob/living/carbon/human/H)
return ((H && H.isSynthetic()) ? 1 : virus_immune)
-/datum/species/proc/get_flesh_colour(var/mob/living/carbon/human/H)
+/datum/species/proc/get_flesh_colour(mob/living/carbon/human/H)
return ((H && H.isSynthetic()) ? SYNTH_FLESH_COLOUR : flesh_color)
-/datum/species/proc/get_environment_discomfort(var/mob/living/carbon/human/H, var/msg_type)
+/datum/species/proc/get_environment_discomfort(mob/living/carbon/human/H, msg_type)
/* // Commented out because clothes should not prevent you from feeling cold if your body temperature has already dropped. You can absolutely feel cold through clothing, and feel too warm without clothing. ???
var/covered = 0 // Basic coverage can help.
@@ -114,7 +114,7 @@
to_chat(H, span_danger(discomfort_message))
return !!discomfort_message
-/datum/species/proc/get_random_name(var/gender)
+/datum/species/proc/get_random_name(gender)
if(!name_language)
if(gender == FEMALE)
return capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names))
@@ -130,17 +130,17 @@
return "unknown"
return species_language.get_random_name(gender)
-/datum/species/proc/get_vision_flags(var/mob/living/carbon/human/H)
+/datum/species/proc/get_vision_flags(mob/living/carbon/human/H)
return vision_flags
-/datum/species/proc/get_wing_hair(var/mob/living/carbon/human/H) //I have no idea what this is even used for other than teshari, but putting it in just in case.
+/datum/species/proc/get_wing_hair(mob/living/carbon/human/H) //I have no idea what this is even used for other than teshari, but putting it in just in case.
return wing_hair //Since the tail has it.
-/datum/species/proc/get_wing(var/mob/living/carbon/human/H)
+/datum/species/proc/get_wing(mob/living/carbon/human/H)
return wing
-/datum/species/proc/get_wing_animation(var/mob/living/carbon/human/H)
+/datum/species/proc/get_wing_animation(mob/living/carbon/human/H)
return wing_animation
-/datum/species/proc/get_perfect_belly_air_type(var/mob/living/carbon/human/H)
+/datum/species/proc/get_perfect_belly_air_type(mob/living/carbon/human/H)
if(ideal_air_type)
return ideal_air_type //Whatever we want
else
diff --git a/code/modules/mob/living/carbon/human/species/species_helpers.dm b/code/modules/mob/living/carbon/human/species/species_helpers.dm
index 79c152b915..b62d98b9fa 100644
--- a/code/modules/mob/living/carbon/human/species/species_helpers.dm
+++ b/code/modules/mob/living/carbon/human/species/species_helpers.dm
@@ -1,6 +1,6 @@
GLOBAL_LIST_EMPTY(stored_shock_by_ref)
-/mob/living/proc/apply_stored_shock_to(var/mob/living/target)
+/mob/living/proc/apply_stored_shock_to(mob/living/target)
if(GLOB.stored_shock_by_ref["\ref[src]"])
target.electrocute_act(GLOB.stored_shock_by_ref["\ref[src]"]*0.9, src)
GLOB.stored_shock_by_ref["\ref[src]"] = 0
diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
index de8d388501..65ae98f012 100644
--- a/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
+++ b/code/modules/mob/living/carbon/human/species/species_shapeshift.dm
@@ -17,53 +17,53 @@ GLOBAL_LIST_EMPTY(wrapped_species_by_ref)
base_species = SPECIES_HUMAN
selects_bodytype = SELECTS_BODYTYPE_SHAPESHIFTER
-/datum/species/shapeshifter/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_valid_shapeshifter_forms(mob/living/carbon/human/H)
return list(vanity_base_fit)|valid_transform_species
-/datum/species/shapeshifter/get_icobase(var/mob/living/carbon/human/H, var/get_deform)
+/datum/species/shapeshifter/get_icobase(mob/living/carbon/human/H, get_deform)
if(!H) return ..(null, get_deform)
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_icobase(H, get_deform)
-/datum/species/shapeshifter/get_race_key(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_race_key(mob/living/carbon/human/H)
return "[..()]-[GLOB.wrapped_species_by_ref["\ref[H]"]]"
-/datum/species/shapeshifter/get_bodytype(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_bodytype(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_bodytype(H)
-/datum/species/shapeshifter/get_blood_mask(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_blood_mask(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_blood_mask(H)
-/datum/species/shapeshifter/get_damage_mask(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_damage_mask(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_damage_mask(H)
-/datum/species/shapeshifter/get_damage_overlays(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_damage_overlays(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_damage_overlays(H)
-/datum/species/shapeshifter/get_tail(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_tail(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_tail(H)
-/datum/species/shapeshifter/get_tail_animation(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_tail_animation(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_tail_animation(H)
-/datum/species/shapeshifter/get_tail_hair(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/get_tail_hair(mob/living/carbon/human/H)
if(!H) return ..()
var/datum/species/S = GLOB.all_species[GLOB.wrapped_species_by_ref["\ref[H]"]]
return S.get_tail_hair(H)
-/datum/species/shapeshifter/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/handle_post_spawn(mob/living/carbon/human/H)
..()
GLOB.wrapped_species_by_ref["\ref[H]"] = base_species //VOREStation edit
@@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY(wrapped_species_by_ref)
shapeshifter_change_shape(new_species)
/* VOREStation edit - moved to species_shapeshift_vr.dm
-/mob/living/carbon/human/proc/shapeshifter_change_shape(var/new_species = null)
+/mob/living/carbon/human/proc/shapeshifter_change_shape(new_species = null)
if(!new_species)
return
@@ -187,7 +187,7 @@ GLOBAL_LIST_EMPTY(wrapped_species_by_ref)
return
shapeshifter_set_colour(new_skin)
-/mob/living/carbon/human/proc/shapeshifter_set_colour(var/new_skin)
+/mob/living/carbon/human/proc/shapeshifter_set_colour(new_skin)
r_skin = hex2num(copytext(new_skin, 2, 4))
g_skin = hex2num(copytext(new_skin, 4, 6))
@@ -225,20 +225,20 @@ GLOBAL_LIST_EMPTY(wrapped_species_by_ref)
return
shapeshifter_set_facial_color(new_fhair)
-/mob/living/carbon/human/proc/shapeshifter_set_hair_color(var/new_hair)
+/mob/living/carbon/human/proc/shapeshifter_set_hair_color(new_hair)
change_hair_color(hex2num(copytext(new_hair, 2, 4)), hex2num(copytext(new_hair, 4, 6)), hex2num(copytext(new_hair, 6, 8)))
-/mob/living/carbon/human/proc/shapeshifter_set_grad_color(var/new_grad)
+/mob/living/carbon/human/proc/shapeshifter_set_grad_color(new_grad)
change_grad_color(hex2num(copytext(new_grad, 2, 4)), hex2num(copytext(new_grad, 4, 6)), hex2num(copytext(new_grad, 6, 8)))
-/mob/living/carbon/human/proc/shapeshifter_set_facial_color(var/new_fhair)
+/mob/living/carbon/human/proc/shapeshifter_set_facial_color(new_fhair)
change_facial_hair_color(hex2num(copytext(new_fhair, 2, 4)), hex2num(copytext(new_fhair, 4, 6)), hex2num(copytext(new_fhair, 6, 8)))
// Replaces limbs and copies wounds
-/mob/living/carbon/human/proc/shapeshifter_change_species(var/new_species)
+/mob/living/carbon/human/proc/shapeshifter_change_species(new_species)
if(!species)
return
@@ -318,7 +318,7 @@ GLOBAL_LIST_EMPTY(wrapped_species_by_ref)
shapeshifter_set_eye_color(new_eyes)
-/mob/living/carbon/human/proc/shapeshifter_set_eye_color(var/new_eyes)
+/mob/living/carbon/human/proc/shapeshifter_set_eye_color(new_eyes)
var/list/new_color_rgb_list = hex2rgb(new_eyes)
// First, update mob vars.
@@ -559,7 +559,7 @@ GLOBAL_LIST_EMPTY(wrapped_species_by_ref)
update_icons_body()
update_hair()
-/mob/living/carbon/human/proc/shapeshifter_change_shape(var/new_species = null, var/visible = TRUE) //not sure if this needs to be moved to a separate file but
+/mob/living/carbon/human/proc/shapeshifter_change_shape(new_species = null, visible = TRUE) //not sure if this needs to be moved to a separate file but
if(!new_species)
return
diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm
index 300cf08f7a..ce0e454a79 100644
--- a/code/modules/mob/living/carbon/human/species/station/alraune.dm
+++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm
@@ -98,7 +98,7 @@
)
-/datum/species/alraune/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/alraune/handle_environment_special(mob/living/carbon/human/H)
if(H.inStasisNow()) // if they're in stasis, they won't need this stuff.
return
diff --git a/code/modules/mob/living/carbon/human/species/station/custom.dm b/code/modules/mob/living/carbon/human/species/station/custom.dm
index 8795fd7937..b348826a0e 100644
--- a/code/modules/mob/living/carbon/human/species/station/custom.dm
+++ b/code/modules/mob/living/carbon/human/species/station/custom.dm
@@ -81,7 +81,7 @@
var/datum/species/real = GLOB.all_species[base_species]
return real.race_key
-/datum/species/custom/produceCopy(var/list/traits, var/mob/living/carbon/human/H, var/custom_base, var/reset_dna = TRUE)
+/datum/species/custom/produceCopy(list/traits, mob/living/carbon/human/H, custom_base, reset_dna = TRUE)
. = ..(traits, H, custom_base,reset_dna)
H.maxHealth = H.species.total_health
H.hunger_rate = H.species.hunger_factor
@@ -90,11 +90,11 @@
//Called during handle_environment in Life() ticks.
// Return: Not used.
-/datum/species/custom/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/custom/handle_environment_special(mob/living/carbon/human/H)
return ..()
//Called when spawning to equip them with special things.
-/datum/species/custom/equip_survival_gear(var/mob/living/carbon/human/H, var/extendedtank = 0, var/comprehensive = 0)
+/datum/species/custom/equip_survival_gear(mob/living/carbon/human/H, extendedtank = 0, comprehensive = 0)
. = ..()
if(breath_type != GAS_O2)
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm
index 221b6e7800..9300b9b458 100644
--- a/code/modules/mob/living/carbon/human/species/station/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/station/golem.dm
@@ -32,7 +32,7 @@
genders = list(NEUTER)
-/datum/species/golem/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/golem/handle_post_spawn(mob/living/carbon/human/H)
if(H.mind)
H.mind.assigned_role = JOB_GOLEM
H.mind.special_role = JOB_GOLEM
diff --git a/code/modules/mob/living/carbon/human/species/station/greyYW.dm b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
index 1f87d3982e..a0ebe355c2 100644
--- a/code/modules/mob/living/carbon/human/species/station/greyYW.dm
+++ b/code/modules/mob/living/carbon/human/species/station/greyYW.dm
@@ -70,7 +70,7 @@
inherent_verbs = list(/mob/living/carbon/human/proc/telepathy)
-/datum/species/grey/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/grey/handle_environment_special(mob/living/carbon/human/H)
if(H.fire_stacks < 0 && H.get_water_protection() <= 0.5) // If over half your body is soaked, you're melting.
H.adjustFireLoss(max(0,(3 - (3 * H.get_water_protection())))) // Tripled because 0.5 is miniscule, and fire_stacks are capped in both directions.
diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm
index bb5f616b21..a23a04ccc9 100644
--- a/code/modules/mob/living/carbon/human/species/station/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm
@@ -57,7 +57,7 @@
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
)
-/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
+/datum/species/monkey/handle_npc(mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return
// Traitgenes Monkeys perform emotes based on their traits
@@ -93,7 +93,7 @@
/datum/species/monkey/get_random_name()
return "[lowertext(name)] ([rand(100,999)])"
-/datum/species/monkey/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/monkey/handle_post_spawn(mob/living/carbon/human/H)
if(!H.ckey)
H.can_be_drop_prey = TRUE
H.digest_leave_remains = TRUE
diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
index 4f2a3ff3b1..1c79921466 100644
--- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm
@@ -138,7 +138,7 @@
footstep = FOOTSTEP_MOB_SLIME
-/datum/species/shapeshifter/promethean/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/equip_survival_gear(mob/living/carbon/human/H)
var/boxtype = pick(list(/obj/item/storage/toolbox/lunchbox,
/obj/item/storage/toolbox/lunchbox/heart,
/obj/item/storage/toolbox/lunchbox/cat,
@@ -155,7 +155,7 @@
else
H.equip_to_slot_or_del(L, slot_in_backpack)
-/datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H, var/mob/living/target)
+/datum/species/shapeshifter/promethean/hug(mob/living/carbon/human/H, mob/living/target)
var/static/list/parent_handles = list("head", "r_hand", "l_hand", "mouth")
if(H.zone_sel.selecting in parent_handles)
@@ -180,7 +180,7 @@
span_notice("You glomp [target] to make [t_him] feel better!"))
H.apply_stored_shock_to(target)
-/datum/species/shapeshifter/promethean/handle_death(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/handle_death(mob/living/carbon/human/H)
if(!H)
return // Iono!
@@ -193,7 +193,7 @@
if(H)
H.gib()
-/datum/species/shapeshifter/promethean/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/handle_environment_special(mob/living/carbon/human/H)
var/healing = TRUE // Switches to FALSE if healing is not possible at all.
var/regen_brute = TRUE
var/regen_burn = TRUE
@@ -343,13 +343,13 @@
if((starve_mod <= 0.5 && (H.getHalLoss() + agony_to_apply) <= 90) || ((H.getHalLoss() + agony_to_apply) <= 70)) // Will max out at applying halloss at 70, unless they are starving; starvation regeneration will bring them up to a maximum of 120, the same amount of agony a human receives from three taser hits.
H.apply_damage(agony_to_apply, HALLOSS)
-/datum/species/shapeshifter/promethean/get_blood_colour(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/get_blood_colour(mob/living/carbon/human/H)
return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())
-/datum/species/shapeshifter/promethean/get_flesh_colour(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/get_flesh_colour(mob/living/carbon/human/H)
return (H ? rgb(H.r_skin, H.g_skin, H.b_skin) : ..())
-/datum/species/shapeshifter/promethean/get_additional_examine_text(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/get_additional_examine_text(mob/living/carbon/human/H)
if(!GLOB.stored_shock_by_ref["\ref[H]"])
return
diff --git a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
index 171a39c8eb..c3e954bff4 100644
--- a/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm
@@ -102,7 +102,7 @@
return
//Constructor allows passing the human to sync damages
-/mob/living/simple_mob/slime/promethean/Initialize(mapload, var/mob/living/carbon/human/H)
+/mob/living/simple_mob/slime/promethean/Initialize(mapload, mob/living/carbon/human/H)
. = ..()
if(!H)
return INITIALIZE_HINT_QDEL
@@ -157,20 +157,20 @@
healths.icon_state = "health7"
// All the damage and such to the blob translates to the human
-/mob/living/simple_mob/slime/promethean/apply_effect(var/effect = 0, var/effecttype = STUN, var/blocked = 0, var/check_protection = 1)
+/mob/living/simple_mob/slime/promethean/apply_effect(effect = 0, effecttype = STUN, blocked = 0, check_protection = 1)
if(humanform)
return humanform.apply_effect(effect, effecttype, blocked, check_protection)
else
return ..()
-/mob/living/simple_mob/slime/promethean/adjustBruteLoss(var/amount,var/include_robo)
+/mob/living/simple_mob/slime/promethean/adjustBruteLoss(amount,include_robo)
amount *= 0.75
if(humanform)
return humanform.adjustBruteLoss(amount)
else
return ..()
-/mob/living/simple_mob/slime/promethean/adjustFireLoss(var/amount,var/include_robo)
+/mob/living/simple_mob/slime/promethean/adjustFireLoss(amount,include_robo)
amount *= 2
if(humanform)
return humanform.adjustFireLoss(amount)
@@ -430,7 +430,7 @@
//Return our blob in case someone wants it
return blob
-/mob/living/carbon/human/proc/prommie_outofblob(var/mob/living/simple_mob/slime/promethean/blob, force)
+/mob/living/carbon/human/proc/prommie_outofblob(mob/living/simple_mob/slime/promethean/blob, force)
if(!istype(blob))
return
@@ -524,7 +524,7 @@
if(hat)
. += "They are wearing \a [hat]."
-/mob/living/simple_mob/slime/promethean/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/living/simple_mob/slime/promethean/say_understands(mob/other, datum/language/speaking = null)
if(speaking?.name == LANGUAGE_PROMETHEAN) //Promethean and sign are both nonverbal, so won't work with the same trick as below, so let's check for them
return TRUE
else if(speaking?.name == LANGUAGE_SIGN)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
index f3726b6cc8..cf3dcaeaf6 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
@@ -68,7 +68,7 @@
emote_see = list("shifts wetly","undulates placidly")
//Constructor allows passing the human to sync damages
-/mob/living/simple_mob/protean_blob/Initialize(mapload, var/mob/living/carbon/human/H)
+/mob/living/simple_mob/protean_blob/Initialize(mapload, mob/living/carbon/human/H)
. = ..()
if(!H)
stack_trace("URGENT: A protean blob was created without a humanform! src = [src] ckey = [ckey]! The blob has been deleted.")
@@ -174,7 +174,7 @@
healing.expire()
return ..()
-/mob/living/simple_mob/protean_blob/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/living/simple_mob/protean_blob/say_understands(mob/other, datum/language/speaking = null)
// The parent of this proc and its parent are SHAMS and should be rewritten, but I'm not up to it right now.
if(!speaking)
return TRUE // can understand common, they're like, a normal person thing
@@ -249,19 +249,19 @@
healths.icon_state = "health7"
// All the damage and such to the blob translates to the human
-/mob/living/simple_mob/protean_blob/apply_effect(var/effect = 0, var/effecttype = STUN, var/blocked = 0, var/check_protection = 1)
+/mob/living/simple_mob/protean_blob/apply_effect(effect = 0, effecttype = STUN, blocked = 0, check_protection = 1)
if(humanform)
return humanform.apply_effect(effect, effecttype, blocked, check_protection)
else
return ..()
-/mob/living/simple_mob/protean_blob/adjustBruteLoss(var/amount,var/include_robo)
+/mob/living/simple_mob/protean_blob/adjustBruteLoss(amount,include_robo)
if(humanform)
return humanform.adjustBruteLoss(amount)
else
return ..()
-/mob/living/simple_mob/protean_blob/adjustFireLoss(var/amount,var/include_robo)
+/mob/living/simple_mob/protean_blob/adjustFireLoss(amount,include_robo)
if(humanform)
return humanform.adjustFireLoss(amount)
else
@@ -392,7 +392,7 @@
else
..()
-/mob/living/simple_mob/protean_blob/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/protean_blob/attackby(obj/item/O, mob/user)
if(refactory && istype(O,/obj/item/stack/material))
var/obj/item/stack/material/S = O
var/substance = S.material.name
@@ -412,7 +412,7 @@
else
..()
-/mob/living/simple_mob/protean_blob/MouseDrop(var/atom/over_object)
+/mob/living/simple_mob/protean_blob/MouseDrop(atom/over_object)
if(ishuman(over_object) && usr == src && src.Adjacent(over_object))
var/mob/living/carbon/human/H = over_object
get_scooped(H, TRUE)
@@ -522,7 +522,7 @@
to_chat(src, span_warning("You must remain still to blobform!"))
//For some reason, there's no way to force drop all the mobs grabbed. This ought to fix that. And be moved elsewhere. Call with caution, doesn't handle cycles.
-/proc/remove_micros(var/source, var/mob/root)
+/proc/remove_micros(source, mob/root)
for(var/obj/item/I in source)
remove_micros(I, root) //Recursion. I'm honestly depending on there being no containment loop, but at the cost of performance that can be fixed too.
if(istype(I, /obj/item/holder))
@@ -540,7 +540,7 @@
else
to_chat(src, "You are not in RIG form.")
-/mob/living/carbon/human/proc/nano_outofblob(var/mob/living/simple_mob/protean_blob/blob, force)
+/mob/living/carbon/human/proc/nano_outofblob(mob/living/simple_mob/protean_blob/blob, force)
if(!istype(blob))
return
if(blob.loc == /obj/item/rig/protean)
@@ -629,11 +629,11 @@
else
to_chat(src, span_warning("You must remain still to reshape yourself!"))
-/mob/living/carbon/human/proc/nano_set_panel(var/client/C)
+/mob/living/carbon/human/proc/nano_set_panel(client/C)
if(C)
C.statpanel = "Protean"
-/mob/living/simple_mob/protean_blob/ClickOn(var/atom/A, var/params)
+/mob/living/simple_mob/protean_blob/ClickOn(atom/A, params)
if(istype(loc, /obj/item/rig/protean))
HardsuitClickOn(A)
..()
@@ -641,7 +641,7 @@
/mob/living/simple_mob/protean_blob/can_use_rig()
return 1
-/mob/living/simple_mob/protean_blob/HardsuitClickOn(var/atom/A, var/alert_ai = 0)
+/mob/living/simple_mob/protean_blob/HardsuitClickOn(atom/A, alert_ai = 0)
if(istype(loc, /obj/item/rig/protean))
var/obj/item/rig/protean/prig = loc
if(istype(prig) && !prig.offline && prig.selected_module)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
index 90f06222ca..a219fa2b20 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_powers.dm
@@ -259,7 +259,7 @@
////
// Blob Form
////
-/mob/living/carbon/human/proc/nano_blobform(var/forced)
+/mob/living/carbon/human/proc/nano_blobform(forced)
set name = "Toggle Blobform"
set desc = "Switch between amorphous and humanoid forms."
//set category = "Abilities.Protean"
@@ -314,7 +314,7 @@
////
// Rig Transform
////
-/mob/living/carbon/human/proc/nano_rig_transform(var/forced, var/devour = FALSE)
+/mob/living/carbon/human/proc/nano_rig_transform(forced, devour = FALSE)
set name = "Modify Form - Hardsuit"
set desc = "Allows a protean to retract its mass into its hardsuit module at will."
//set category = "Abilities.Protean"
@@ -810,14 +810,14 @@
return ..(locate(/obj/item/organ/internal/nano/refactory) in internal_organs)
//I hate this whole bit but I want proteans to be able to "die" and still be "alive" in their blob as a suit
-/mob/living/carbon/human/proc/nano_dead_check(var/mob/living/protie)
+/mob/living/carbon/human/proc/nano_dead_check(mob/living/protie)
if(istype(src.species, /datum/species/protean))
var/datum/species/protean/S = src.species
if(S.pseudodead)
return 1
return 0
-/mob/living/carbon/human/proc/nano_set_dead(var/num)
+/mob/living/carbon/human/proc/nano_set_dead(num)
if(istype(src.species, /datum/species/protean))
var/datum/species/protean/S = src.species
S.pseudodead = num
@@ -833,7 +833,7 @@
/obj/effect/protean_ability/proc/atom_button_text()
return src
-/obj/effect/protean_ability/Click(var/location, var/control, var/params)
+/obj/effect/protean_ability/Click(location, control, params)
var/list/clickprops = params2list(params)
var/opts = clickprops["shift"]
@@ -848,7 +848,7 @@
var/mob/living/simple_mob/protean_blob/blob = usr
do_ability(blob.humanform)
-/obj/effect/protean_ability/proc/do_ability(var/mob/living/L)
+/obj/effect/protean_ability/proc/do_ability(mob/living/L)
if(istype(L))
call(L,to_call)()
return 0
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm
index cce59ade56..397126fec3 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm
@@ -33,7 +33,7 @@
var/assimilated_rig
var/can_assimilate_rig = TRUE // CHOMPEdit
-/obj/item/rig/protean/relaymove(mob/user, var/direction)
+/obj/item/rig/protean/relaymove(mob/user, direction)
if(user.stat || user.stunned)
return
forced_move(direction, user, 0)
@@ -49,7 +49,7 @@
/obj/item/rig/protean/ex_act(severity)
return
-/obj/item/rig/protean/Initialize(mapload, var/mob/living/carbon/human/P)
+/obj/item/rig/protean/Initialize(mapload, mob/living/carbon/human/P)
if(P)
var/datum/species/protean/S = P.species
S.OurRig = src
@@ -73,7 +73,7 @@
. = ..()
-/obj/item/rig/proc/AssimilateBag(var/mob/living/carbon/human/P, var/spawned, var/obj/item/storage/backpack/B)
+/obj/item/rig/proc/AssimilateBag(mob/living/carbon/human/P, spawned, obj/item/storage/backpack/B)
if(istype(B,/obj/item/storage/backpack))
if(spawned)
B = P.back
@@ -373,7 +373,7 @@
if(istype(W,/obj/item/storage/backpack))
AssimilateBag(user,0,W)
-/obj/item/rig/protean/proc/make_alive(var/mob/living/carbon/human/H, var/partial)
+/obj/item/rig/protean/proc/make_alive(mob/living/carbon/human/H, partial)
if(H)
H.setToxLoss(0)
H.setOxyLoss(0)
@@ -429,7 +429,7 @@
/obj/item/rig/protean/cut_suit()
return //nope
-/obj/item/rig/protean/force_rest(var/mob/user)
+/obj/item/rig/protean/force_rest(mob/user)
wearer.lay_down()
to_chat(user, span_notice("\The [wearer] is now [wearer.resting ? "resting" : "getting up"]."))
@@ -510,7 +510,7 @@
return results
//Effectively a round about way of letting a Protean wear other rigs.
-/obj/item/rig/protean/proc/AssimilateRig(mob/user, var/obj/item/rig/R)
+/obj/item/rig/protean/proc/AssimilateRig(mob/user, obj/item/rig/R)
if(!can_assimilate_rig)
to_chat(user, span_warning("You can not place a rig into \the [src]"))
return
diff --git a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
index 9f6ba47bf4..eab56e7218 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean/protean_species.dm
@@ -146,7 +146,7 @@
for(var/path in powertypes)
GLOB.protean_abilities += new path()
-/datum/species/protean/create_organs(var/mob/living/carbon/human/H)
+/datum/species/protean/create_organs(mob/living/carbon/human/H)
var/obj/item/nif/saved_nif = H.nif
if(saved_nif)
H.nif.unimplant(H) //Needs reference to owner to unimplant right.
@@ -159,55 +159,55 @@
var/datum/species/real = GLOB.all_species[base_species]
return real.race_key
-/datum/species/protean/get_bodytype(var/mob/living/carbon/human/H)
+/datum/species/protean/get_bodytype(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_bodytype(H)
-/datum/species/protean/get_icobase(var/mob/living/carbon/human/H, var/get_deform)
+/datum/species/protean/get_icobase(mob/living/carbon/human/H, get_deform)
if(!H || base_species == name) return ..(null, get_deform)
var/datum/species/S = GLOB.all_species[base_species]
return S.get_icobase(H, get_deform)
-/datum/species/protean/get_valid_shapeshifter_forms(var/mob/living/carbon/human/H)
+/datum/species/protean/get_valid_shapeshifter_forms(mob/living/carbon/human/H)
var/list/protean_shapeshifting_forms = GLOB.playable_species.Copy() - SPECIES_PROMETHEAN //Removing the 'static' here fixes it returning an empty list. I do not know WHY that is the case, but it is for some reason. This needs to be investigated further, but this fixes the issue at the moment.
return protean_shapeshifting_forms
-/datum/species/protean/get_tail(var/mob/living/carbon/human/H)
+/datum/species/protean/get_tail(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_tail(H)
-/datum/species/protean/get_tail_animation(var/mob/living/carbon/human/H)
+/datum/species/protean/get_tail_animation(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_tail_animation(H)
-/datum/species/protean/get_tail_hair(var/mob/living/carbon/human/H)
+/datum/species/protean/get_tail_hair(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_tail_hair(H)
-/datum/species/protean/get_blood_mask(var/mob/living/carbon/human/H)
+/datum/species/protean/get_blood_mask(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_blood_mask(H)
-/datum/species/protean/get_damage_mask(var/mob/living/carbon/human/H)
+/datum/species/protean/get_damage_mask(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_damage_mask(H)
-/datum/species/protean/get_damage_overlays(var/mob/living/carbon/human/H)
+/datum/species/protean/get_damage_overlays(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_damage_overlays(H)
-/datum/species/protean/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/protean/handle_post_spawn(mob/living/carbon/human/H)
..()
H.synth_color = TRUE
-/datum/species/protean/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/protean/equip_survival_gear(mob/living/carbon/human/H)
..()
var/obj/item/stack/material/steel/metal_stack = new(null, 5)
@@ -232,16 +232,16 @@
new /obj/item/rig/protean(H,H)
-/datum/species/protean/hug(var/mob/living/carbon/human/H, var/mob/living/target)
+/datum/species/protean/hug(mob/living/carbon/human/H, mob/living/target)
return ..() //Wut
-/datum/species/protean/get_blood_colour(var/mob/living/carbon/human/H)
+/datum/species/protean/get_blood_colour(mob/living/carbon/human/H)
return rgb(80,80,80,230)
-/datum/species/protean/get_flesh_colour(var/mob/living/carbon/human/H)
+/datum/species/protean/get_flesh_colour(mob/living/carbon/human/H)
return rgb(80,80,80,230)
-/datum/species/protean/handle_death(var/mob/living/carbon/human/H)
+/datum/species/protean/handle_death(mob/living/carbon/human/H)
if(!H)
return //No body?
if(OurRig)
@@ -262,7 +262,7 @@
H.nano_rig_transform(1)
pseudodead = 1
-/datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/protean/handle_environment_special(mob/living/carbon/human/H)
if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.getMaxHealth()*0.5 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever)
return ..() //Any instakill shot runtimes since there are no organs after this. No point to not skip these checks, going to nullspace anyway.
@@ -289,10 +289,10 @@
return ..()
CHOMP Station removal end*/
-/datum/species/protean/get_additional_examine_text(var/mob/living/carbon/human/H)
+/datum/species/protean/get_additional_examine_text(mob/living/carbon/human/H)
return ..() //Hmm, what could be done here?
-/datum/species/protean/update_misc_tabs(var/mob/living/carbon/human/H)
+/datum/species/protean/update_misc_tabs(mob/living/carbon/human/H)
..()
var/list/L = list()
var/obj/item/organ/internal/nano/refactory/refactory = H.nano_get_refactory()
@@ -437,7 +437,7 @@ CHOMP Removal end*/
var/validstring = "VALID THROUGH END OF: "
var/registring = "REGISTRANT: "
-/obj/item/clothing/accessory/permit/nanotech/set_name(var/new_name)
+/obj/item/clothing/accessory/permit/nanotech/set_name(new_name)
owner = 1
if(new_name)
name += " ([new_name])"
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index db509e27b3..4b85e8b0d9 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -55,7 +55,7 @@
inherent_verbs = list(
/mob/living/carbon/human/proc/tie_hair)
-/datum/species/human/get_bodytype(var/mob/living/carbon/human/H)
+/datum/species/human/get_bodytype(mob/living/carbon/human/H)
return SPECIES_HUMAN
/datum/species/human/vatgrown
@@ -201,7 +201,7 @@
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair)
wikilink="https://wiki.chompstation13.net/index.php?title=Unathi" //CHOMPSedit: link to our wiki
-/datum/species/unathi/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/unathi/equip_survival_gear(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
@@ -321,7 +321,7 @@
)
inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, /mob/living/carbon/human/proc/tie_hair)
-/datum/species/tajaran/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/tajaran/equip_survival_gear(mob/living/carbon/human/H)
..()
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
@@ -524,7 +524,7 @@
)
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair)
-/datum/species/zaddat/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/zaddat/equip_survival_gear(mob/living/carbon/human/H)
..()
if(H.wear_suit) //get rid of job labcoats so they don't stop us from equipping the Shroud
qdel(H.wear_suit) //if you know how to gently set it in like, their backpack or whatever, be my guest
@@ -637,23 +637,23 @@
/datum/decl/emote/audible/multichirp
)
-/datum/species/diona/can_understand(var/mob/other)
+/datum/species/diona/can_understand(mob/other)
if(istype(other, /mob/living/carbon/alien/diona))
return TRUE
return FALSE
-/datum/species/diona/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/diona/equip_survival_gear(mob/living/carbon/human/H)
if(H.backbag == 1)
H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), slot_r_hand)
else
H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), slot_in_backpack)
-/datum/species/diona/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/diona/handle_post_spawn(mob/living/carbon/human/H)
H.gender = NEUTER
ADD_TRAIT(H, UNIQUE_MINDSTRUCTURE, ROUNDSTART_TRAIT)
return ..()
-/datum/species/diona/handle_death(var/mob/living/carbon/human/H)
+/datum/species/diona/handle_death(mob/living/carbon/human/H)
var/mob/living/carbon/alien/diona/S = new(get_turf(H))
@@ -682,7 +682,7 @@
H.visible_message(span_danger("\The [H] splits apart with a wet slithering noise!"))
-/datum/species/diona/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/diona/handle_environment_special(mob/living/carbon/human/H)
if(H.inStasisNow())
return
@@ -1032,7 +1032,7 @@
water_breather = TRUE
water_movement = -4 //Negates shallow. Halves deep.
-/datum/species/zaddat/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/zaddat/equip_survival_gear(mob/living/carbon/human/H)
.=..()
var/obj/item/storage/toolbox/lunchbox/survival/zaddat/L = new(get_turf(H))
if(H.backbag == 1)
@@ -1235,7 +1235,7 @@
footstep = FOOTSTEP_MOB_TESHARI
-/datum/species/teshari/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/teshari/equip_survival_gear(mob/living/carbon/human/H)
..()
//if(!(H.client?.prefs?.shoe_hater)) //CHOMPStation Edit. Disables shoe_hater. Un-indents below line by 1.
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)
@@ -1592,7 +1592,7 @@
climb_mult = 0.75
-/datum/species/spider/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/spider/handle_environment_special(mob/living/carbon/human/H)
if(H.stat == DEAD) // If they're dead they won't need anything.
return
@@ -1752,7 +1752,7 @@
species_component = list(/datum/component/xenochimera)
-/datum/species/xenochimera/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/handle_environment_special(mob/living/carbon/human/H)
//Cold/pressure effects when not regenerating
var/datum/gas_mixture/environment = H.loc.return_air()
var/pressure2 = environment.return_pressure()
diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm
index 0453f78e45..317bb3d286 100644
--- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities.dm
@@ -379,7 +379,7 @@
//Test to see if we can shred a mob. Some child override needs to pass us a target. We'll return it if you can.
/mob/living/var/vore_shred_time = 45 SECONDS
-/mob/living/proc/can_shred(var/mob/living/carbon/human/target)
+/mob/living/proc/can_shred(mob/living/carbon/human/target)
//Needs to have organs to be able to shred them.
if(!istype(target))
to_chat(src,span_warning("You can't shred that type of creature."))
@@ -414,7 +414,7 @@
return ..(G.affecting)
//PAIs, borgs, and animals don't need a grab or anything
-/mob/living/silicon/pai/can_shred(var/mob/living/carbon/human/target)
+/mob/living/silicon/pai/can_shred(mob/living/carbon/human/target)
if(!target)
var/list/choices = list()
for(var/mob/living/carbon/human/M in oviewers(1))
@@ -429,7 +429,7 @@
return ..(target)
-/mob/living/silicon/robot/can_shred(var/mob/living/carbon/human/target)
+/mob/living/silicon/robot/can_shred(mob/living/carbon/human/target)
if(!target)
var/list/choices = list()
for(var/mob/living/carbon/human/M in oviewers(1))
@@ -444,7 +444,7 @@
return ..(target)
-/mob/living/simple_mob/can_shred(var/mob/living/carbon/human/target)
+/mob/living/simple_mob/can_shred(mob/living/carbon/human/target)
if(!target)
var/list/choices = list()
for(var/mob/living/carbon/human/M in oviewers(1))
@@ -861,7 +861,7 @@
color = originator.appendage_color
..()
-/obj/item/projectile/beam/appendage/on_hit(var/atom/target)
+/obj/item/projectile/beam/appendage/on_hit(atom/target)
if(target == firer) //NO EATING YOURSELF
return
if(isliving(target))
@@ -1252,7 +1252,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/succubi_aphrodisiac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/succubi_aphrodisiac/affect_blood(mob/living/carbon/M, alien, removed)
if(prob(3))
M.show_message(span_warning("You feel funny, and fall in love with the person in front of you"))
M.say(pick("!blushes", "!moans", "!giggles", "!turns visibly red")) //using mob say so we dont have to define this dumb one time use emote that equates to just blushing -shark
@@ -1269,7 +1269,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/succubi_numbing/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/succubi_numbing/affect_blood(mob/living/carbon/M, alien, removed)
M.eye_blurry = max(M.eye_blurry, 10)
@@ -1289,7 +1289,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/succubi_paralize/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //will first keep it like that. lets see what it changes. if nothing, than I will rework the effect again
+/datum/reagent/succubi_paralize/affect_blood(mob/living/carbon/M, alien, removed) //will first keep it like that. lets see what it changes. if nothing, than I will rework the effect again
M.Weaken(20)
M.eye_blurry = max(M.eye_blurry, 10)
diff --git a/code/modules/mob/living/carbon/human/species/station/traits/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits/negative.dm
index da8a3e023d..cb98a59aeb 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits/negative.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits/negative.dm
@@ -47,7 +47,7 @@
custom_only = FALSE
banned_species = list(SPECIES_TESHARI, SPECIES_SHADEKIN_CREW) //These are already this weak.
-/datum/trait/negative/endurance_low/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/endurance_low/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.setMaxHealth(S.total_health)
@@ -59,7 +59,7 @@
custom_only = FALSE
banned_species = list(SPECIES_TESHARI) //These are already this weak.
-/datum/trait/negative/endurance_very_low/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/endurance_very_low/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.setMaxHealth(S.total_health)
@@ -140,7 +140,7 @@
cost = -2 //I feel like this should be higher, but let's see where it goes
excludes = list(/datum/trait/negative/boneless, /datum/trait/negative/boneless/major, /datum/trait/positive/densebones)
-/datum/trait/negative/hollow/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/hollow/apply(datum/species/S,mob/living/carbon/human/H)
..()
for(var/obj/item/organ/external/O in H.organs)
O.min_broken_damage *= 0.5
@@ -307,7 +307,7 @@
activation_message="You can't seem to see anything."
primitive_expression_messages=list("stumbles aimlessly.")
-/datum/trait/negative/blindness/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/trait/negative/blindness/handle_environment_special(mob/living/carbon/human/H)
H.sdisabilities |= sdisability //no matter what you do, the blindess still comes for you // Traitgenes tweaked to be consistant with other gene traits by using var
/datum/trait/negative/agoraphobia
@@ -351,7 +351,7 @@
cost = -12 // Similar to Very Low Endurance, this straight up will require you NEVER getting in a fight. This is extremely crippling. I salute the madlad that takes this.
var_changes = list("total_health" = 25)
-/datum/trait/negative/endurance_glass/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/endurance_glass/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.setMaxHealth(S.total_health)
@@ -477,7 +477,7 @@
custom_only = FALSE
excludes = list(/datum/trait/negative/bad_shooter)
-/datum/trait/negative/thick_digits/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/thick_digits/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/thickdigits)
@@ -646,7 +646,7 @@
limb_health = 0.5
excludes = list(/datum/trait/negative/hollow, /datum/trait/positive/densebones, /datum/trait/negative/boneless)
-/datum/trait/negative/boneless/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/boneless/apply(datum/species/S,mob/living/carbon/human/H)
..()
for(var/obj/item/organ/external/ex_organ in H.organs)
ex_organ.cannot_break = TRUE
@@ -695,7 +695,7 @@
var_changes = list("emp_dmg_mod" = 1.3, "emp_stun_mod" = 1.3, "emp_sensitivity" = (EMP_BLIND | EMP_DEAFEN | EMP_BRUTE_DMG | EMP_BURN_DMG | EMP_CONFUSE))
excludes = list(/datum/trait/negative/poorconstruction, /datum/trait/positive/emp_resist, /datum/trait/positive/emp_resist_major)
-/datum/trait/negative/faultwires/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/faultwires/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/empweakness)
@@ -708,7 +708,7 @@
var_changes = list("emp_dmg_mod" = 1.6, "emp_stun_mod" = 1.6, "emp_sensitivity" = (EMP_BLIND | EMP_DEAFEN | EMP_BRUTE_DMG | EMP_BURN_DMG | EMP_CONFUSE | EMP_WEAKEN))
excludes = list(/datum/trait/negative/faultwires, /datum/trait/positive/emp_resist, /datum/trait/positive/emp_resist_major)
-/datum/trait/negative/poorconstruction/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/poorconstruction/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/majorempweakness)
@@ -785,11 +785,11 @@
activation_message="Something feels odd..."
*/
-/datum/trait/negative/medical_allergy/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/medical_allergy/apply(datum/species/S,mob/living/carbon/human/H)
S.medallergens |= medallergen
..()
-/datum/trait/negative/medical_allergy/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/medical_allergy/unapply(datum/species/S,mob/living/carbon/human/H)
S.medallergens &= ~medallergen
..()
diff --git a/code/modules/mob/living/carbon/human/species/station/traits/negative_genes.dm b/code/modules/mob/living/carbon/human/species/station/traits/negative_genes.dm
index 0be666133a..46684be6f9 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits/negative_genes.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits/negative_genes.dm
@@ -80,7 +80,7 @@
sdisability=BLIND
activation_message="You can't seem to see anything."
-/datum/trait/negative/disability_blind/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/trait/negative/disability_blind/handle_environment_special(mob/living/carbon/human/H)
H.sdisabilities |= sdisability // In space, no one can hear you scream
*/
@@ -98,7 +98,7 @@
activation_message="Your throat feels strange..."
primitive_expression_messages=list("screams without a sound.")
-/datum/trait/negative/disability_mute/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/trait/negative/disability_mute/handle_environment_special(mob/living/carbon/human/H)
H.sdisabilities |= sdisability // In space, no one can hear you scream
/datum/trait/negative/disability_deaf
@@ -114,10 +114,10 @@
activation_message="It's kinda quiet."
primitive_expression_messages=list("stares blanky.")
-/datum/trait/negative/disability_deaf/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/trait/negative/disability_deaf/handle_environment_special(mob/living/carbon/human/H)
H.sdisabilities |= sdisability // In space, I can't hear shit
-/datum/trait/negative/disability_deaf/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/negative/disability_deaf/apply(datum/species/S,mob/living/carbon/human/H)
. = ..()
H.ear_deaf = 1
/* //Not used here, used downstream.
diff --git a/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm
index d6d7396db7..53af4d3cc1 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm
@@ -234,7 +234,7 @@
var_changes = list("organic_food_coeff" = 0, "bloodsucker" = TRUE) //The verb is given in human.dm
excludes = list(/datum/trait/neutral/bloodsucker_freeform, /datum/trait/positive/bloodsucker_plus) //YW edit
-/datum/trait/neutral/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/bloodsucker/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/bloodsuck)
@@ -255,7 +255,7 @@
var_changes = list("bloodsucker" = TRUE)
excludes = list(/datum/trait/neutral/bloodsucker, /datum/trait/positive/bloodsucker_plus) //YW edit
-/datum/trait/neutral/bloodsucker_freeform/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/bloodsucker_freeform/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/bloodsuck)
@@ -269,7 +269,7 @@
custom_only = FALSE
excludes = list(/datum/trait/neutral/electrovore_freeform)
-/datum/trait/neutral/electrovore/apply(var/datum/species/S, var/mob/living/carbon/human/human)
+/datum/trait/neutral/electrovore/apply(datum/species/S, mob/living/carbon/human/human)
..()
ADD_TRAIT(human, TRAIT_ELECTROVORE, ROUNDSTART_TRAIT)
ADD_TRAIT(human, TRAIT_ELECTROVORE_OBLIGATE, ROUNDSTART_TRAIT)
@@ -284,7 +284,7 @@
custom_only = FALSE
excludes = list(/datum/trait/neutral/electrovore)
-/datum/trait/neutral/electrovore_freeform/apply(var/datum/species/S, var/mob/living/carbon/human/human)
+/datum/trait/neutral/electrovore_freeform/apply(datum/species/S, mob/living/carbon/human/human)
..()
ADD_TRAIT(human, TRAIT_ELECTROVORE, ROUNDSTART_TRAIT)
@@ -294,7 +294,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/succubus_drain/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/succubus_drain)
add_verb(H, /mob/living/carbon/human/proc/succubus_drain_finalize)
@@ -325,7 +325,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/venom_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/venom_bite/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/injection)
H.trait_injection_reagents += REAGENT_ID_MICROCILLIN // get small
@@ -358,7 +358,7 @@
"appendage_alt_setting" = list(TRAIT_PREF_TYPE_BOOLEAN, "Throw yourself?", TRAIT_VAREDIT_TARGET_MOB, FALSE),)
custom_only = FALSE
-/datum/trait/neutral/long_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/long_vore/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/long_vore)
@@ -368,7 +368,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/feeder/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/slime_feed)
@@ -379,7 +379,7 @@
custom_only = FALSE
has_preferences = list("stuffing_feeder" = list(TRAIT_PREF_TYPE_BOOLEAN, "Default", TRAIT_VAREDIT_TARGET_MOB, FALSE))
-/datum/trait/neutral/stuffing_feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/stuffing_feeder/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/toggle_stuffing_mode)
@@ -389,7 +389,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/hard_vore/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/shred_limb)
@@ -414,7 +414,7 @@
activation_message="Your stomach feels strange."
primitive_expression_messages=list("eats something off the ground.")
-/datum/trait/neutral/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/trashcan/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/eat_trash)
add_verb(H, /mob/living/proc/toggle_trash_catching)
@@ -441,7 +441,7 @@
activation_message="Your stomach feels strange."
primitive_expression_messages=list("picks up and eats something shiny off the ground.")
-/datum/trait/neutral/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/gem_eater/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/eat_minerals)
@@ -491,12 +491,12 @@
activation_message="Your eyes feel brighter."
primitive_expression_messages=list("eyes twinkle.")
-/datum/trait/neutral/glowing_eyes/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/glowing_eyes/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/toggle_eye_glow)
// Traitgenes Made into a genetrait
-/datum/trait/neutral/glowing_eyes/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/glowing_eyes/unapply(datum/species/S,mob/living/carbon/human/H)
..()
if(!(/mob/living/carbon/human/proc/toggle_eye_glow in S.inherent_verbs))
remove_verb(H,/mob/living/carbon/human/proc/toggle_eye_glow)
@@ -516,13 +516,13 @@
activation_message="You feel enlightened."
primitive_expression_messages=list("shines and sparkles.")
-/datum/trait/neutral/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/glowing_body/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/glow_toggle)
add_verb(H, /mob/living/proc/glow_color)
// Traitgenes Made into a genetrait
-/datum/trait/neutral/glowing_body/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/glowing_body/unapply(datum/species/S,mob/living/carbon/human/H)
..()
if(!(/mob/living/proc/glow_toggle in S.inherent_verbs))
remove_verb(H,/mob/living/proc/glow_toggle)
@@ -543,12 +543,12 @@
activation_message="Something feels odd..."
-/datum/trait/neutral/allergy/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/allergy/apply(datum/species/S,mob/living/carbon/human/H)
S.allergens |= allergen
..()
// Traitgenes edit begin - Made ALL ALLERGYS into gene traits
-/datum/trait/neutral/allergy/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/allergy/unapply(datum/species/S,mob/living/carbon/human/H)
S.allergens &= ~allergen
..()
// Traitgenes edit end
@@ -644,7 +644,7 @@
custom_only = FALSE
var/reaction = AG_TOX_DMG
-/datum/trait/neutral/allergy_reaction/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/allergy_reaction/apply(datum/species/S,mob/living/carbon/human/H)
S.allergen_reaction ^= reaction
..()
@@ -873,12 +873,12 @@
activation_message="Your eyes feel strange..."
-/datum/trait/neutral/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/colorblind/mono/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/colorblind_monochrome)
// Traitgenes Made into a gene trait
-/datum/trait/neutral/colorblind/mono/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/colorblind/mono/unapply(datum/species/S,mob/living/carbon/human/H)
..()
H.remove_a_modifier_of_type(/datum/modifier/trait/colorblind_monochrome)
@@ -894,12 +894,12 @@
activation_message="Your eyes feel strange..."
-/datum/trait/neutral/colorblind/para_vulp/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/colorblind/para_vulp/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/colorblind_vulp)
// Traitgenes Made into a gene trait
-/datum/trait/neutral/colorblind/para_vulp/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/colorblind/para_vulp/unapply(datum/species/S,mob/living/carbon/human/H)
..()
H.remove_a_modifier_of_type(/datum/modifier/trait/colorblind_vulp)
@@ -915,12 +915,12 @@
activation_message="Your eyes feel strange..."
-/datum/trait/neutral/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/colorblind/para_taj/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/colorblind_taj)
// Traitgenes Made into a gene trait
-/datum/trait/neutral/colorblind/para_taj/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/colorblind/para_taj/unapply(datum/species/S,mob/living/carbon/human/H)
..()
H.remove_a_modifier_of_type(/datum/modifier/trait/colorblind_taj)
@@ -934,7 +934,7 @@
var_changes = list("icon_scale_y" = 1.09)
excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest)
-/datum/trait/neutral/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/taller/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -947,7 +947,7 @@
var_changes = list("icon_scale_y" = 1.05)
excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest)
-/datum/trait/neutral/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/tall/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -960,7 +960,7 @@
var_changes = list("icon_scale_y" = 1.15)
excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/taller, /datum/trait/neutral/short, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest)
-/datum/trait/neutral/tallest/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/tallest/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -973,7 +973,7 @@
var_changes = list("icon_scale_y" = 0.95)
excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/shorter, /datum/trait/neutral/shortest)
-/datum/trait/neutral/short/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/short/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -986,7 +986,7 @@
var_changes = list("icon_scale_y" = 0.915)
excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shortest)
-/datum/trait/neutral/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/shorter/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -999,7 +999,7 @@
var_changes = list("icon_scale_y" = 0.85)
excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/tallest, /datum/trait/neutral/short, /datum/trait/neutral/shorter)
-/datum/trait/neutral/shortest/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/shortest/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -1012,7 +1012,7 @@
var_changes = list("icon_scale_x" = 1.095)
excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/thin, /datum/trait/neutral/thinner)
-/datum/trait/neutral/obese/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/obese/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -1025,7 +1025,7 @@
var_changes = list("icon_scale_x" = 1.054)
excludes = list(/datum/trait/neutral/obese, /datum/trait/neutral/thin, /datum/trait/neutral/thinner)
-/datum/trait/neutral/fat/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/fat/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -1038,7 +1038,7 @@
var_changes = list("icon_scale_x" = 0.945)
excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/obese, /datum/trait/neutral/thinner)
-/datum/trait/neutral/thin/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/thin/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -1051,7 +1051,7 @@
var_changes = list("icon_scale_x" = 0.905)
excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/obese, /datum/trait/neutral/thin)
-/datum/trait/neutral/thinner/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/thinner/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.update_transform()
@@ -1067,7 +1067,7 @@
activation_message="Your mind feels more powerful."
-/datum/trait/neutral/dominate_predator/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/dominate_predator/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/proc/dominate_predator)
@@ -1089,7 +1089,7 @@
activation_message="Your mind feels more powerful."
-/datum/trait/neutral/dominate_prey/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/dominate_prey/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/dominate_prey)
@@ -1111,7 +1111,7 @@
activation_message="Your mind feels more fluid."
-/datum/trait/neutral/submit_to_prey/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/submit_to_prey/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/lend_prey_control)
@@ -1127,7 +1127,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/vertical_nom/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/vertical_nom/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/vertical_nom)
@@ -1223,7 +1223,7 @@
can_take = SYNTHETICS
has_preferences = list("pain" = list(TRAIT_PREF_TYPE_BOOLEAN, "Enabled on spawn", TRAIT_VAREDIT_TARGET_MOB, FALSE))
-/datum/trait/neutral/synth_cosmetic_pain/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/synth_cosmetic_pain/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
add_verb(H, /mob/living/carbon/human/proc/toggle_pain_module)
@@ -1464,7 +1464,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/nyctophobia/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/nyctophobia/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= NYCTOPHOBIA
@@ -1474,7 +1474,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/arachnophobia/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/arachnophobia/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= ARACHNOPHOBIA
@@ -1484,7 +1484,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/hemophobia/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/hemophobia/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= HEMOPHOBIA
@@ -1494,7 +1494,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/thalassophobia/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/thalassophobia/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= THALASSOPHOBIA
@@ -1504,7 +1504,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/clasutrophobia_minor/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/clasutrophobia_minor/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= CLAUSTROPHOBIA_MINOR
@@ -1514,7 +1514,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/clasutrophobia_major/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/clasutrophobia_major/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= CLAUSTROPHOBIA_MAJOR
@@ -1524,7 +1524,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/anatidaephobia/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/anatidaephobia/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= ANATIDAEPHOBIA
@@ -1534,7 +1534,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/agraviaphobia/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/neutral/agraviaphobia/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
..()
H.phobias |= AGRAVIAPHOBIA
@@ -1551,7 +1551,7 @@
"pickupable" = list(TRAIT_PREF_TYPE_BOOLEAN, "Can be picked up", TRAIT_NO_VAREDIT_TARGET, FALSE)*/)
added_component_path = /datum/component/gargoyle
-/datum/trait/neutral/gargoyle/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/gargoyle/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
var/datum/component/gargoyle/G = H.GetComponent(added_component_path)
if(trait_prefs)
@@ -1560,7 +1560,7 @@
G.identifier = lowertext(trait_prefs["identifier"])
G.adjective = lowertext(trait_prefs["adjective"])
-/datum/trait/neutral/gargoyle/apply_sanitization_to_string(var/pref, var/input)
+/datum/trait/neutral/gargoyle/apply_sanitization_to_string(pref, input)
if (has_preferences[pref][1] != TRAIT_PREF_TYPE_STRING || length(input) <= 0)
return
input = sanitizeSafe(input, 25)
@@ -1612,7 +1612,7 @@
custom_only = FALSE
has_preferences = list("biting_toggle" = list(TRAIT_PREF_TYPE_BOOLEAN, "Enabled on spawn", TRAIT_NO_VAREDIT_TARGET, TRUE))
-/datum/trait/neutral/patting_defence/apply(var/datum/species/S, var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/patting_defence/apply(datum/species/S, mob/living/carbon/human/H, list/trait_prefs)
..()
if(trait_prefs && trait_prefs["biting_toggle"])
H.touch_reaction_flags |= SPECIES_TRAIT_PATTING_DEFENCE
@@ -1626,7 +1626,7 @@
has_preferences = list("bubble_toggle" = list(TRAIT_PREF_TYPE_BOOLEAN, "Dodge physical contact on spawn", TRAIT_NO_VAREDIT_TARGET, TRUE),
"pickup_dodge_toggle" = list(TRAIT_PREF_TYPE_BOOLEAN, "Dodge pickup attempts on spawn", TRAIT_NO_VAREDIT_TARGET, TRUE))
-/datum/trait/neutral/personal_space/apply(var/datum/species/S, var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/personal_space/apply(datum/species/S, mob/living/carbon/human/H, list/trait_prefs)
..()
if(trait_prefs && trait_prefs["bubble_toggle"])
H.touch_reaction_flags |= SPECIES_TRAIT_PERSONAL_BUBBLE
@@ -1643,7 +1643,7 @@
multiple_choice = list(REAGENT_ID_ETHANOL, REAGENT_ID_CAPSAICIN, REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_STOXIN, REAGENT_ID_RAINBOWTOXIN, REAGENT_ID_PARALYSISTOXIN, REAGENT_ID_PAINENZYME)
has_preferences = list("Reagent" = list(TRAIT_PREF_TYPE_LIST, "Skin Reagent", TRAIT_NO_VAREDIT_TARGET, REAGENT_ID_ETHANOL))
-/datum/trait/neutral/skin_reagents/apply(var/datum/species/S, var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/skin_reagents/apply(datum/species/S, mob/living/carbon/human/H, list/trait_prefs)
..()
if(trait_prefs && trait_prefs["Reagent"])
H.skin_reagent = trait_prefs["Reagent"]
@@ -1655,7 +1655,7 @@
custom_only = FALSE
banned_species = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW)
-/datum/trait/neutral/colour_changing_eyes/apply(var/datum/species/S, var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/colour_changing_eyes/apply(datum/species/S, mob/living/carbon/human/H, list/trait_prefs)
..()
add_verb(H, /mob/living/carbon/human/proc/shapeshifter_select_eye_colour)
@@ -1829,7 +1829,7 @@
has_preferences = list("waddler" = list(TRAIT_PREF_TYPE_BOOLEAN, "Waddle on Spawn", TRAIT_NO_VAREDIT_TARGET, TRUE))
added_component_path = /datum/component/waddle_trait
-/datum/trait/neutral/waddle/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/waddle/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
var/datum/component/waddle_trait/G = H.GetComponent(added_component_path)
if(trait_prefs)
@@ -1878,7 +1878,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/hide/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/hide/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H,/mob/living/proc/hide)
@@ -1923,7 +1923,7 @@
desc = "Your reflexes are quick enough to react to slippery surfaces. You are not immune though."
cost = 0
-/datum/trait/neutral/slip_reflex/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/slip_reflex/apply(datum/species/S,mob/living/carbon/human/H)
..()
ADD_TRAIT(H, SLIP_REFLEX_TRAIT, ROUNDSTART_TRAIT)
@@ -1935,7 +1935,7 @@
added_component_path = /datum/component/radiation_effects
excludes = list(/datum/trait/positive/radioactive_heal)
-/datum/trait/neutral/glowing_radiation/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/glowing_radiation/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
var/datum/component/radiation_effects/G = H.GetComponent(added_component_path)
if(trait_prefs)
@@ -1965,7 +1965,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/slobber/apply(var/datum/species/S, var/mob/living/carbon/human/human)
+/datum/trait/neutral/slobber/apply(datum/species/S, mob/living/carbon/human/human)
..()
ADD_TRAIT(human, TRAIT_SLOBBER, ROUNDSTART_TRAIT)
diff --git a/code/modules/mob/living/carbon/human/species/station/traits/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits/positive.dm
index efbce92bea..a56665d0b9 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits/positive.dm
@@ -26,7 +26,7 @@
banned_species = list(SPECIES_ALRAUNE, SPECIES_SHADEKIN_CREW, SPECIES_TESHARI, SPECIES_TAJARAN, SPECIES_DIONA, SPECIES_UNATHI, SPECIES_VASILISSAN, SPECIES_XENOCHIMERA, SPECIES_VOX) //i assume if a dev made your base slowdown different then you shouldn't have this.
excludes = list(/datum/trait/positive/speed_fast) // olympic sprinters don't naruto run
-/datum/trait/positive/unusual_running/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/unusual_running/apply(datum/species/S,mob/living/carbon/human/H)
..()
ADD_TRAIT(H, UNUSUAL_RUNNING, ROUNDSTART_TRAIT)
@@ -106,7 +106,7 @@
excludes = list(/datum/trait/positive/endurance_very_high, /datum/trait/positive/endurance_extremely_high)
banned_species = list(SPECIES_TESHARI, SPECIES_UNATHI, SPECIES_SHADEKIN_CREW) //Either not applicable or buffs are too strong
-/datum/trait/positive/endurance_high/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/endurance_high/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.setMaxHealth(S.total_health)
@@ -208,7 +208,7 @@
custom_only = FALSE
has_preferences = list("flight_vore" = list(TRAIT_PREF_TYPE_BOOLEAN, "Flight Vore enabled on spawn", TRAIT_VAREDIT_TARGET_MOB, FALSE))
-/datum/trait/positive/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/winged_flight/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/proc/flying_toggle)
add_verb(H, /mob/living/proc/flying_vore_toggle)
@@ -227,7 +227,7 @@
desc = "Your saliva has especially strong antiseptic properties that can be used to heal small wounds."
cost = 1
-/datum/trait/positive/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/antiseptic_saliva/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/lick_wounds)
@@ -257,7 +257,7 @@
added_component_path = /datum/component/weaver
excludes = list(/datum/trait/positive/cocoon_tf)
-/datum/trait/positive/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/positive/weaver/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
var/datum/component/weaver/W = H.GetComponent(added_component_path)
if(S.get_bodytype() == SPECIES_VASILISSAN)
@@ -277,7 +277,7 @@
custom_only = FALSE
excludes = list(/datum/trait/positive/good_swimmer, /datum/trait/negative/bad_swimmer, /datum/trait/positive/aquatic/plus)
-/datum/trait/positive/aquatic/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/aquatic/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/water_stealth)
add_verb(H, /mob/living/carbon/human/proc/underwater_devour)
@@ -300,7 +300,7 @@
custom_only = FALSE
excludes = list(/datum/trait/positive/weaver)
-/datum/trait/positive/cocoon_tf/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/cocoon_tf/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/enter_cocoon)
@@ -385,7 +385,7 @@
// This feels jank, but it's the cleanest way I could do TRAIT_VARCHANGE_LESS_BETTER while having a boolean var change
// Alternate would've been banned_species = list(SPECIES_TAJARAN, SPECIES_VASSILISIAN)
// Opted for this as it's "future proof"
-/datum/trait/positive/wall_climber_pro/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/wall_climber_pro/apply(datum/species/S,mob/living/carbon/human/H)
..()
S.can_climb = TRUE
@@ -412,7 +412,7 @@
has_preferences = list("pass_table" = list(TRAIT_PREF_TYPE_BOOLEAN, "On spawn", TRAIT_NO_VAREDIT_TARGET, TRUE))
-/datum/trait/positive/table_passer/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/positive/table_passer/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
if(trait_prefs?["pass_table"] || !trait_prefs)
H.pass_flags |= PASSTABLE
@@ -456,11 +456,11 @@
hidden = FALSE
activation_message="Your body feels mundane."
-/datum/trait/positive/rad_immune/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/rad_immune/apply(datum/species/S,mob/living/carbon/human/H)
..()
ADD_TRAIT(H, TRAIT_RADIMMUNE, ROUNDSTART_TRAIT)
-/datum/trait/positive/rad_immune/unapply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/rad_immune/unapply(datum/species/S,mob/living/carbon/human/H)
..()
REMOVE_TRAIT(H, TRAIT_RADIMMUNE, ROUNDSTART_TRAIT)
@@ -582,7 +582,7 @@
cost = 3
excludes = list(/datum/trait/negative/hollow, /datum/trait/negative/boneless, /datum/trait/negative/boneless/major)
-/datum/trait/positive/densebones/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/densebones/apply(datum/species/S,mob/living/carbon/human/H)
..()
for(var/obj/item/organ/external/organ in H.organs)
if(istype(organ))
@@ -664,7 +664,7 @@
var_changes = list("stun_mod" = 0.5, "weaken_mod" = 0.5) // Stuns are 50% as effective - a stun of 3 seconds will be 2 seconds due to rounding up. Set to 0.5 to be in-line with the trait's description. (Weaken is used alongside stun to prevent aiming.)
excludes = list(/datum/trait/negative/lightweight_light, /datum/trait/negative/lightweight)
-/datum/trait/positive/heavyweight/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/heavyweight/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.mob_size = MOB_LARGE
H.mob_bump_flag = HEAVY
@@ -690,7 +690,7 @@
can_take = ORGANICS
var/last_adrenaline_rush
-/datum/trait/positive/adrenaline_rush/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/trait/positive/adrenaline_rush/handle_environment_special(mob/living/carbon/human/H)
if(!(H.health<0))
return
if(last_adrenaline_rush && last_adrenaline_rush + (30 MINUTES) > world.time)
@@ -768,7 +768,7 @@
desc = "Allows you to sting your victim with a smalll amount of poison"
cost = 1
-/datum/trait/positive/insect_sting/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/insect_sting/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H,/mob/living/proc/insect_sting)
@@ -793,7 +793,7 @@
var_changes = list("total_health" = 150)
excludes = list(/datum/trait/positive/endurance_high, /datum/trait/positive/endurance_extremely_high)
-/datum/trait/positive/endurance_very_high/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/endurance_very_high/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.setMaxHealth(S.total_health)
@@ -804,7 +804,7 @@
var_changes = list("total_health" = 175)
excludes = list(/datum/trait/positive/endurance_high, /datum/trait/positive/endurance_very_high)
-/datum/trait/positive/endurance_extremely_high/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/endurance_extremely_high/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.setMaxHealth(S.total_health)
@@ -856,7 +856,7 @@
var_changes = list("organic_food_coeff" = 0.5) // Hopefully this works???
excludes = list(/datum/trait/neutral/bloodsucker)
-/datum/trait/positive/bloodsucker_plus/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/bloodsucker_plus/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H,/mob/living/carbon/human/proc/bloodsuck)
@@ -866,7 +866,7 @@
cost = 1
custom_only = FALSE
-/datum/trait/positive/toxin_gut/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/toxin_gut/apply(datum/species/S,mob/living/carbon/human/H)
..()
ADD_TRAIT(H, INGESTED_TOXIN_IMMUNE, ROUNDSTART_TRAIT)
ADD_TRAIT(H, TRAIT_STRONG_STOMACH, ROUNDSTART_TRAIT)
@@ -885,7 +885,7 @@
/datum/trait/negative/deep_breather
)
-/datum/trait/positive/nobreathe/apply(var/datum/species/S, var/mob/living/carbon/human/H)
+/datum/trait/positive/nobreathe/apply(datum/species/S, mob/living/carbon/human/H)
..()
H.does_not_breathe = 1
var/obj/item/organ/internal/breathy = H.internal_organs_by_name[O_LUNGS]
@@ -914,7 +914,7 @@
var_changes = list("emp_dmg_mod" = 0.7, "emp_stun_mod" = 0.7)
excludes = list(/datum/trait/negative/faultwires, /datum/trait/negative/poorconstruction, /datum/trait/positive/emp_resist_major)
-/datum/trait/positive/emp_resist/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/emp_resist/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/empresist)
@@ -928,7 +928,7 @@
var_changes = list("emp_dmg_mod" = 0.5, "emp_stun_mod" = 0.5)
excludes = list(/datum/trait/negative/faultwires, /datum/trait/negative/poorconstruction, /datum/trait/positive/emp_resist)
-/datum/trait/positive/emp_resist_major/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/emp_resist_major/apply(datum/species/S,mob/living/carbon/human/H)
..()
H.add_modifier(/datum/modifier/trait/empresistb)
@@ -944,7 +944,7 @@
added_component_path = /datum/component/radiation_effects
excludes = list(/datum/trait/neutral/glowing_radiation, /datum/trait/positive/rad_resistance, /datum/trait/positive/rad_resistance_extreme, /datum/trait/positive/rad_immune, /datum/trait/negative/rad_weakness)
-/datum/trait/positive/radioactive_heal/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/positive/radioactive_heal/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
var/datum/component/radiation_effects/G = H.GetComponent(added_component_path)
if(trait_prefs)
@@ -953,7 +953,7 @@
G.radiation_healing = TRUE
G.radiation_nutrition = TRUE
-/datum/trait/positive/radioactive_heal/unapply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/positive/radioactive_heal/unapply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..() //Does all the removal stuff
//We then check to see if we still have the radiation component (such as we have a species componennt of it)
//If so, we remove the healing effect.
@@ -969,7 +969,7 @@
custom_only = FALSE
hidden = FALSE //CHOMPEdit - Enable
-/datum/trait/positive/shapeshifting/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/positive/shapeshifting/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H, /mob/living/carbon/human/proc/innate_shapeshifting)
add_verb(H, /mob/living/proc/name_change_verb)
diff --git a/code/modules/mob/living/carbon/human/species/station/traits/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits/trait.dm
index ee167d3ce1..2e76cee047 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits/trait.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits/trait.dm
@@ -47,7 +47,7 @@
//Proc can be overridden lower to include special changes, make sure to call up though for the vars changes
-/datum/trait/proc/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/proc/apply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
ASSERT(S)
if(var_changes)
for(var/V in var_changes)
@@ -80,7 +80,7 @@
return
// Traitgenes Disabling traits, genes can be turned off after all!
-/datum/trait/proc/unapply(var/datum/species/S,var/mob/living/carbon/human/H, var/trait_prefs = null)
+/datum/trait/proc/unapply(datum/species/S,mob/living/carbon/human/H, trait_prefs = null)
ASSERT(S)
if(var_changes)
for(var/V in var_changes)
@@ -121,7 +121,7 @@
qdel(C)
return
-/datum/trait/proc/send_message(var/mob/living/carbon/human/H, var/enabled)
+/datum/trait/proc/send_message(mob/living/carbon/human/H, enabled)
if(enabled)
if(!activation_message)
return
@@ -133,7 +133,7 @@
// Traitgenes edit end
//Applying trait to preferences rather than just us.
-/datum/trait/proc/apply_pref(var/datum/preferences/P)
+/datum/trait/proc/apply_pref(datum/preferences/P)
ASSERT(P)
if(var_changes_pref)
for(var/V in var_changes_pref)
@@ -141,12 +141,12 @@
return
//Similar to the above, but for removing. Probably won't be called often/ever.
-/datum/trait/proc/remove(var/datum/species/S)
+/datum/trait/proc/remove(datum/species/S)
ASSERT(S)
return
//Similar to the above, but for removing.
-/datum/trait/proc/remove_pref(var/datum/preferences/P)
+/datum/trait/proc/remove_pref(datum/preferences/P)
ASSERT(P)
if(var_changes_pref)
for(var/V in var_changes_pref)
@@ -162,7 +162,7 @@
prefs[j] = default
return prefs
-/datum/trait/proc/default_value_for_pref(var/pref)
+/datum/trait/proc/default_value_for_pref(pref)
if (length(has_preferences[pref]) > 3) //custom default
return has_preferences[pref][4]
switch(has_preferences[pref][1])
@@ -176,7 +176,7 @@
return ""
return
-/datum/trait/proc/apply_sanitization_to_string(var/pref, var/input)
+/datum/trait/proc/apply_sanitization_to_string(pref, input)
if (has_preferences[pref][1] != TRAIT_PREF_TYPE_STRING || length(input) <= 0)
return default_value_for_pref(pref)
input = sanitizeSafe(input, MAX_NAME_LEN)
@@ -184,5 +184,5 @@
return default_value_for_pref(pref)
return input
-/datum/trait/proc/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/trait/proc/handle_environment_special(mob/living/carbon/human/H)
return
diff --git a/code/modules/mob/living/carbon/human/species/station/traits/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits/weaver_objs.dm
index 2789bfa88c..fb024f2a71 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits/weaver_objs.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits/weaver_objs.dm
@@ -11,14 +11,14 @@
qdel(src)
return
-/obj/effect/weaversilk/attackby(var/obj/item/W, var/mob/user)
+/obj/effect/weaversilk/attackby(obj/item/W, mob/user)
user.setClickCooldown(user.get_attack_speed(W))
if(W.force)
visible_message(span_warning("\The [src] has been [LAZYLEN(W.attack_verb) ? pick(W.attack_verb) : "attacked"] with \the [W][(user ? " by [user]." : ".")]"))
qdel(src)
-/obj/effect/weaversilk/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/weaversilk/bullet_act(obj/item/projectile/Proj)
..()
if(Proj.get_structure_damage())
qdel(src)
@@ -28,7 +28,7 @@
T?.feed_lingering_fire(0.1) // CHOMPAdd - Lingering fire, feeding fires
qdel(src)
-/obj/effect/weaversilk/attack_generic(mob/user as mob, var/damage)
+/obj/effect/weaversilk/attack_generic(mob/user as mob, damage)
if(damage)
qdel(src)
diff --git a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
index e85af9e566..ac04b0e9e7 100644
--- a/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
+++ b/code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
@@ -45,10 +45,10 @@
)
-/datum/species/shapeshifter/promethean/avatar/handle_death(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/avatar/handle_death(mob/living/carbon/human/H)
return
-/datum/species/shapeshifter/promethean/avatar/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/shapeshifter/promethean/avatar/handle_environment_special(mob/living/carbon/human/H)
//Traits like anxiety won't apply here, but that's the issue with them being a subtype of Promethean.
return
@@ -71,7 +71,7 @@
// enter_vr is called on the original mob, and puts the mind into the supplied vr mob
-/mob/living/carbon/human/proc/enter_vr(var/mob/living/carbon/human/avatar) // Avatar is currently a human, because we have preexisting setup code for appearance manipulation, etc.
+/mob/living/carbon/human/proc/enter_vr(mob/living/carbon/human/avatar) // Avatar is currently a human, because we have preexisting setup code for appearance manipulation, etc.
if(!istype(avatar))
return
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
index 43a9da00dc..177c0d0e8c 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm
@@ -1,4 +1,4 @@
-/proc/alien_queen_exists(var/ignore_self,var/mob/living/carbon/human/self)
+/proc/alien_queen_exists(ignore_self,mob/living/carbon/human/self)
for(var/mob/living/carbon/human/Q in GLOB.living_mob_list)
if(self && ignore_self && self == Q)
continue
@@ -9,7 +9,7 @@
return 1
return 0
-/mob/living/carbon/human/proc/gain_plasma(var/amount)
+/mob/living/carbon/human/proc/gain_plasma(amount)
var/obj/item/organ/internal/xenos/plasmavessel/I = internal_organs_by_name[O_PLASMA]
if(!istype(I)) return
@@ -18,7 +18,7 @@
I.stored_plasma += amount
I.stored_plasma = max(0,min(I.stored_plasma,I.max_plasma))
-/mob/living/carbon/human/proc/check_alien_ability(var/cost,var/needs_foundation,var/needs_organ) //Returns 1 if the ability is clear for usage.
+/mob/living/carbon/human/proc/check_alien_ability(cost,needs_foundation,needs_organ) //Returns 1 if the ability is clear for usage.
var/obj/item/organ/internal/xenos/plasmavessel/P = internal_organs_by_name[O_PLASMA]
if(!istype(P))
@@ -124,7 +124,7 @@
new /obj/effect/alien/weeds/node(get_turf(src), null, "#321D37")
return
-/mob/living/carbon/human/proc/Spit(var/atom/A)
+/mob/living/carbon/human/proc/Spit(atom/A)
if((last_spit + 1 SECONDS) > world.time) //To prevent YATATATATATAT spitting.
to_chat(src, span_warning("You have not yet prepared your chemical glands. You must wait before spitting again."))
return
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
index c8e4696175..71c9a93338 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
@@ -86,16 +86,16 @@
/datum/species/xenos/get_random_name()
return "xenomorph [caste_name] ([alien_number])"
-/datum/species/xenos/can_understand(var/mob/other)
+/datum/species/xenos/can_understand(mob/other)
if(istype(other, /mob/living/carbon/alien/larva))
return TRUE
return FALSE
-/datum/species/xenos/hug(var/mob/living/carbon/human/H,var/mob/living/target)
+/datum/species/xenos/hug(mob/living/carbon/human/H,mob/living/target)
H.visible_message(span_notice("[H] caresses [target] with its scythe-like arm."), \
span_notice("You caress [target] with your scythe-like arm."))
-/datum/species/xenos/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/xenos/handle_post_spawn(mob/living/carbon/human/H)
if(H.mind)
H.mind.assigned_role = JOB_ALIEN
@@ -107,7 +107,7 @@
..()
-/datum/species/xenos/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/xenos/handle_environment_special(mob/living/carbon/human/H)
var/turf/T = H.loc
if(!T) return
@@ -121,7 +121,7 @@
P.stored_plasma = min(max(P.stored_plasma,0),P.max_plasma)
..()
-/datum/species/xenos/proc/regenerate(var/mob/living/carbon/human/H)
+/datum/species/xenos/proc/regenerate(mob/living/carbon/human/H)
var/heal_rate = weeds_heal_rate
var/mend_prob = 10
if (!H.resting)
@@ -188,7 +188,7 @@
/mob/living/carbon/human/proc/corrosive_acid
)
-/datum/species/xenos/drone/handle_post_spawn(var/mob/living/carbon/human/H)
+/datum/species/xenos/drone/handle_post_spawn(mob/living/carbon/human/H)
var/mob/living/carbon/human/A = H
if(!istype(A))
@@ -296,7 +296,7 @@
/mob/living/carbon/human/proc/resin
)
-/datum/species/xenos/queen/handle_login_special(var/mob/living/carbon/human/H)
+/datum/species/xenos/queen/handle_login_special(mob/living/carbon/human/H)
..()
// Make sure only one official queen exists at any point.
if(!alien_queen_exists(1,H))
diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
index 7e9a524b46..ca44405f3e 100644
--- a/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
+++ b/code/modules/mob/living/carbon/human/species/xenomorphs/xenomorphs.dm
@@ -1,4 +1,4 @@
-/proc/create_new_xenomorph(var/alien_caste,var/target)
+/proc/create_new_xenomorph(alien_caste,target)
target = get_turf(target)
if(!target || !alien_caste) return
diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm
index ef027d1560..8e9e983724 100644
--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/human/proc/handle_strip(var/slot_to_strip,var/mob/living/user)
+/mob/living/carbon/human/proc/handle_strip(slot_to_strip,mob/living/user)
if(!slot_to_strip || !istype(user))
return
@@ -132,7 +132,7 @@
user.put_in_hands(held)
// Empty out everything in the target's pockets.
-/mob/living/carbon/human/proc/empty_pockets(var/mob/living/user)
+/mob/living/carbon/human/proc/empty_pockets(mob/living/user)
if(!r_store && !l_store)
to_chat(user, span_warning("\The [src] has nothing in their pockets."))
return
@@ -143,7 +143,7 @@
visible_message(span_danger("\The [user] empties \the [src]'s pockets!"))
// Modify the current target sensor level.
-/mob/living/carbon/human/proc/toggle_sensors(var/mob/living/user)
+/mob/living/carbon/human/proc/toggle_sensors(mob/living/user)
var/obj/item/clothing/under/suit = w_uniform
if(!suit)
to_chat(user, span_warning("\The [src] is not wearing a suit with sensors."))
@@ -155,7 +155,7 @@
suit.set_sensors(user)
// Remove all splints.
-/mob/living/carbon/human/proc/remove_splints(var/mob/living/user)
+/mob/living/carbon/human/proc/remove_splints(mob/living/user)
var/can_reach_splints = 1
if(istype(wear_suit,/obj/item/clothing/suit/space))
@@ -180,7 +180,7 @@
to_chat(user, span_warning("\The [src] has no splints to remove."))
// Set internals on or off.
-/mob/living/carbon/human/proc/toggle_internals(var/mob/living/user)
+/mob/living/carbon/human/proc/toggle_internals(mob/living/user)
if(internal)
internal.add_fingerprint(user)
internal = null
diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm
index 709b8f4b64..97ed177010 100644
--- a/code/modules/mob/living/carbon/human/unarmed_attack.dm
+++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm
@@ -23,7 +23,7 @@
GLOB.sparring_attack_cache[sparring_variant_type] = new sparring_variant_type()
return GLOB.sparring_attack_cache[sparring_variant_type]
-/datum/unarmed_attack/proc/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone)
+/datum/unarmed_attack/proc/is_usable(mob/living/carbon/human/user, mob/living/carbon/human/target, zone)
if(user.restrained())
return FALSE
@@ -38,12 +38,12 @@
return FALSE
-/datum/unarmed_attack/proc/get_unarmed_damage(var/mob/living/carbon/human/user)
+/datum/unarmed_attack/proc/get_unarmed_damage(mob/living/carbon/human/user)
if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS))//don't add extra species strength when pulling punches
return damage
return damage + user.species.unarmed_bonus
-/datum/unarmed_attack/proc/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
+/datum/unarmed_attack/proc/apply_effects(mob/living/carbon/human/user,mob/living/carbon/human/target,armour,attack_damage,zone)
var/stun_chance = rand(0, 100)
@@ -89,12 +89,12 @@
target.visible_message(span_danger("[target] has been weakened!"))
target.apply_effect(3, WEAKEN, armour)
-/datum/unarmed_attack/proc/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/proc/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
user.visible_message(span_warning("[user] [pick(attack_verb)] [target] in the [affecting.name]!"))
playsound(user, attack_sound, 25, 1, -1)
-/datum/unarmed_attack/proc/handle_eye_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target)
+/datum/unarmed_attack/proc/handle_eye_attack(mob/living/carbon/human/user, mob/living/carbon/human/target)
var/obj/item/organ/internal/eyes/eyes = target.internal_organs_by_name[O_EYES]
if(eyes)
eyes.take_damage(rand(3,4), 1)
@@ -104,7 +104,7 @@
return
user.visible_message(span_danger("[user] attempts to press [p_their()] [eye_attack_text] into [target]'s eyes, but [target.p_they()] [target.p_do()]n't have any!"))
-/datum/unarmed_attack/proc/unarmed_override(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/zone)
+/datum/unarmed_attack/proc/unarmed_override(mob/living/carbon/human/user,mob/living/carbon/human/target,zone)
return FALSE //return true if the unarmed override prevents further attacks
/datum/unarmed_attack/bite
@@ -117,7 +117,7 @@
/datum/unarmed_attack/bite/event1
-/datum/unarmed_attack/bite/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone)
+/datum/unarmed_attack/bite/is_usable(mob/living/carbon/human/user, mob/living/carbon/human/target, zone)
if (user.is_muzzled() || user.buckled)
return FALSE
if (user == target && ((zone == BP_GROIN && (prob(98)) || (zone == BP_HEAD || zone == O_EYES || zone == O_MOUTH)))) //biting your own groin is hard. 2% hit chance.
@@ -138,7 +138,7 @@
/datum/unarmed_attack/punch/event1
-/datum/unarmed_attack/punch/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/punch/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
var/organ = affecting.name
@@ -189,7 +189,7 @@
/datum/unarmed_attack/kick/event1
-/datum/unarmed_attack/kick/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone)
+/datum/unarmed_attack/kick/is_usable(mob/living/carbon/human/user, mob/living/carbon/human/target, zone)
if(user.legcuffed || user.buckled)
return FALSE
@@ -206,7 +206,7 @@
return FALSE
-/datum/unarmed_attack/kick/get_unarmed_damage(var/mob/living/carbon/human/user)
+/datum/unarmed_attack/kick/get_unarmed_damage(mob/living/carbon/human/user)
var/obj/item/clothing/shoes = user.shoes
if(!istype(shoes))
return user.species.unarmed_bonus + damage
@@ -214,7 +214,7 @@
return damage + (shoes ? shoes.force : 0)
return user.species.unarmed_bonus + damage + (shoes ? shoes.force : 0)
-/datum/unarmed_attack/kick/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/kick/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
var/organ = affecting.name
@@ -234,7 +234,7 @@
/datum/unarmed_attack/stomp/event1
-/datum/unarmed_attack/stomp/is_usable(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone)
+/datum/unarmed_attack/stomp/is_usable(mob/living/carbon/human/user, mob/living/carbon/human/target, zone)
if (user.legcuffed || user.buckled)
return FALSE
@@ -255,13 +255,13 @@
return FALSE
-/datum/unarmed_attack/stomp/get_unarmed_damage(var/mob/living/carbon/human/user)
+/datum/unarmed_attack/stomp/get_unarmed_damage(mob/living/carbon/human/user)
var/obj/item/clothing/shoes = user.shoes
if(HAS_TRAIT(user, TRAIT_NONLETHAL_BLOWS))//don't add extra species strength when pulling punches
return damage + (shoes ? shoes.force : 0)
return user.species.unarmed_bonus + damage + (shoes ? shoes.force : 0)
-/datum/unarmed_attack/stomp/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
+/datum/unarmed_attack/stomp/show_attack(mob/living/carbon/human/user, mob/living/carbon/human/target, zone, attack_damage)
var/obj/item/organ/external/affecting = target.get_organ(zone)
var/organ = affecting.name
var/obj/item/clothing/shoes = user.shoes
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index d4e607c93e..58ca99c7b8 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -74,7 +74,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
//Do any species specific layering updates, such as when hiding.
update_icon_special()
-/mob/living/carbon/human/update_transform(var/instant = FALSE)
+/mob/living/carbon/human/update_transform(instant = FALSE)
var/desired_scale_x = size_multiplier * icon_scale_x
var/desired_scale_y = size_multiplier * icon_scale_y
desired_scale_x *= species.icon_scale_x
@@ -1056,7 +1056,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
return tail_icon
-/mob/living/carbon/human/proc/set_tail_state(var/t_state)
+/mob/living/carbon/human/proc/set_tail_state(t_state)
var/tail_layer = get_tail_layer()
if(src.tail_style && src.tail_style.clip_mask_state)
tail_layer = TAIL_UPPER_LAYER // Use default, let clip mask handle everything
@@ -1224,7 +1224,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
overlays_standing[SURGERY_LAYER] = total
apply_layer(SURGERY_LAYER)
-/mob/living/carbon/human/proc/get_wing_image(var/under_layer)
+/mob/living/carbon/human/proc/get_wing_image(under_layer)
if(QDESTROYING(src))
return
@@ -1462,7 +1462,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
struggle_anim_taur = FALSE
update_vore_tail_sprite()
-/mob/living/carbon/human/proc/GetAppearanceFromPrefs(var/flavourtext, var/oocnotes)
+/mob/living/carbon/human/proc/GetAppearanceFromPrefs(flavourtext, oocnotes)
/* Jank code that effectively creates the client's mob from save, then copies its appearance to our current mob.
Intended to be used with shapeshifter species so we don't reset their organs in doing so.*/
if(client.prefs)
diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm
index ecf2af9082..ac5304dac0 100644
--- a/code/modules/mob/living/carbon/lick_wounds.dm
+++ b/code/modules/mob/living/carbon/lick_wounds.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/human/proc/lick_wounds(var/mob/living/carbon/M as mob in view(1)) // Allows the user to lick themselves. Given how rarely this trait is used, I don't see an issue with a slight buff.
+/mob/living/carbon/human/proc/lick_wounds(mob/living/carbon/M as mob in view(1)) // Allows the user to lick themselves. Given how rarely this trait is used, I don't see an issue with a slight buff.
set name = "Lick Wounds"
set category = "Abilities.General"
set desc = "Disinfect and heal small wounds with your saliva."
diff --git a/code/modules/mob/living/carbon/metroid/powers.dm b/code/modules/mob/living/carbon/metroid/powers.dm
index afb44d3b71..fd21f7b201 100644
--- a/code/modules/mob/living/carbon/metroid/powers.dm
+++ b/code/modules/mob/living/carbon/metroid/powers.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/slime/proc/Wrap(var/mob/living/M) // This is a proc for the clicks
+/mob/living/carbon/slime/proc/Wrap(mob/living/M) // This is a proc for the clicks
if (Victim == M || src == M)
Feedstop()
return
@@ -14,7 +14,7 @@
Feedon(M)
-/mob/living/carbon/slime/proc/invalidFeedTarget(var/mob/living/M)
+/mob/living/carbon/slime/proc/invalidFeedTarget(mob/living/M)
if (!M || !istype(M))
return "This subject is incomparable..."
if (istype(M, /mob/living/carbon/slime)) // No cannibalism... yet
@@ -28,7 +28,7 @@
return "The [met.name] is already feeding on this subject..."
return 0
-/mob/living/carbon/slime/proc/Feedon(var/mob/living/M)
+/mob/living/carbon/slime/proc/Feedon(mob/living/M)
Victim = M
loc = M.loc
canmove = 0
@@ -102,7 +102,7 @@
to_chat(Victim, "[src] has let go of your head!")
Victim = null
-/mob/living/carbon/slime/proc/UpdateFeed(var/mob/M)
+/mob/living/carbon/slime/proc/UpdateFeed(mob/M)
if(Victim)
if(Victim == M)
loc = M.loc // simple "attach to head" effect!
diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm
index 5fb7b59850..205a875d7e 100644
--- a/code/modules/mob/living/carbon/taste.dm
+++ b/code/modules/mob/living/carbon/taste.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/proc/ingest(var/datum/reagents/from, var/datum/reagents/target, var/amount = 1, var/multiplier = 1, var/copy = 0) //we kind of 'sneak' a proc in here for ingesting stuff so we can play with it.
+/mob/living/carbon/proc/ingest(datum/reagents/from, datum/reagents/target, amount = 1, multiplier = 1, copy = 0) //we kind of 'sneak' a proc in here for ingesting stuff so we can play with it.
/* Synths should be able to taste because... reasons
if(ishuman(src))
var/mob/living/carbon/human/H = src
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 41cad1e410..becd0c161b 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -8,7 +8,7 @@
Returns
standard 0 if fail
*/
-/mob/living/proc/apply_damage(var/damage = 0, var/damagetype = BRUTE, var/def_zone = null, var/blocked = 0, var/sharp = FALSE, var/edge = FALSE, var/obj/used_weapon = null, var/projectile = 0)
+/mob/living/proc/apply_damage(damage = 0, damagetype = BRUTE, def_zone = null, blocked = 0, sharp = FALSE, edge = FALSE, obj/used_weapon = null, projectile = 0)
SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMAGE, damage, damagetype, def_zone, blocked, sharp, edge, used_weapon, projectile)
if(GLOB.Debug2)
log_world("## DEBUG: apply_damage() was called on [src], with [damage] damage, and an armor value of [blocked].")
@@ -123,7 +123,7 @@
return 1
-/mob/living/proc/apply_damages(var/brute = 0, var/burn = 0, var/tox = 0, var/oxy = 0, var/clone = 0, var/halloss = 0, var/def_zone = null, var/blocked = 0)
+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, halloss = 0, def_zone = null, blocked = 0)
if(blocked >= 100)
return 0
// INSERT MODIFIER CODE HERE... But no, really, only two things in the game use it, quad and viruses. The former is admin-only and the latter wouldn't be affected logically, but would if shield code was inerted here. If you really want, you can copy&paste the above and modify it to adjust brute/burn/etc. I do not advise this however.
@@ -137,7 +137,7 @@
-/mob/living/proc/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/check_protection = 1)
+/mob/living/proc/apply_effect(effect = 0,effecttype = STUN, blocked = 0, check_protection = 1)
if(GLOB.Debug2)
log_world("## DEBUG: apply_effect() was called. The type of effect is [effecttype]. Blocked by [blocked].")
if(!effect || (blocked >= 100))
@@ -169,7 +169,7 @@
return 1
-/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/agony = 0, var/blocked = 0, var/ignite = 0, var/flammable = 0)
+/mob/living/proc/apply_effects(stun = 0, weaken = 0, paralyze = 0, irradiate = 0, stutter = 0, eyeblur = 0, drowsy = 0, agony = 0, blocked = 0, ignite = 0, flammable = 0)
if(SEND_SIGNAL(src, COMSIG_TAKING_APPLY_EFFECT) & COMSIG_CANCEL_EFFECT)
return 0 // Cancelled by a component
if(blocked >= 100)
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index 41f9949b4e..7b6bc69efd 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -27,7 +27,7 @@
apply_default_language(language)
-/mob/living/proc/apply_default_language(var/language)
+/mob/living/proc/apply_default_language(language)
if (only_species_language && language != GLOB.all_languages[species_language])
to_chat(src, span_notice("You can only speak your species language, [species_language]."))
return 0
diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm
index dadec08289..4b1629b6d6 100644
--- a/code/modules/mob/living/inventory.dm
+++ b/code/modules/mob/living/inventory.dm
@@ -49,7 +49,7 @@
else return l_hand
//Drops the item in our active hand. TODO: rename this to drop_active_hand or something
-/mob/living/drop_item(var/atom/Target)
+/mob/living/drop_item(atom/Target)
var/obj/item/item_dropped = null
if (hand)
@@ -71,17 +71,17 @@
//Drops the item in our left hand
-/mob/living/drop_l_hand(var/atom/Target)
+/mob/living/drop_l_hand(atom/Target)
return drop_from_inventory(l_hand, Target)
//Drops the item in our right hand
-/mob/living/drop_r_hand(var/atom/Target)
+/mob/living/drop_r_hand(atom/Target)
return drop_from_inventory(r_hand, Target)
/mob/living/proc/hands_are_full()
return (r_hand && l_hand)
-/mob/living/proc/item_is_in_hands(var/obj/item/I)
+/mob/living/proc/item_is_in_hands(obj/item/I)
return (I == r_hand || I == l_hand)
/mob/living/proc/update_held_icons()
@@ -90,7 +90,7 @@
if(r_hand)
r_hand.update_held_icon()
-/mob/living/proc/get_type_in_hands(var/T)
+/mob/living/proc/get_type_in_hands(T)
if(istype(l_hand, T))
return l_hand
if(istype(r_hand, T))
@@ -118,7 +118,7 @@
update_inv_wear_mask()
return
-/mob/living/get_equipped_item(var/slot)
+/mob/living/get_equipped_item(slot)
switch(slot)
if(slot_l_hand) return l_hand
if(slot_r_hand) return r_hand
@@ -126,7 +126,7 @@
if(slot_wear_mask) return wear_mask
return null
-/mob/living/ret_grab(var/list/L, var/mobchain_limit = 5)
+/mob/living/ret_grab(list/L, mobchain_limit = 5)
// We're the first!
if(!L)
L = list()
@@ -176,7 +176,7 @@
update_inv_active_hand()
return
-/mob/living/abiotic(var/full_body = 0)
+/mob/living/abiotic(full_body = 0)
if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))
return 1
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 2acadff473..26efeec875 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -109,7 +109,7 @@
/mob/living/proc/handle_random_events()
return
-/mob/living/proc/handle_environment(var/datum/gas_mixture/environment)
+/mob/living/proc/handle_environment(datum/gas_mixture/environment)
return
/mob/living/proc/handle_stomach()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b07b4ca6ed..66367b8777 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -201,7 +201,7 @@
//This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually
//affects them once clothing is factored in. ~Errorage
-/mob/living/proc/calculate_affecting_pressure(var/pressure)
+/mob/living/proc/calculate_affecting_pressure(pressure)
return
@@ -260,7 +260,7 @@
return getBruteLoss()
//'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs
-/mob/living/proc/adjustBruteLoss(var/amount,var/include_robo)
+/mob/living/proc/adjustBruteLoss(amount,include_robo)
if(SEND_SIGNAL(src, COMSIG_TAKING_BRUTE_DAMAGE, amount) & COMSIG_CANCEL_BRUTE_DAMAGE)
return 0 // Cancelled by a component
@@ -290,7 +290,7 @@
/mob/living/proc/getOxyLoss()
return oxyloss
-/mob/living/proc/adjustOxyLoss(var/amount)
+/mob/living/proc/adjustOxyLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_OXY_DAMAGE, amount) & COMSIG_CANCEL_OXY_DAMAGE)
return 0 // Cancelled by a component
@@ -312,7 +312,7 @@
oxyloss = min(max(oxyloss + amount, 0),(getMaxHealth()*2))
updatehealth()
-/mob/living/proc/setOxyLoss(var/amount)
+/mob/living/proc/setOxyLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_OXY_DAMAGE, amount) & COMSIG_CANCEL_OXY_DAMAGE)
return 0 // Cancelled by a component
oxyloss = amount
@@ -320,7 +320,7 @@
/mob/living/proc/getToxLoss()
return toxloss
-/mob/living/proc/adjustToxLoss(var/amount)
+/mob/living/proc/adjustToxLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_TOX_DAMAGE, amount) & COMSIG_CANCEL_TOX_DAMAGE)
return 0 // Cancelled by a component
@@ -342,7 +342,7 @@
toxloss = min(max(toxloss + amount, 0),(getMaxHealth()*2))
updatehealth()
-/mob/living/proc/setToxLoss(var/amount)
+/mob/living/proc/setToxLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_TOX_DAMAGE, amount) & COMSIG_CANCEL_TOX_DAMAGE)
return 0 // Cancelled by a component
toxloss = amount
@@ -357,7 +357,7 @@
return getFireLoss()
//'include_robo' only applies to healing, for legacy purposes, as all damage typically hurts both types of organs
-/mob/living/proc/adjustFireLoss(var/amount,var/include_robo)
+/mob/living/proc/adjustFireLoss(amount,include_robo)
if(SEND_SIGNAL(src, COMSIG_TAKING_FIRE_DAMAGE, amount) & COMSIG_CANCEL_FIRE_DAMAGE)
return 0 // Cancelled by a component
if(amount > 0)
@@ -384,7 +384,7 @@
/mob/living/proc/getCloneLoss()
return cloneloss
-/mob/living/proc/adjustCloneLoss(var/amount)
+/mob/living/proc/adjustCloneLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_CLONE_DAMAGE, amount) & COMSIG_CANCEL_CLONE_DAMAGE)
return 0 // Cancelled by a component
@@ -406,7 +406,7 @@
cloneloss = min(max(cloneloss + amount, 0),(getMaxHealth()*2))
updatehealth()
-/mob/living/proc/setCloneLoss(var/amount)
+/mob/living/proc/setCloneLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_CLONE_DAMAGE, amount) & COMSIG_CANCEL_CLONE_DAMAGE)
return 0 // Cancelled by a component
cloneloss = amount
@@ -414,12 +414,12 @@
/mob/living/proc/getBrainLoss()
return brainloss
-/mob/living/proc/adjustBrainLoss(var/amount)
+/mob/living/proc/adjustBrainLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_BRAIN_DAMAGE, amount) & COMSIG_CANCEL_BRAIN_DAMAGE)
return 0 // Cancelled by a component
brainloss = min(max(brainloss + amount, 0),(getMaxHealth()*2))
-/mob/living/proc/setBrainLoss(var/amount)
+/mob/living/proc/setBrainLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_BRAIN_DAMAGE, amount) & COMSIG_CANCEL_BRAIN_DAMAGE)
return 0 // Cancelled by a component
brainloss = amount
@@ -427,7 +427,7 @@
/mob/living/proc/getHalLoss()
return halloss
-/mob/living/proc/adjustHalLoss(var/amount)
+/mob/living/proc/adjustHalLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_HALO_DAMAGE, amount) & COMSIG_CANCEL_HALO_DAMAGE)
return 0 // Cancelled by a component
if(amount > 0)
@@ -448,7 +448,7 @@
halloss = min(max(halloss + amount, 0),(getMaxHealth()*2))
updatehealth()
-/mob/living/proc/setHalLoss(var/amount)
+/mob/living/proc/setHalLoss(amount)
if(SEND_SIGNAL(src, COMSIG_TAKING_HALO_DAMAGE, amount) & COMSIG_CANCEL_HALO_DAMAGE)
return 0 // Cancelled by a component
halloss = amount
@@ -476,7 +476,7 @@
crit_point *= species.crit_mod
return crit_point
-/mob/living/proc/setMaxHealth(var/newMaxHealth)
+/mob/living/proc/setMaxHealth(newMaxHealth)
var/h_mult = maxHealth / newMaxHealth //Calculate change multiplier
if(bruteloss) //In case a damage value is 0, divide by 0 bad
bruteloss = round(bruteloss / h_mult) //Health is calculated on life based on damage types, so we update the damage and let life handle health
@@ -652,7 +652,7 @@
//Recursive function to find everything a mob is holding.
-/mob/living/get_contents(var/obj/item/storage/Storage = null)
+/mob/living/get_contents(obj/item/storage/Storage = null)
var/list/L = list()
if(Storage) //If it called itself
@@ -915,10 +915,10 @@
return FALSE
-/mob/living/proc/slip(var/slipped_on,stun_duration=8)
+/mob/living/proc/slip(slipped_on,stun_duration=8)
return 0
-/mob/living/carbon/drop_from_inventory(var/obj/item/W, var/atom/target = null)
+/mob/living/carbon/drop_from_inventory(obj/item/W, atom/target = null)
return !(W in internal_organs) && ..()
/mob/living/proc/drop_both_hands()
@@ -949,7 +949,7 @@
..()
//damage/heal the mob ears and adjust the deaf amount
-/mob/living/adjustEarDamage(var/damage, var/deaf)
+/mob/living/adjustEarDamage(damage, deaf)
ear_damage = max(0, ear_damage + damage)
ear_deaf = max(0, ear_deaf + deaf)
if(ear_deaf > 0) //CHOMPStaiton Enable: Ear Ringing/Deafness
@@ -958,7 +958,7 @@
deaf_loop.stop() // CHOMPStation Add: Ear Ringing/Deafness - Not sure if we need this, but, safety.
//pass a negative argument to skip one of the variable
-/mob/living/setEarDamage(var/damage, var/deaf)
+/mob/living/setEarDamage(damage, deaf)
if(damage >= 0)
ear_damage = damage
if(deaf >= 0)
@@ -1175,7 +1175,7 @@
/mob/living/proc/update_water() // Involves overlays for humans. Maybe we'll get submerged sprites for borgs in the future?
return
-/mob/living/proc/can_feel_pain(var/check_organ)
+/mob/living/proc/can_feel_pain(check_organ)
if(isSynthetic())
return FALSE
return TRUE
@@ -1200,7 +1200,7 @@
if(!isnull(M.icon_scale_y_percent))
. *= M.icon_scale_y_percent
-/mob/living/update_transform(var/instant = FALSE)
+/mob/living/update_transform(instant = FALSE)
// First, get the correct size.
var/desired_scale_x = size_multiplier * icon_scale_x
var/desired_scale_y = size_multiplier * icon_scale_y
@@ -1275,7 +1275,7 @@
I.in_inactive_hand(src) //This'll do specific things, determined by the item
return
-/mob/living/proc/activate_hand(var/selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand.
+/mob/living/proc/activate_hand(selhand) //0 or "r" or "right" for right hand; 1 or "l" or "left" for left hand.
if(istext(selhand))
selhand = lowertext(selhand)
@@ -1367,7 +1367,7 @@
item.throw_at(target, throw_range, item.throw_speed, src)
return TRUE
-/mob/living/get_sound_env(var/spot, var/pressure_factor)
+/mob/living/get_sound_env(spot, pressure_factor)
if (hallucination)
return SOUND_ENVIRONMENT_PSYCHOTIC
else if (druggy)
@@ -1382,7 +1382,7 @@
return ..()
//Add an entry to overlays, assuming it exists
-/mob/living/proc/apply_hud(cache_index, var/image/I)
+/mob/living/proc/apply_hud(cache_index, image/I)
hud_list[cache_index] = I
if((. = hud_list[cache_index]))
//underlays += .
@@ -1506,7 +1506,7 @@
icon_state = "character"
screen_loc = ui_smallquad
-/mob/living/set_dir(var/new_dir)
+/mob/living/set_dir(new_dir)
. = ..()
if(size_multiplier != 1 || icon_scale_x != DEFAULT_ICON_SCALE_X && center_offset > 0)
update_transform(TRUE)
@@ -1524,7 +1524,7 @@
if(toggled_sleeping)
Sleeping(1)
-/mob/living/proc/set_metainfo_favs(var/mob/user, var/reopen = TRUE)
+/mob/living/proc/set_metainfo_favs(mob/user, reopen = TRUE)
if(user != src)
return
var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your FAVOURITE roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_favs), multiline = TRUE, prevent_enter = TRUE))
@@ -1538,7 +1538,7 @@
if(reopen)
ooc_notes_window(user)
-/mob/living/proc/set_metainfo_maybes(var/mob/user, var/reopen = TRUE)
+/mob/living/proc/set_metainfo_maybes(mob/user, reopen = TRUE)
if(user != src)
return
var/new_metadata = strip_html_simple(tgui_input_text(user, "Enter any information you'd like others to see relating to your MAYBE roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_maybes), multiline = TRUE, prevent_enter = TRUE))
@@ -1552,7 +1552,7 @@
if(reopen)
ooc_notes_window(user)
-/mob/living/proc/set_metainfo_ooc_style(var/mob/user, var/reopen = TRUE)
+/mob/living/proc/set_metainfo_ooc_style(mob/user, reopen = TRUE)
if(user != src)
return
ooc_notes_style = !ooc_notes_style
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index e1196fda47..03f37e798b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -11,7 +11,7 @@
Returns
A number between 0 and 100, with higher numbers resulting in less damage taken.
*/
-/mob/living/proc/run_armor_check(var/def_zone = null, var/attack_flag = "melee", var/armour_pen = 0, var/absorb_text = null, var/soften_text = null)
+/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", armour_pen = 0, absorb_text = null, soften_text = null)
if(GLOB.Debug2)
log_world("## DEBUG: getarmor() was called.")
@@ -78,7 +78,7 @@
*/
//if null is passed for def_zone, then this should return something appropriate for all zones (e.g. area effect damage)
-/mob/living/proc/getarmor(var/def_zone, var/type)
+/mob/living/proc/getarmor(def_zone, type)
return 0
// Clicking with an empty hand
@@ -94,7 +94,7 @@
span_warning("[L] is hurt by sharp body parts when touching [src]!"), \
span_warning("[src] is covered in sharp bits and it hurt when you touched them!"), )
-/mob/living/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/bullet_act(obj/item/projectile/P, def_zone)
//CHOMPedit begin, re-adds stealth removed feature
if(istype(get_active_hand(),/obj/item/assembly/signaler))
var/obj/item/assembly/signaler/signaler = get_active_hand()
@@ -138,7 +138,7 @@
// return absorb
//Handles the effects of "stun" weapons
-/mob/living/proc/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null, var/electric = FALSE)
+/mob/living/proc/stun_effect_act(stun_amount, agony_amount, def_zone, used_weapon=null, electric = FALSE)
flash_pain()
SEND_SIGNAL(src, COMSIG_STUN_EFFECT_ACT, stun_amount, agony_amount, def_zone, used_weapon, electric)
@@ -153,7 +153,7 @@
apply_effect(STUTTER, agony_amount/10)
apply_effect(EYE_BLUR, agony_amount/10)
-/mob/living/proc/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null, var/stun = 1)
+/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null, stun = 1)
return 0 //only carbon liveforms have this proc
/mob/living/emp_act(severity, recursive)
@@ -170,7 +170,7 @@
return
..()
-/mob/living/blob_act(var/obj/structure/blob/B)
+/mob/living/blob_act(obj/structure/blob/B)
if(stat == DEAD || faction == B.faction)
return
@@ -209,11 +209,11 @@
apply_damage(damage, damage_type, def_zone, absorb)
-/mob/living/proc/resolve_item_attack(obj/item/I, mob/living/user, var/target_zone)
+/mob/living/proc/resolve_item_attack(obj/item/I, mob/living/user, target_zone)
return target_zone
//Called when the mob is hit with an item in combat. Returns the blocked result
-/mob/living/proc/hit_with_weapon(obj/item/I, mob/living/user, var/effective_force, var/hit_zone)
+/mob/living/proc/hit_with_weapon(obj/item/I, mob/living/user, effective_force, hit_zone)
visible_message(span_danger("[src] has been [LAZYLEN(I.attack_verb) ? pick(I.attack_verb) : "attacked"] with [I.name] by [user]!"))
if(ai_holder)
@@ -230,7 +230,7 @@
return blocked
//returns 0 if the effects failed to apply for some reason, 1 otherwise.
-/mob/living/proc/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/hit_zone)
+/mob/living/proc/standard_weapon_hit_effects(obj/item/I, mob/living/user, effective_force, blocked, hit_zone)
if(!effective_force || blocked >= 100)
return 0
//Apply weapon damage
@@ -308,24 +308,24 @@
src.anchored = TRUE
src.pinned += O
-/mob/living/proc/on_throw_vore_special(var/pred = TRUE, var/mob/living/target)
+/mob/living/proc/on_throw_vore_special(pred = TRUE, mob/living/target)
return
-/mob/living/proc/embed(var/obj/O, var/def_zone=null)
+/mob/living/proc/embed(obj/O, def_zone=null)
O.loc = src
src.embedded += O
add_verb(src, /mob/proc/yank_out_object)
throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject)
//This is called when the mob is thrown into a dense turf
-/mob/living/proc/turf_collision(var/turf/T, var/speed)
+/mob/living/proc/turf_collision(turf/T, speed)
if(SEND_SIGNAL(src, COMSIG_LIVING_TURF_COLLISION, T, speed) & COMPONENT_LIVING_BLOCK_TURF_COLLISION)
return
src.take_organ_damage(speed * 5) // used to be 5 * speed. That's a default of 25 and I dont see anything ever changing the "speed" value. //CHOMPEdit, no. We keep the damage values, no reduction to 12
//src.Weaken(3) // That is absurdly high so im just setting it to a flat 12 with a bit of stun ontop. //Stun is too dangerous
playsound(src, get_sfx("punch"), 50) //ouch sound
-/mob/living/proc/near_wall(var/direction,var/distance=1)
+/mob/living/proc/near_wall(direction,distance=1)
var/turf/T = get_step(get_turf(src),direction)
var/turf/last_turf = src.loc
var/i = 1
@@ -341,7 +341,7 @@
// End BS12 momentum-transfer code.
-/mob/living/attack_generic(var/mob/user, var/damage, var/attack_message)
+/mob/living/attack_generic(mob/user, damage, attack_message)
if(istype(user,/mob/living))
var/mob/living/L = user
if(touch_reaction_flags & SPECIES_TRAIT_THORNS)
@@ -458,7 +458,7 @@
if(amount > 0)
adjustToxLoss(amount)
-/mob/living/proc/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE)
+/mob/living/proc/can_inject(mob/user, error_msg, target_zone, ignore_thickness = FALSE)
return 1
/mob/living/proc/get_organ_target()
@@ -470,25 +470,25 @@
return def_zone
// heal ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/heal_organ_damage(var/brute, var/burn)
+/mob/living/proc/heal_organ_damage(brute, burn)
adjustBruteLoss(-brute)
adjustFireLoss(-burn)
src.updatehealth()
// damage ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/take_organ_damage(var/brute, var/burn, var/emp=0)
+/mob/living/proc/take_organ_damage(brute, burn, emp=0)
adjustBruteLoss(brute)
adjustFireLoss(burn)
src.updatehealth()
// heal MANY external organs, in random order
-/mob/living/proc/heal_overall_damage(var/brute, var/burn)
+/mob/living/proc/heal_overall_damage(brute, burn)
adjustBruteLoss(-brute)
adjustFireLoss(-burn)
src.updatehealth()
// damage MANY external organs, in random order
-/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
+/mob/living/proc/take_overall_damage(brute, burn, used_weapon = null)
adjustBruteLoss(brute)
adjustFireLoss(burn)
src.updatehealth()
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 256a68db36..d67ed0c86b 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -30,7 +30,7 @@ default behaviour is:
- passive mob checks to see if its mob_bump_flag is in the non-passive's mob_bump_flags
- if si, the proc returns
*/
-/mob/living/proc/can_move_mob(var/mob/living/swapped, swapping = FALSE, passive = FALSE)
+/mob/living/proc/can_move_mob(mob/living/swapped, swapping = FALSE, passive = FALSE)
if(!swapped)
return TRUE
if(!passive)
@@ -216,7 +216,7 @@ default behaviour is:
return ..()
// Called when something steps onto us. This allows for mulebots and vehicles to run things over. <3
-/mob/living/Crossed(var/atom/movable/AM) // Transplanting this from /mob/living/carbon/human/Crossed()
+/mob/living/Crossed(atom/movable/AM) // Transplanting this from /mob/living/carbon/human/Crossed()
if(AM == src || AM.is_incorporeal()) // We're not going to run over ourselves or ghosts
return
@@ -258,14 +258,14 @@ default behaviour is:
if(s_active && !(s_active in contents) && get_turf(s_active) != get_turf(src)) //check !( s_active in contents ) first so we hopefully don't have to call get_turf() so much.
s_active.close(src)
-/mob/living/proc/dragged(var/mob/living/dragger, var/oldloc, forced)
+/mob/living/proc/dragged(mob/living/dragger, oldloc, forced)
var/area/A = get_area(src)
if(forced || (lying && !buckled && pull_damage() && A.get_gravity() && (prob(getBruteLoss() * 200 / maxHealth))))
adjustBruteLoss(2)
visible_message(span_danger("\The [src]'s [isSynthetic() ? "state" : "wounds"] worsen terribly from being dragged!"), runemessage = "is dragged, wounds worsening!")
return TRUE
-/mob/living/Moved(var/atom/oldloc, direct, forced, movetime)
+/mob/living/Moved(atom/oldloc, direct, forced, movetime)
. = ..()
handle_footstep(loc)
if(!forced && movetime /* && !is_incorporeal()*/) // CHOMPEdit
@@ -326,7 +326,7 @@ default behaviour is:
addtimer(CALLBACK(src, PROC_REF(handle_inertial_drift), loc), 0.5 SECONDS, TIMER_DELETE_ME)
-/mob/living/proc/handle_inertial_drift(var/locthen)
+/mob/living/proc/handle_inertial_drift(locthen)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!anchored && !pulledby && loc == locthen)
diff --git a/code/modules/mob/living/living_powers.dm b/code/modules/mob/living/living_powers.dm
index 90fbc2c571..8bb954c1ee 100644
--- a/code/modules/mob/living/living_powers.dm
+++ b/code/modules/mob/living/living_powers.dm
@@ -1,4 +1,4 @@
-/mob/living/proc/reveal(var/silent, var/message = span_warning("You have been revealed! You are no longer hidden."))
+/mob/living/proc/reveal(silent, message = span_warning("You have been revealed! You are no longer hidden."))
if(status_flags & HIDING)
status_flags &= ~HIDING
reset_plane_and_layer()
diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm
index 52c128aa7f..977f02f354 100644
--- a/code/modules/mob/living/living_vr.dm
+++ b/code/modules/mob/living/living_vr.dm
@@ -55,7 +55,7 @@
log_admin("[key_name(src)] updated their OOC notes mid-round.")
ooc_notes_window(src)
-/mob/living/proc/set_metainfo_likes(mob/user, var/reopen = TRUE)
+/mob/living/proc/set_metainfo_likes(mob/user, reopen = TRUE)
if(user != src)
return
var/new_metadata = strip_html_simple(tgui_input_text(src, "Enter any information you'd like others to see relating to your LIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_likes), multiline = TRUE, prevent_enter = TRUE))
@@ -69,7 +69,7 @@
if(reopen)
ooc_notes_window(src)
-/mob/living/proc/set_metainfo_dislikes(mob/user, var/reopen = TRUE)
+/mob/living/proc/set_metainfo_dislikes(mob/user, reopen = TRUE)
if(user != src)
return
var/new_metadata = strip_html_simple(tgui_input_text(src, "Enter any information you'd like others to see relating to your DISLIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_dislikes), multiline = TRUE, prevent_enter = TRUE))
diff --git a/code/modules/mob/living/organs.dm b/code/modules/mob/living/organs.dm
index ba3fc510fa..d44906fe15 100644
--- a/code/modules/mob/living/organs.dm
+++ b/code/modules/mob/living/organs.dm
@@ -5,11 +5,11 @@
var/list/internal_organs_by_name = list() // so internal organs have less ickiness too
var/list/bad_external_organs = list()// organs we check until they are good.
-/mob/living/proc/get_bodypart_name(var/zone)
+/mob/living/proc/get_bodypart_name(zone)
var/obj/item/organ/external/E = get_organ(zone)
if(E) . = E.name
-/mob/living/proc/get_organ(var/zone)
+/mob/living/proc/get_organ(zone)
if(!zone)
zone = BP_TORSO
else if (zone in list( O_EYES, O_MOUTH ))
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index e19c18c2e0..84a8fca542 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
))
GLOBAL_LIST_EMPTY(channel_to_radio_key)
-/proc/get_radio_key_from_channel(var/channel)
+/proc/get_radio_key_from_channel(channel)
var/key = GLOB.channel_to_radio_key[channel]
if(!key)
for(var/radio_key in GLOB.department_radio_keys)
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key)
//Takes a list of the form list(message, verb, whispering) and modifies it as needed
//Returns 1 if a speech problem was applied, 0 otherwise
-/mob/living/proc/handle_speech_problems(var/list/message_data)
+/mob/living/proc/handle_speech_problems(list/message_data)
var/list/message_pieces = message_data[1]
var/verb = message_data[2]
var/whispering = message_data[3]
@@ -143,14 +143,14 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key)
returns[2] = null
return returns
-/mob/living/proc/get_speech_ending(verb, var/ending)
+/mob/living/proc/get_speech_ending(verb, ending)
if(ending == "!")
return pick("exclaims","shouts","yells")
if(ending == "?")
return "asks"
return verb
-/mob/living/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/say(message, datum/language/speaking = null, whispering = 0)
//If you're muted for IC chat
if(client)
if(message)
@@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key)
if("^") return custom_emote(VISIBLE_MESSAGE, copytext(message, 2))
direct_say(message, speaking, whispering)
-/mob/living/direct_say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/direct_say(message, datum/language/speaking = null, whispering = 0)
// Handle automatic whispering mode
if(autowhisper)
whispering = 1
@@ -471,7 +471,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key)
#undef BLOOPER_MAX_BLOOPERS
#undef BLOOPER_MAX_TIME
-/mob/living/proc/say_signlang(var/message, var/verb="gestures", var/verb_understood="gestures", var/datum/language/language, var/type = 1)
+/mob/living/proc/say_signlang(message, verb="gestures", verb_understood="gestures", datum/language/language, type = 1)
var/turf/T = get_turf(src)
//We're in something, gesture to people inside the same thing
if(loc != T && !istype(loc, /obj/item/holder)) // Partially fixes sign language while being held.
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 456430a7b6..f43eafa155 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -529,7 +529,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
new_eye.set_light(0)
-/mob/living/silicon/ai/proc/switchCamera(var/obj/machinery/camera/C)
+/mob/living/silicon/ai/proc/switchCamera(obj/machinery/camera/C)
if (!C || stat == DEAD) //C.can_use())
return 0
@@ -565,7 +565,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
cameralist = sortAssoc(cameralist)
return cameralist
-/mob/living/silicon/ai/proc/ai_network_change(var/network in get_camera_network_list())
+/mob/living/silicon/ai/proc/ai_network_change(network in get_camera_network_list())
set category = "AI.Camera Control"
set name = "Jump To Network"
unset_machine()
@@ -846,7 +846,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
to_chat(src, span_filter_notice("Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now."))
-/mob/living/silicon/ai/proc/check_unable(var/flags = NONE, var/feedback = 1)
+/mob/living/silicon/ai/proc/check_unable(flags = NONE, feedback = 1)
if(stat == DEAD)
if(feedback)
to_chat(src, span_warning("You are dead!"))
@@ -904,7 +904,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
else
to_chat(src, span_warning("Target is not on or near any active cameras on the station."))
-/mob/living/silicon/ai/ex_act(var/severity)
+/mob/living/silicon/ai/ex_act(severity)
if(severity == 1.0)
qdel(src)
return
diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
index 18db9be96d..b1286b3178 100644
--- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm
+++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
@@ -1,7 +1,7 @@
/mob/living/silicon/ai
var/mob/living/silicon/robot/deployed_shell = null //For shell control
-/mob/living/silicon/ai/proc/deploy_to_shell(var/mob/living/silicon/robot/target)
+/mob/living/silicon/ai/proc/deploy_to_shell(mob/living/silicon/robot/target)
if(!CONFIG_GET(flag/allow_ai_shells))
to_chat(src, span_warning("AI Shells are not allowed on this server. You shouldn't have this verb because of it, so consider making a bug report."))
return
diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm
index 622fcd0b4e..234fe985c1 100644
--- a/code/modules/mob/living/silicon/ai/ai_vr.dm
+++ b/code/modules/mob/living/silicon/ai/ai_vr.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/ai/Initialize(mapload, is_decoy, var/datum/ai_laws/L, var/obj/item/mmi/B, var/safety = FALSE)
+/mob/living/silicon/ai/Initialize(mapload, is_decoy, datum/ai_laws/L, obj/item/mmi/B, safety = FALSE)
. = ..()
add_language(LANGUAGE_BIRDSONG, 1)
add_language(LANGUAGE_SAGARU, 1)
@@ -9,7 +9,7 @@
add_language(LANGUAGE_DRUDAKAR, 1)
add_language(LANGUAGE_TAVAN, 1)
-/mob/AIize(var/move = TRUE)
+/mob/AIize(move = TRUE)
. = ..()
add_language(LANGUAGE_BIRDSONG, 1)
add_language(LANGUAGE_SAGARU, 1)
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index 91f55424d8..b3ff0ced98 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -35,9 +35,9 @@
user.showLaws(src)
-/mob/proc/showLaws(var/mob/living/silicon/S)
+/mob/proc/showLaws(mob/living/silicon/S)
return
-/mob/observer/dead/showLaws(var/mob/living/silicon/S)
+/mob/observer/dead/showLaws(mob/living/silicon/S)
if(antagHUD || is_admin(src))
S.laws.show_laws(src)
diff --git a/code/modules/mob/living/silicon/ai/icons.dm b/code/modules/mob/living/silicon/ai/icons.dm
index f1d5ab27f0..569c9d36d3 100644
--- a/code/modules/mob/living/silicon/ai/icons.dm
+++ b/code/modules/mob/living/silicon/ai/icons.dm
@@ -10,7 +10,7 @@ GLOBAL_LIST_INIT_TYPED(ai_icons, /datum/ai_icon, init_subtypes(/datum/ai_icon, a
var/dead_icon = "ai-crash"
var/dead_light = "#000099"
-/datum/ai_icon/New(var/name, var/alive_icon, var/nopower_icon, var/dead_icon, var/alive_light, var/nopower_light, var/dead_light)
+/datum/ai_icon/New(name, alive_icon, nopower_icon, dead_icon, alive_light, nopower_light, dead_light)
if(name)
src.name = name
src.alive_icon = alive_icon
diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm
index c6fb2f874c..87b1722456 100755
--- a/code/modules/mob/living/silicon/ai/laws.dm
+++ b/code/modules/mob/living/silicon/ai/laws.dm
@@ -3,7 +3,7 @@
set name = "Show Laws"
src.show_laws()
-/mob/living/silicon/ai/show_laws(var/everyone = 0)
+/mob/living/silicon/ai/show_laws(everyone = 0)
var/who
if (everyone)
@@ -15,7 +15,7 @@
src.laws_sanity_check()
src.laws.show_laws(who)
-/mob/living/silicon/ai/add_ion_law(var/law)
+/mob/living/silicon/ai/add_ion_law(law)
..()
for(var/mob/living/silicon/robot/R in GLOB.mob_list)
if(R.lawupdate && (R.connected_ai == src))
diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm
index 4f8baf250d..eb857aef1d 100644
--- a/code/modules/mob/living/silicon/ai/malf.dm
+++ b/code/modules/mob/living/silicon/ai/malf.dm
@@ -76,7 +76,7 @@
research.cpu_increase_per_tick = research.cpu_increase_per_tick * 2
// Starts AI's APU generator
-/mob/living/silicon/ai/proc/start_apu(var/shutup = 0)
+/mob/living/silicon/ai/proc/start_apu(shutup = 0)
if(!hardware || !istype(hardware, /datum/malf_hardware/apu_gen))
if(!shutup)
to_chat(src, "You do not have an APU generator and you shouldn't have this verb. Report this.")
@@ -90,7 +90,7 @@
APU_power = 1
// Stops AI's APU generator
-/mob/living/silicon/ai/proc/stop_apu(var/shutup = 0)
+/mob/living/silicon/ai/proc/stop_apu(shutup = 0)
if(!hardware || !istype(hardware, /datum/malf_hardware/apu_gen))
return
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index 2ef6c6bba6..216a41ff8c 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -10,7 +10,7 @@
/mob/living/silicon/proc/has_zeroth_law()
return laws.zeroth_law != null
-/mob/living/silicon/proc/set_zeroth_law(var/law, var/law_borg, notify = TRUE)
+/mob/living/silicon/proc/set_zeroth_law(law, law_borg, notify = TRUE)
throw_alert("newlaw", /atom/movable/screen/alert/newlaw)
laws_sanity_check()
laws.set_zeroth_law(law, law_borg)
@@ -18,26 +18,26 @@
notify_of_law_change(law||law_borg ? "NEW ZEROTH LAW: [isrobot(src) && law_borg ? law_borg : law]" : null)
log_and_message_admins("has given [src] the zeroth laws: [law]/[law_borg ? law_borg : "N/A"]")
-/mob/living/silicon/robot/set_zeroth_law(var/law, var/law_borg, notify = TRUE)
+/mob/living/silicon/robot/set_zeroth_law(law, law_borg, notify = TRUE)
..()
if(tracking_entities)
to_chat(src, span_warning("Internal camera is currently being accessed."))
-/mob/living/silicon/proc/add_ion_law(var/law, notify = TRUE)
+/mob/living/silicon/proc/add_ion_law(law, notify = TRUE)
laws_sanity_check()
laws.add_ion_law(law)
if(notify)
notify_of_law_change("NEW \[!ERROR!\] LAW: [law]")
log_and_message_admins("has given [src] the ion law: [law]")
-/mob/living/silicon/proc/add_inherent_law(var/law, notify = TRUE)
+/mob/living/silicon/proc/add_inherent_law(law, notify = TRUE)
laws_sanity_check()
laws.add_inherent_law(law)
if(notify)
notify_of_law_change("NEW CORE LAW: [law]")
log_and_message_admins("has given [src] the inherent law: [law]")
-/mob/living/silicon/proc/add_supplied_law(var/number, var/law, notify = TRUE)
+/mob/living/silicon/proc/add_supplied_law(number, law, notify = TRUE)
laws_sanity_check()
laws.add_supplied_law(number, law)
if(notify)
@@ -45,14 +45,14 @@
notify_of_law_change("NEW \[[th]\] LAW: [law]")
log_and_message_admins("has given [src] the supplied law: [law]")
-/mob/living/silicon/proc/delete_law(var/datum/ai_law/law, notify = TRUE)
+/mob/living/silicon/proc/delete_law(datum/ai_law/law, notify = TRUE)
laws_sanity_check()
laws.delete_law(law)
if(notify)
notify_of_law_change("LAW DELETED: [law.law]")
log_and_message_admins("has deleted a law belonging to [src]: [law.law]")
-/mob/living/silicon/proc/clear_inherent_laws(var/silent = 0, notify = TRUE)
+/mob/living/silicon/proc/clear_inherent_laws(silent = 0, notify = TRUE)
laws_sanity_check()
laws.clear_inherent_laws()
if(notify)
@@ -60,7 +60,7 @@
if(!silent)
log_and_message_admins("cleared the inherent laws of [src]")
-/mob/living/silicon/proc/clear_ion_laws(var/silent = 0, notify = TRUE)
+/mob/living/silicon/proc/clear_ion_laws(silent = 0, notify = TRUE)
laws_sanity_check()
laws.clear_ion_laws()
if(notify)
@@ -68,7 +68,7 @@
if(!silent)
log_and_message_admins("cleared the ion laws of [src]")
-/mob/living/silicon/proc/clear_supplied_laws(var/silent = 0, notify = TRUE)
+/mob/living/silicon/proc/clear_supplied_laws(silent = 0, notify = TRUE)
laws_sanity_check()
laws.clear_supplied_laws()
if(notify)
@@ -85,7 +85,7 @@
window_flash(client)
to_chat(src, span_warning(message))
-/mob/living/silicon/proc/statelaws(var/datum/ai_laws/laws)
+/mob/living/silicon/proc/statelaws(datum/ai_laws/laws)
var/prefix = ""
if(MAIN_CHANNEL == lawchannel)
prefix = ";"
@@ -96,7 +96,7 @@
dostatelaws(lawchannel, prefix, laws)
-/mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws)
+/mob/living/silicon/proc/dostatelaws(method, prefix, datum/ai_laws/laws)
if(stating_laws[prefix])
to_chat(src, span_notice("[method]: Already stating laws using this communication method."))
return
@@ -114,7 +114,7 @@
to_chat(src, span_danger("[method]: Unable to state laws. Communication method unavailable."))
stating_laws[prefix] = 0
-/mob/living/silicon/proc/statelaw(var/law)
+/mob/living/silicon/proc/statelaw(law)
if(direct_say(law))
sleep(10)
return 1
@@ -133,7 +133,7 @@
laws.sort_laws()
// Ripped out from events.
-/mob/living/silicon/proc/generate_ion_law(var/exclude_crew_names = FALSE)
+/mob/living/silicon/proc/generate_ion_law(exclude_crew_names = FALSE)
var/list/players = list()
for(var/mob/living/carbon/human/player in GLOB.player_list)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 0913e3b325..9a19f856fb 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -169,7 +169,7 @@
src << sound('sound/effects/pai_login.ogg', volume = 75) //VOREStation Add
/// Load pref save data from client and apply it to the pai.
-/mob/living/silicon/pai/proc/apply_preferences(client/cli, var/silent = 1)
+/mob/living/silicon/pai/proc/apply_preferences(client/cli, silent = 1)
if(!cli?.prefs)
return FALSE
var/datum/preferences/pref = cli.prefs
@@ -382,7 +382,7 @@
// Allow card inhabited machines to be interacted with
// This has to override ClickOn because of storage depth nonsense with how pAIs are in cards in GLOB.machines
-/mob/living/silicon/pai/ClickOn(var/atom/A, var/params)
+/mob/living/silicon/pai/ClickOn(atom/A, params)
if(istype(A, /obj/machinery))
var/obj/machinery/M = A
if(M.paicard == card)
@@ -391,7 +391,7 @@
return ..()
// Handle being picked up.
-/mob/living/silicon/pai/get_scooped(var/mob/living/carbon/grabber, var/self_drop)
+/mob/living/silicon/pai/get_scooped(mob/living/carbon/grabber, self_drop)
var/obj/item/holder/H = ..(grabber, self_drop)
if(!istype(H))
return
@@ -631,7 +631,7 @@
holo_icon_west = new_holo_west
return TRUE
-/mob/living/silicon/pai/set_dir(var/new_dir)
+/mob/living/silicon/pai/set_dir(new_dir)
. = ..()
if(. && SSpai.chassis_data(chassis_name).holo_projector)
switch(dir)
diff --git a/code/modules/mob/living/silicon/pai/pai_verbs.dm b/code/modules/mob/living/silicon/pai/pai_verbs.dm
index e5319fea38..1f0da89001 100644
--- a/code/modules/mob/living/silicon/pai/pai_verbs.dm
+++ b/code/modules/mob/living/silicon/pai/pai_verbs.dm
@@ -1,5 +1,5 @@
/// Change currently viewed camera
-/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
+/mob/living/silicon/pai/proc/switchCamera(obj/machinery/camera/C)
if (!C)
src.reset_perspective()
return 0
@@ -134,7 +134,7 @@
G.client?.prefs?.read_preference(/datum/preference/toggle/ghost_see_whisubtle))
to_chat(G, span_filter_say(span_cult("[src.name]'s screen prints, \"[message]\"")))
-/mob/living/silicon/pai/proc/pai_nom(var/mob/living/T in oview(1))
+/mob/living/silicon/pai/proc/pai_nom(mob/living/T in oview(1))
set name = "pAI Nom"
set category = "Abilities.pAI Commands"
set desc = "Allows you to eat someone while unfolded. Can't be used while in card form."
@@ -172,7 +172,7 @@
update_icon()
card.setEmotion(card.current_emotion)
-/mob/living/silicon/pai/proc/hug(var/mob/living/silicon/pai/H, var/mob/living/target)
+/mob/living/silicon/pai/proc/hug(mob/living/silicon/pai/H, mob/living/target)
var/t_him = "them"
if(ishuman(target))
diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm
index 30e9ef4097..259a52d2fd 100644
--- a/code/modules/mob/living/silicon/pai/say.dm
+++ b/code/modules/mob/living/silicon/pai/say.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/pai/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/silicon/pai/say(message, datum/language/speaking = null, whispering = 0)
if(silence_time)
to_chat(src, span_green("Communication circuits remain uninitialized."))
else if(card.speech_synthesizer != PP_FUNCTIONAL)
diff --git a/code/modules/mob/living/silicon/robot/cloak.dm b/code/modules/mob/living/silicon/robot/cloak.dm
index 89cac9d658..6ee0274d53 100644
--- a/code/modules/mob/living/silicon/robot/cloak.dm
+++ b/code/modules/mob/living/silicon/robot/cloak.dm
@@ -44,7 +44,7 @@
update_cloak(R) //Update the cloak strength on the robot.
return //We ran out of power. RIP.
-/obj/item/borg/cloak/proc/update_cloak(var/mob/living/silicon/robot/robot)
+/obj/item/borg/cloak/proc/update_cloak(mob/living/silicon/robot/robot)
if(!robot || !isrobot(robot))
return
if(active && cloak_strength) //We remove any cloaks they might have
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index 7b959c04a0..3ababa9e30 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -220,7 +220,7 @@
return C && C.installed == 1 && C.toggled && C.is_powered()
// Returns component by it's string name
-/mob/living/silicon/robot/proc/get_component(var/component_name)
+/mob/living/silicon/robot/proc/get_component(component_name)
var/datum/robot_component/C = components[component_name]
return C
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_defense_modules.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_defense_modules.dm
index 2e1a6daf39..1e4916fb13 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_defense_modules.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_defense_modules.dm
@@ -60,7 +60,7 @@
icon_state = disabled_icon
update_icon()
-/obj/item/self_repair_system/proc/self_repair(mob/living/silicon/robot/R, datum/robot_component/C, var/tick_delay, var/heal_per_tick)
+/obj/item/self_repair_system/proc/self_repair(mob/living/silicon/robot/R, datum/robot_component/C, tick_delay, heal_per_tick)
if(!C || !R.cell)
return
if(C.brute_damage == 0 && C.electronics_damage == 0)
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
index 8ba6d25806..9dc4332870 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules.dm
@@ -352,7 +352,7 @@
var/busy
var/list/clamps = list()
-/obj/item/dogborg/stasis_clamp/afterattack(var/atom/A, mob/user as mob, proximity)
+/obj/item/dogborg/stasis_clamp/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity)
return
@@ -404,7 +404,7 @@
var/mob/living/silicon/robot/R = user
R.leap(bluespace)
-/mob/living/silicon/robot/proc/leap(var/bluespace = FALSE)
+/mob/living/silicon/robot/proc/leap(bluespace = FALSE)
if(last_special > world.time)
to_chat(src, span_filter_notice("Your leap actuators are still recharging."))
return
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm
index 2976aaca85..00dba23c7a 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper.dm
@@ -80,7 +80,7 @@
var/datum/gas_mixture/belly_air/air = new(1000)
return air
-/obj/item/dogborg/sleeper/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity_flag, click_parameters)
+/obj/item/dogborg/sleeper/afterattack(atom/movable/target, mob/living/silicon/user, proximity_flag, click_parameters)
hound = loc
if(!istype(target))
return
@@ -173,7 +173,7 @@
log_admin("[key_name(hound)] has eaten [key_name(patient)] with a cyborg belly. ([hound ? "JMP" : "null"])")
playsound(src, gulpsound, vol = 100, vary = 1, falloff = 0.1, preference = /datum/preference/toggle/eating_noises)
-/obj/item/dogborg/sleeper/proc/ingest_atom(var/atom/ingesting)
+/obj/item/dogborg/sleeper/proc/ingest_atom(atom/ingesting)
if (!ingesting || ingesting == hound)
return
var/obj/belly/belly = hound.vore_selected
@@ -198,7 +198,7 @@
to_eat.forceMove(belly)
log_admin("VORE: [hound] used their [src] to swallow [to_eat].")
-/obj/item/dogborg/sleeper/proc/ingest_living(var/mob/living/victim, var/obj/belly/belly)
+/obj/item/dogborg/sleeper/proc/ingest_living(mob/living/victim, obj/belly/belly)
if (victim.devourable && is_vore_predator(hound))
belly.nom_atom(victim, hound)
add_attack_logs(hound, victim, "Eaten via [belly.name]")
@@ -231,7 +231,7 @@
hound.updateVRPanel()
update_patient()
-/obj/item/dogborg/sleeper/proc/drain(var/amt = 3) //Slightly reduced cost (before, it was always injecting inaprov)
+/obj/item/dogborg/sleeper/proc/drain(amt = 3) //Slightly reduced cost (before, it was always injecting inaprov)
hound = src.loc
if(istype(hound,/obj/item/robot_module))
hound = hound.loc
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm
index e17851dd13..e685cfab6d 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm
@@ -38,7 +38,7 @@
/obj/item/projectile/beam/medical_cell/borg
range = 4
-/obj/item/projectile/beam/medical_cell/borg/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/borg/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-3.75)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index c5eab9b0c9..5a0126cb8b 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -1,6 +1,6 @@
GLOBAL_LIST_EMPTY(mob_hat_cache)
-/proc/get_hat_icon(var/obj/item/hat, var/offset_x = 0, var/offset_y = 0)
+/proc/get_hat_icon(obj/item/hat, offset_x = 0, offset_y = 0)
var/t_state = hat.icon_state
if(LAZYACCESS(hat.item_state_slots, slot_head_str))
t_state = hat.item_state_slots[slot_head_str]
@@ -208,7 +208,7 @@ GLOBAL_LIST_EMPTY(mob_hat_cache)
/mob/living/silicon/robot/drone/pick_module()
return
-/mob/living/silicon/robot/drone/proc/wear_hat(var/obj/item/new_hat)
+/mob/living/silicon/robot/drone/proc/wear_hat(obj/item/new_hat)
if(hat)
return
hat = new_hat
@@ -216,7 +216,7 @@ GLOBAL_LIST_EMPTY(mob_hat_cache)
update_icon()
//Drones cannot be upgraded with borg modules so we need to catch some items before they get used in ..().
-/mob/living/silicon/robot/drone/attackby(var/obj/item/W, var/mob/user)
+/mob/living/silicon/robot/drone/attackby(obj/item/W, mob/user)
if(user.a_intent == I_HELP && istype(W, /obj/item/clothing/head))
if(hat)
@@ -257,7 +257,7 @@ GLOBAL_LIST_EMPTY(mob_hat_cache)
..()
-/mob/living/silicon/robot/drone/emag_act(var/remaining_charges, var/mob/user)
+/mob/living/silicon/robot/drone/emag_act(remaining_charges, mob/user)
if(!client || stat == 2)
to_chat(user, span_danger("There's not much point subverting this heap of junk."))
return
@@ -338,7 +338,7 @@ GLOBAL_LIST_EMPTY(mob_hat_cache)
if(O.client.prefs.be_special & BE_PAI)
question(O.client)
-/mob/living/silicon/robot/drone/proc/question(var/client/C)
+/mob/living/silicon/robot/drone/proc/question(client/C)
spawn(0)
if(!C || jobban_isbanned(C,JOB_CYBORG)) return
var/response = tgui_alert(C, "Someone is attempting to reboot a maintenance drone. Would you like to play as one?", "Maintenance drone reboot", list("Yes", "No", "Never for this round"))
@@ -349,7 +349,7 @@ GLOBAL_LIST_EMPTY(mob_hat_cache)
else if (response == "Never for this round")
C.prefs.be_special ^= BE_PAI
-/mob/living/silicon/robot/drone/proc/transfer_personality(var/client/player)
+/mob/living/silicon/robot/drone/proc/transfer_personality(client/player)
if(!player) return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index 9f9a02bf3e..3891a22f81 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -21,7 +21,7 @@
return
-/mob/living/silicon/robot/drone/MouseDrop(var/atom/over_object)
+/mob/living/silicon/robot/drone/MouseDrop(atom/over_object)
var/mob/living/carbon/human/H = over_object
if(!istype(H) || !Adjacent(H))
return ..()
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index a615e79984..92b702b221 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -11,7 +11,7 @@
//Used to enable or disable drone fabrication.
var/obj/machinery/drone_fabricator/dronefab
-/obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/drone_control/attack_ai(mob/user as mob)
return src.attack_hand(user)
/obj/machinery/computer/drone_control/tgui_status(mob/user)
@@ -19,7 +19,7 @@
return STATUS_CLOSE
return ..()
-/obj/machinery/computer/drone_control/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/drone_control/attack_hand(mob/user as mob)
if(..())
return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
index 5d281ebcf9..8bbe7d9149 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
@@ -1,9 +1,9 @@
//Redefining some robot procs, since drones can't be repaired and really shouldn't take component damage.
-/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/used_weapon = null)
+/mob/living/silicon/robot/drone/take_overall_damage(brute = 0, burn = 0, sharp = FALSE, used_weapon = null)
bruteloss += brute
fireloss += burn
-/mob/living/silicon/robot/drone/heal_overall_damage(var/brute, var/burn)
+/mob/living/silicon/robot/drone/heal_overall_damage(brute, burn)
bruteloss -= brute
fireloss -= burn
@@ -11,10 +11,10 @@
if(bruteloss<0) bruteloss = 0
if(fireloss<0) fireloss = 0
-/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/emp = 0)
+/mob/living/silicon/robot/drone/take_organ_damage(brute = 0, burn = 0, sharp = FALSE, emp = 0)
take_overall_damage(brute,burn)
-/mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn)
+/mob/living/silicon/robot/drone/heal_organ_damage(brute, burn)
heal_overall_damage(brute,burn)
/mob/living/silicon/robot/drone/getFireLoss()
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index bbf1f124cb..96c03b9ebb 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -73,7 +73,7 @@
if(produce_drones && drone_progress >= 100 && isobserver(user) && CONFIG_GET(flag/allow_drone_spawn) && count_drones() < CONFIG_GET(number/max_maint_drones))
. += "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone."
-/obj/machinery/drone_fabricator/proc/create_drone(var/client/player)
+/obj/machinery/drone_fabricator/proc/create_drone(client/player)
if(stat & NOPOWER)
return
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer_unify.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer_unify.dm
index ecc14cbf46..136ed9dab5 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer_unify.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer_unify.dm
@@ -7,7 +7,7 @@
"Maintenance Module" = /mob/living/silicon/robot/drone,
) //List of drone types to choose from.//Changeable in mapping.
-/obj/machinery/drone_fabricator/unify/create_drone(var/client/player)
+/obj/machinery/drone_fabricator/unify/create_drone(client/player)
choose_dronetype(possible_drones) //Call Drone choice before executing create_drone
..()
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
index 76bda1e237..b3ac066d06 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/robot/drone/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/silicon/robot/drone/say(message, datum/language/speaking = null, whispering = 0)
if(local_transmit)
if (src.client)
if(client.prefs.muted & MUTE_IC)
diff --git a/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm b/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm
index c3b0674761..d163f6e2a2 100644
--- a/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/swarm_abilities.dm
@@ -14,7 +14,7 @@
hud_state = "swarm_replicate"
-/datum/spell/aoe_turf/conjure/swarmer/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/swarmer/conjure_animation(atom/movable/overlay/animation, turf/target)
animation.icon_state = "deflect_static"
flick("shield2",animation)
spawn(1 SECOND)
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index daeda08f9f..7cddc93c81 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -178,14 +178,14 @@
return list(module_state_1, module_state_2, module_state_3)
// This one takes an object's type instead of an instance, as above.
-/mob/living/silicon/robot/proc/has_active_type(var/type_to_compare, var/explicit = FALSE)
+/mob/living/silicon/robot/proc/has_active_type(type_to_compare, explicit = FALSE)
var/list/active_modules = get_active_modules()
if(is_type_in_modules(type_to_compare, active_modules, explicit))
return TRUE
return FALSE
/// Searches through a provided list to see if we have a module that is in that list.
-/mob/living/silicon/robot/proc/has_active_type_list(var/list/type_to_compare, var/explicit = FALSE)
+/mob/living/silicon/robot/proc/has_active_type_list(list/type_to_compare, explicit = FALSE)
var/list/active_modules = get_active_modules()
if(islist(type_to_compare))
for(var/object_to_compare in type_to_compare)
@@ -194,7 +194,7 @@
return FALSE
// Checks if the activated module is of the given type
-/mob/living/silicon/robot/proc/activated_module_type_list(var/list/type_to_compare, var/explicit = FALSE)
+/mob/living/silicon/robot/proc/activated_module_type_list(list/type_to_compare, explicit = FALSE)
if(!islist(type_to_compare))
return FALSE
for(var/type in type_to_compare)
@@ -202,7 +202,7 @@
return TRUE
return FALSE
-/mob/living/silicon/robot/proc/is_type_in_modules(var/type, var/list/modules, var/explicit = FALSE)
+/mob/living/silicon/robot/proc/is_type_in_modules(type, list/modules, explicit = FALSE)
for(var/atom/module in modules)
if(explicit && isatom(module))
if(module.type == type)
@@ -215,11 +215,11 @@
//These are hackish but they help clean up code elsewhere.
//module_selected(module) - Checks whether the module slot specified by "module" is currently selected.
-/mob/living/silicon/robot/proc/module_selected(var/module) //Module is 1-3
+/mob/living/silicon/robot/proc/module_selected(module) //Module is 1-3
return module == get_selected_module()
//module_active(module) - Checks whether there is a module active in the slot specified by "module".
-/mob/living/silicon/robot/proc/module_active(var/module) //Module is 1-3
+/mob/living/silicon/robot/proc/module_active(module) //Module is 1-3
if(module < 1 || module > 3) return 0
switch(module)
@@ -246,7 +246,7 @@
return 0
//select_module(module) - Selects the module slot specified by "module"
-/mob/living/silicon/robot/proc/select_module(var/module) //Module is 1-3
+/mob/living/silicon/robot/proc/select_module(module) //Module is 1-3
if(module < 1 || module > 3) return
if(!module_active(module)) return
@@ -279,7 +279,7 @@
return
//deselect_module(module) - Deselects the module slot specified by "module"
-/mob/living/silicon/robot/proc/deselect_module(var/module) //Module is 1-3
+/mob/living/silicon/robot/proc/deselect_module(module) //Module is 1-3
if(module < 1 || module > 3) return
switch(module)
@@ -304,7 +304,7 @@
return
//toggle_module(module) - Toggles the selection of the module slot specified by "module".
-/mob/living/silicon/robot/proc/toggle_module(var/module) //Module is 1-3
+/mob/living/silicon/robot/proc/toggle_module(module) //Module is 1-3
if(module < 1 || module > 3) return
if(module_selected(module))
@@ -337,7 +337,7 @@
return
-/mob/living/silicon/robot/proc/activate_module(var/obj/item/O)
+/mob/living/silicon/robot/proc/activate_module(obj/item/O)
if(!(locate(O) in src.module.modules) && !(locate(O) in src.module.emag))
return
if(activated(O))
@@ -372,7 +372,7 @@
return
after_equip(O)
-/mob/living/silicon/robot/proc/after_equip(var/obj/item/O)
+/mob/living/silicon/robot/proc/after_equip(obj/item/O)
if(istype(O, /obj/item/gps))
var/obj/item/gps/tracker = O
if(tracker.tracking)
@@ -402,7 +402,7 @@
for(var/datum/action/A as anything in O.actions)
A.Grant(src)
-/mob/living/silicon/robot/put_in_hands(var/obj/item/W) // No hands.
+/mob/living/silicon/robot/put_in_hands(obj/item/W) // No hands.
W.forceMove(get_turf(src))
return 1
diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm
index add016a659..d73b8a1a46 100644
--- a/code/modules/mob/living/silicon/robot/laws.dm
+++ b/code/modules/mob/living/silicon/robot/laws.dm
@@ -3,7 +3,7 @@
set name = "Show Laws"
show_laws()
-/mob/living/silicon/robot/show_laws(var/everyone = 0)
+/mob/living/silicon/robot/show_laws(everyone = 0)
laws_sanity_check()
var/who
var/mob/living/original
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index ba581c8441..7acbc98e4e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -274,7 +274,7 @@
lawsync()
photosync()
-/mob/living/silicon/robot/drain_power(var/drain_check, var/surge, var/amount = 0)
+/mob/living/silicon/robot/drain_power(drain_check, surge, amount = 0)
if(drain_check)
return 1
@@ -380,7 +380,7 @@
return ..()
-/mob/living/silicon/robot/drop_from_inventory(var/obj/item/W, var/atom/target = null)
+/mob/living/silicon/robot/drop_from_inventory(obj/item/W, atom/target = null)
if(module_active && istype(module_active,/obj/item/gripper))
var/obj/item/gripper/robot_gripper = module_active
robot_gripper.drop_item_nm(target)
@@ -388,7 +388,7 @@
// CONTINUE CODING HERE
/*
-/mob/living/silicon/robot/proc/set_module_sprites(var/list/new_sprites)
+/mob/living/silicon/robot/proc/set_module_sprites(list/new_sprites)
if(new_sprites && new_sprites.len)
module_sprites = new_sprites.Copy()
//Custom_sprite check and entry
@@ -429,7 +429,7 @@
else
braintype = BORG_BRAINTYPE_CYBORG
-/mob/living/silicon/robot/proc/updatename(var/prefix as text)
+/mob/living/silicon/robot/proc/updatename(prefix as text)
if(prefix)
modtype = prefix
@@ -597,7 +597,7 @@
/mob/living/silicon/robot/restrained()
return 0
-/mob/living/silicon/robot/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/silicon/robot/bullet_act(obj/item/projectile/Proj)
..(Proj)
if(prob(75) && Proj.damage > 0) spark_system.start()
return 2
@@ -862,7 +862,7 @@
return
-/mob/living/silicon/robot/proc/module_reset(var/notify = TRUE)
+/mob/living/silicon/robot/proc/module_reset(notify = TRUE)
transform_with_anim() //sprite animation
uneq_all()
hud_used.update_robot_modules_display(TRUE)
@@ -976,7 +976,7 @@
return
//Robots take half damage from basic attacks.
-/mob/living/silicon/robot/attack_generic(var/mob/user, var/damage, var/attack_message)
+/mob/living/silicon/robot/attack_generic(mob/user, damage, attack_message)
return ..(user,FLOOR(damage/2, 1),attack_message)
/mob/living/silicon/robot/proc/allowed(mob/M)
@@ -1160,7 +1160,7 @@
to_chat(R, span_filter_notice("Buffers flushed and reset. Camera system shutdown. All systems operational."))
remove_verb(src, /mob/living/silicon/robot/proc/ResetSecurityCodes)
-/mob/living/silicon/robot/proc/SetLockdown(var/state = 1)
+/mob/living/silicon/robot/proc/SetLockdown(state = 1)
// They stay locked down if their wire is cut.
if(wires.is_cut(WIRE_BORG_LOCKED))
state = 1
@@ -1216,7 +1216,7 @@
// Uses power from cyborg's cell. Returns 1 on success or 0 on failure.
// Properly converts using CELLRATE now! Amount is in Joules.
-/mob/living/silicon/robot/proc/cell_use_power(var/amount = 0)
+/mob/living/silicon/robot/proc/cell_use_power(amount = 0)
// No cell inserted
if(!cell)
return 0
@@ -1233,7 +1233,7 @@
// Function to directly drain power from the robot's cell, allows to set a minimum level beneath which
// abilities can no longer be used
-/mob/living/silicon/robot/proc/use_direct_power(var/amount = 0, var/lower_limit = 0)
+/mob/living/silicon/robot/proc/use_direct_power(amount = 0, lower_limit = 0)
// No cell inserted
if(!cell)
return FALSE
@@ -1255,7 +1255,7 @@
return 1
return 0
-/mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/first_arg, var/second_arg)
+/mob/living/silicon/robot/proc/notify_ai(notifytype, first_arg, second_arg)
if(!connected_ai)
return
if(shell && notifytype != ROBOT_NOTIFICATION_AI_SHELL)
@@ -1280,7 +1280,7 @@
connected_ai.connected_robots -= src
connected_ai = null
-/mob/living/silicon/robot/proc/connect_to_ai(var/mob/living/silicon/ai/AI)
+/mob/living/silicon/robot/proc/connect_to_ai(mob/living/silicon/ai/AI)
if(AI && AI != connected_ai && !shell)
disconnect_from_ai()
connected_ai = AI
@@ -1288,7 +1288,7 @@
notify_ai(ROBOT_NOTIFICATION_NEW_UNIT)
sync()
-/mob/living/silicon/robot/emag_act(var/remaining_charges, var/mob/user)
+/mob/living/silicon/robot/emag_act(remaining_charges, mob/user)
if(!opened)//Cover is closed
if(locked)
if(prob(90))
@@ -1377,7 +1377,7 @@
return braintype != BORG_BRAINTYPE_DRONE
-/mob/living/silicon/robot/drop_item(var/atom/Target)
+/mob/living/silicon/robot/drop_item(atom/Target)
if(module_active && istype(module_active,/obj/item/gripper))
var/obj/item/gripper/robot_gripper = module_active
robot_gripper.drop_item_nm()
@@ -1426,7 +1426,7 @@
update_icon()
-/mob/living/silicon/robot/verb/robot_nom(var/mob/living/T in living_mobs_in_view(1))
+/mob/living/silicon/robot/verb/robot_nom(mob/living/T in living_mobs_in_view(1))
set name = "Robot Nom"
set category = "Abilities.Vore"
set desc = "Allows you to eat someone."
@@ -1502,7 +1502,7 @@
/mob/living/silicon/robot/MouseDrop_T(mob/living/M, mob/living/user) //Prevention for forced relocation caused by can_buckle. Base proc has no other use.
return
-/mob/living/silicon/robot/proc/robot_mount(var/mob/living/M in living_mobs(1))
+/mob/living/silicon/robot/proc/robot_mount(mob/living/M in living_mobs(1))
set name = "Robot Mount/Dismount"
set category = "Abilities.General"
set desc = "Let people ride on you."
@@ -1518,7 +1518,7 @@
if(buckle_mob(M))
visible_message(span_notice("[M] starts riding [name]!"))
-/mob/living/silicon/robot/get_scooped(var/mob/living/carbon/grabber, var/self_drop)
+/mob/living/silicon/robot/get_scooped(mob/living/carbon/grabber, self_drop)
var/obj/item/holder/H = ..(grabber, self_drop)
if(!istype(H))
return
@@ -1545,7 +1545,7 @@
..()
// Those basic ones require quite detailled checks on the robot's vars to see if they are installed!
-/mob/living/silicon/robot/proc/has_basic_upgrade(var/given_type)
+/mob/living/silicon/robot/proc/has_basic_upgrade(given_type)
if(given_type == /obj/item/borg/upgrade/basic/vtec)
return (/mob/living/silicon/robot/proc/toggle_vtec in verbs)
else if(given_type == /obj/item/borg/upgrade/basic/sizeshift)
@@ -1557,7 +1557,7 @@
return null
// We check for the module only here
-/mob/living/silicon/robot/proc/has_upgrade_module(var/given_type)
+/mob/living/silicon/robot/proc/has_upgrade_module(given_type)
if(!module) //If we don't have a module, don't even bother.
return null
var/obj/T = locate(given_type) in module
@@ -1568,7 +1568,7 @@
return T
// Most of the advanced ones, we can easily check, but a few special cases exist and need to be handled specially
-/mob/living/silicon/robot/proc/has_advanced_upgrade(var/given_type)
+/mob/living/silicon/robot/proc/has_advanced_upgrade(given_type)
if(given_type == /obj/item/borg/upgrade/advanced/bellysizeupgrade)
var/obj/item/dogborg/sleeper/T = has_upgrade_module(/obj/item/dogborg/sleeper)
if(T && T.upgraded_capacity)
@@ -1585,11 +1585,11 @@
return null
// Do we support specific upgrades?
-/mob/living/silicon/robot/proc/supports_upgrade(var/given_type)
+/mob/living/silicon/robot/proc/supports_upgrade(given_type)
return (given_type in module.supported_upgrades)
// Most of the restricted ones, we can easily check, but a few special cases exist and need to be handled specially
-/mob/living/silicon/robot/proc/has_restricted_upgrade(var/given_type)
+/mob/living/silicon/robot/proc/has_restricted_upgrade(given_type)
if(given_type == /obj/item/borg/upgrade/restricted/bellycapupgrade)
var/obj/item/dogborg/sleeper/T = has_upgrade_module(/obj/item/dogborg/sleeper)
if(T && T.compactor)
@@ -1634,7 +1634,7 @@
return null
// Check if we have any non production upgrades
-/mob/living/silicon/robot/proc/has_no_prod_upgrade(var/given_type)
+/mob/living/silicon/robot/proc/has_no_prod_upgrade(given_type)
if(given_type == /obj/item/borg/upgrade/no_prod/toygun)
return has_upgrade_module(/obj/item/gun/projectile/cyborgtoy)
if(given_type == /obj/item/borg/upgrade/no_prod/vision_xray)
@@ -1649,7 +1649,7 @@
return has_upgrade_module(/obj/item/borg/sight/anomalous)
return null
-/mob/living/silicon/robot/proc/has_upgrade(var/given_type)
+/mob/living/silicon/robot/proc/has_upgrade(given_type)
return (has_basic_upgrade(given_type) || has_advanced_upgrade(given_type) || has_restricted_upgrade(given_type) || has_no_prod_upgrade(given_type))
#undef CYBORG_POWER_USAGE_MULTIPLIER
@@ -1695,7 +1695,7 @@
return
module.handle_special_unlocks(src)
-/mob/living/silicon/robot/proc/scramble_hardware(var/chance)
+/mob/living/silicon/robot/proc/scramble_hardware(chance)
if(prob(chance)) //Small chance to spawn with a scrambled
emag_items = TRUE
diff --git a/code/modules/mob/living/silicon/robot/robot_animation_vr.dm b/code/modules/mob/living/silicon/robot/robot_animation_vr.dm
index fb92fa83f7..11e3672b99 100644
--- a/code/modules/mob/living/silicon/robot/robot_animation_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_animation_vr.dm
@@ -14,7 +14,7 @@
anchored = TRUE
addtimer(CALLBACK(src, PROC_REF(transform_animation_sounds), 6, prev_lockcharge), 0.2 SECONDS)
-/mob/living/silicon/robot/proc/transform_animation_sounds(var/recall, var/prev_lockcharge)
+/mob/living/silicon/robot/proc/transform_animation_sounds(recall, prev_lockcharge)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(recall > 0)
@@ -24,7 +24,7 @@
return
transform_animation_end_lockdown(prev_lockcharge)
-/mob/living/silicon/robot/proc/transform_animation_end_lockdown(var/prev_lockcharge)
+/mob/living/silicon/robot/proc/transform_animation_end_lockdown(prev_lockcharge)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!prev_lockcharge)
diff --git a/code/modules/mob/living/silicon/robot/robot_bellies.dm b/code/modules/mob/living/silicon/robot/robot_bellies.dm
index 17f97a7475..35cff7905c 100644
--- a/code/modules/mob/living/silicon/robot/robot_bellies.dm
+++ b/code/modules/mob/living/silicon/robot/robot_bellies.dm
@@ -18,11 +18,11 @@
sprite_datum.belly_light_list = list("sleeper")
handle_belly_update() //Set how full the newly defined bellies are, if they're already full
-/mob/living/silicon/robot/proc/reset_belly_lights(var/b_class)
+/mob/living/silicon/robot/proc/reset_belly_lights(b_class)
if(sprite_datum.belly_light_list.len && sprite_datum.belly_light_list.Find(b_class))
vore_light_states[b_class] = 0
-/mob/living/silicon/robot/proc/update_belly_lights(var/b_class)
+/mob/living/silicon/robot/proc/update_belly_lights(b_class)
if(sprite_datum.belly_light_list.len && sprite_datum.belly_light_list.Find(b_class))
vore_light_states[b_class] = 2
for (var/belly in vore_organs)
@@ -35,7 +35,7 @@
vore_light_states[b_class] = 1
return
-/mob/living/silicon/robot/vs_animate(var/belly_class)
+/mob/living/silicon/robot/vs_animate(belly_class)
if(!sprite_datum.has_vore_struggle_sprite)
return
if(belly_class == "sleeper" && sleeper_state == 0 && vore_selected.silicon_belly_overlay_preference == "Sleeper")
@@ -49,7 +49,7 @@
add_overlay("[sprite_datum.get_belly_overlay(src, vs_fullness, belly_class)]-struggle")
addtimer(CALLBACK(src, PROC_REF(end_vs_animate), belly_class), 1.2 SECONDS)
-/mob/living/silicon/robot/proc/end_vs_animate(var/belly_class)
+/mob/living/silicon/robot/proc/end_vs_animate(belly_class)
var/vs_fullness = vore_fullness_ex[belly_class]
if(resting)
cut_overlay("[sprite_datum.get_belly_resting_overlay(src, vs_fullness, belly_class)]-struggle")
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index 3a02f2799d..99054f29e9 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -29,19 +29,19 @@
if(C.installed != 0) amount += C.electronics_damage
return amount
-/mob/living/silicon/robot/adjustBruteLoss(var/amount,var/include_robo)
+/mob/living/silicon/robot/adjustBruteLoss(amount,include_robo)
if(amount > 0)
take_overall_damage(amount, 0)
else
heal_overall_damage(-amount, 0)
-/mob/living/silicon/robot/adjustFireLoss(var/amount,var/include_robo)
+/mob/living/silicon/robot/adjustFireLoss(amount,include_robo)
if(amount > 0)
take_overall_damage(0, amount)
else
heal_overall_damage(0, -amount)
-/mob/living/silicon/robot/proc/get_damaged_components(var/brute, var/burn, var/destroyed = 0)
+/mob/living/silicon/robot/proc/get_damaged_components(brute, burn, destroyed = 0)
var/list/datum/robot_component/parts = list()
for(var/V in components)
var/datum/robot_component/C = components[V]
@@ -65,13 +65,13 @@
return C
return 0
-/mob/living/silicon/robot/heal_organ_damage(var/brute, var/burn)
+/mob/living/silicon/robot/heal_organ_damage(brute, burn)
var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
if(!parts.len) return
var/datum/robot_component/picked = pick(parts)
picked.heal_damage(brute,burn)
-/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/edge = FALSE, var/emp = 0)
+/mob/living/silicon/robot/take_organ_damage(brute = 0, burn = 0, sharp = FALSE, edge = FALSE, emp = 0)
var/list/components = get_damageable_components()
if(!components.len)
return
@@ -101,7 +101,7 @@
var/datum/robot_component/C = pick(components)
C.take_damage(brute,burn,sharp,edge)
-/mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn)
+/mob/living/silicon/robot/heal_overall_damage(brute, burn)
var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
while(parts.len && (brute>0 || burn>0) )
@@ -117,7 +117,7 @@
parts -= picked
-/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = FALSE, var/used_weapon = null)
+/mob/living/silicon/robot/take_overall_damage(brute = 0, burn = 0, sharp = FALSE, used_weapon = null)
if(SEND_SIGNAL(src, COMSIG_CHECK_FOR_GODMODE) & COMSIG_GODMODE_CANCEL) //Normally we'd let this proc continue on, but it's much less time consumptive to just do a godmode check here.
return 0 // Cancelled by a component
var/list/datum/robot_component/parts = get_damageable_components()
diff --git a/code/modules/mob/living/silicon/robot/robot_gripper_handling.dm b/code/modules/mob/living/silicon/robot/robot_gripper_handling.dm
index 1484e8b8e3..33eeb4b7c0 100644
--- a/code/modules/mob/living/silicon/robot/robot_gripper_handling.dm
+++ b/code/modules/mob/living/silicon/robot/robot_gripper_handling.dm
@@ -13,7 +13,7 @@
return TRUE
return FALSE
-/obj/item/gripper/proc/update_ref(var/datum/weakref/new_ref)
+/obj/item/gripper/proc/update_ref(datum/weakref/new_ref)
var/had_item = get_wrapped_item()
WR = new_ref
var/holding_item = get_wrapped_item()
@@ -107,7 +107,7 @@
if(wrapped)
return wrapped.attack_self(user)
-/obj/item/gripper/attackby(var/obj/item/O, var/mob/user)
+/obj/item/gripper/attackby(obj/item/O, mob/user)
if(is_in_use(user))
return FALSE
@@ -421,7 +421,7 @@
return wrapped
/// Consolidates material stacks by searching our pockets to see if we currently have any stacks. Done in /obj/item/stack/attackby
-/obj/item/gripper/proc/consolidate_stacks(var/obj/item/stack/stack_to_consolidate)
+/obj/item/gripper/proc/consolidate_stacks(obj/item/stack/stack_to_consolidate)
if(!stack_to_consolidate || !istype(stack_to_consolidate, /obj/item/stack))
return
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index 1a5ca1aa9c..4a2fab2469 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -37,7 +37,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "autoharvester"
-/obj/item/robot_harvester/afterattack(var/atom/target, var/mob/living/user, proximity)
+/obj/item/robot_harvester/afterattack(atom/target, mob/living/user, proximity)
if(!target)
return
if(!proximity)
@@ -496,7 +496,7 @@
STOP_PROCESSING(SSobj, src)
. = ..()
-/obj/item/borg/combat/shield/attack_self(var/mob/living/user)
+/obj/item/borg/combat/shield/attack_self(mob/living/user)
. = ..(user)
if(.)
return TRUE
@@ -516,7 +516,7 @@
user.visible_message(span_danger("[user]'s shield reactivates!"), span_danger("Your shield reactivates!"))
user.update_icon()
-/obj/item/borg/combat/shield/proc/adjust_flash_count(var/mob/living/user, amount)
+/obj/item/borg/combat/shield/proc/adjust_flash_count(mob/living/user, amount)
if(active) //Can't destabilize a shield that's not on
flash_count += amount
@@ -525,7 +525,7 @@
if(flash_count >= overload_threshold)
overload(user)
-/obj/item/borg/combat/shield/proc/overload(var/mob/living/user)
+/obj/item/borg/combat/shield/proc/overload(mob/living/user)
active = 0
user.visible_message(span_danger("[user]'s shield destabilizes!"), span_danger("Your shield destabilizes!"))
user.update_icon()
@@ -566,7 +566,7 @@
max_walls = 10
max_doors = 5
-/obj/item/inflatable_dispenser/examine(var/mob/user)
+/obj/item/inflatable_dispenser/examine(mob/user)
. = ..()
. += "It has [stored_walls] wall segment\s and [stored_doors] door segment\s stored."
. += "It is set to deploy [mode ? "doors" : "walls"]"
@@ -578,7 +578,7 @@
mode = !mode
to_chat(user, span_filter_notice("You set \the [src] to deploy [mode ? "doors" : "walls"]."))
-/obj/item/inflatable_dispenser/afterattack(var/atom/A, var/mob/user)
+/obj/item/inflatable_dispenser/afterattack(atom/A, mob/user)
..(A, user)
if(!user)
return
@@ -590,7 +590,7 @@
if(istype(A, /obj/item/inflatable) || istype(A, /obj/structure/inflatable))
pick_up(A, user)
-/obj/item/inflatable_dispenser/proc/try_deploy_inflatable(var/turf/T, var/mob/living/user)
+/obj/item/inflatable_dispenser/proc/try_deploy_inflatable(turf/T, mob/living/user)
if(mode) // Door deployment
if(!stored_doors)
to_chat(user, span_filter_notice("\The [src] is out of doors!"))
@@ -612,7 +612,7 @@
playsound(T, 'sound/items/zip.ogg', 75, 1)
to_chat(user, span_filter_notice("You deploy the inflatable [mode ? "door" : "wall"]!"))
-/obj/item/inflatable_dispenser/proc/pick_up(var/obj/A, var/mob/living/user)
+/obj/item/inflatable_dispenser/proc/pick_up(obj/A, mob/living/user)
if(istype(A, /obj/structure/inflatable))
if(!istype(A, /obj/structure/inflatable/door))
if(stored_walls >= max_walls)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/event.dm b/code/modules/mob/living/silicon/robot/robot_modules/event.dm
index 88739e31c5..f550f51104 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/event.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/event.dm
@@ -9,7 +9,7 @@
/obj/item/robot_module/robot/malf/lost
name = "lost robot module"
-/obj/item/robot_module/robot/malf/lost/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/malf/lost/create_equipment(mob/living/silicon/robot/robot)
..()
// Sec
src.modules += new /obj/item/melee/robotic/baton/shocker(src)
@@ -55,7 +55,7 @@
/obj/item/robot_module/robot/malf/gravekeeper
name = "gravekeeper robot module"
-/obj/item/robot_module/robot/malf/gravekeeper/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/malf/gravekeeper/create_equipment(mob/living/silicon/robot/robot)
..()
// For fending off animals and looters
src.modules += new /obj/item/melee/robotic/baton/shocker(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
index c1ed2fe353..6cad61ff49 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm
@@ -70,14 +70,14 @@
for(var/obj/item/I in modules)
I.canremove = FALSE
-/obj/item/robot_module/proc/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/proc/create_equipment(mob/living/silicon/robot/robot)
if(!istype(robot.idcard, idcard_type))
QDEL_NULL(robot.idcard)
robot.init_id(idcard_type)
return
// Reset the module and delete it
-/obj/item/robot_module/proc/reset_module(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/proc/reset_module(mob/living/silicon/robot/robot)
remove_camera_networks(robot)
remove_languages(robot)
remove_subsystems(robot)
@@ -115,7 +115,7 @@
for(var/datum/matter_synth/S in synths)
S.emp_act(severity, recursive)
-/obj/item/robot_module/proc/respawn_consumable(var/mob/living/silicon/robot/R, var/rate)
+/obj/item/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R, rate)
SHOULD_CALL_PARENT(TRUE)
if(!LAZYLEN(synths))
return
@@ -130,7 +130,7 @@
if(O)
modules += O
-/obj/item/robot_module/proc/add_languages(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/add_languages(mob/living/silicon/robot/R)
// Stores the languages as they were before receiving the module, and whether they could be synthezized.
for(var/datum/language/language_datum in R.languages)
original_languages[language_datum] = (language_datum in R.speech_synthesizer_langs)
@@ -138,7 +138,7 @@
for(var/language in languages)
R.add_language(language, languages[language])
-/obj/item/robot_module/proc/remove_languages(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/remove_languages(mob/living/silicon/robot/R)
// Clear all added languages, whether or not we originally had them.
for(var/language in languages)
R.remove_language(language)
@@ -148,33 +148,33 @@
R.add_language(original_language, original_languages[original_language])
original_languages.Cut()
-/obj/item/robot_module/proc/add_camera_networks(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/add_camera_networks(mob/living/silicon/robot/R)
if(R.camera && (NETWORK_ROBOTS in R.camera.network))
for(var/network in networks)
if(!(network in R.camera.network))
R.camera.add_network(network)
added_networks |= network
-/obj/item/robot_module/proc/remove_camera_networks(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/remove_camera_networks(mob/living/silicon/robot/R)
if(R.camera)
R.camera.remove_networks(added_networks)
added_networks.Cut()
-/obj/item/robot_module/proc/add_subsystems(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/add_subsystems(mob/living/silicon/robot/R)
add_verb(R, subsystems)
-/obj/item/robot_module/proc/remove_subsystems(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/remove_subsystems(mob/living/silicon/robot/R)
remove_verb(R, subsystems)
-/obj/item/robot_module/proc/apply_status_flags(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/apply_status_flags(mob/living/silicon/robot/R)
if(!can_be_pushed)
R.status_flags &= ~CANPUSH
-/obj/item/robot_module/proc/remove_status_flags(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/remove_status_flags(mob/living/silicon/robot/R)
if(!can_be_pushed)
R.status_flags |= CANPUSH
-/obj/item/robot_module/proc/handle_shell(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/proc/handle_shell(mob/living/silicon/robot/R)
if(R.braintype == BORG_BRAINTYPE_AI_SHELL)
channels = list(
CHANNEL_MEDICAL = 1,
@@ -267,7 +267,7 @@
LAZYADD(synths, plastic)
// Cyborgs (non-drones), default loadout. This will be given to every module.
-/obj/item/robot_module/robot/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/create_equipment(mob/living/silicon/robot/robot)
..()
//CHOMPEdit Start
var/datum/matter_synth/water = new /datum/matter_synth(500)
@@ -298,7 +298,7 @@
name = "standard robot module"
pto_type = PTO_CIVILIAN
-/obj/item/robot_module/robot/standard/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/standard/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/tool/wrench/cyborg(src)
src.modules += new /obj/item/healthanalyzer(src)
@@ -324,7 +324,7 @@
name = "surgeon robot module"
-/obj/item/robot_module/robot/medical/surgeon/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/medical/surgeon/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/healthanalyzer(src)
src.modules += new /obj/item/sleevemate(src)
@@ -364,7 +364,7 @@
src.modules += new /obj/item/dogborg/sleeper/trauma(src)
src.emag += new /obj/item/dogborg/pounce(src)
-/obj/item/robot_module/robot/medical/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/medical/surgeon/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
@@ -382,7 +382,7 @@
/obj/item/robot_module/robot/medical/crisis
name = "crisis robot module"
-/obj/item/robot_module/robot/medical/crisis/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/medical/crisis/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/healthanalyzer(src)
src.modules += new /obj/item/sleevemate(src)
@@ -432,7 +432,7 @@
src.modules += new /obj/item/dogborg/sleeper(src)
src.emag += new /obj/item/dogborg/pounce(src) //Pounce
-/obj/item/robot_module/robot/medical/crisis/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/medical/crisis/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
@@ -455,7 +455,7 @@
subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor)
pto_type = PTO_ENGINEERING
-/obj/item/robot_module/robot/engineering/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/engineering/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/robotic_multibelt(src)
src.modules += new /obj/item/robotic_multibelt(src)
@@ -513,7 +513,7 @@
/obj/item/robot_module/robot/security/general
name = "security robot module"
-/obj/item/robot_module/robot/security/general/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/security/general/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/handcuffs/cyborg(src)
src.modules += new /obj/item/melee/robotic/baton(src)
@@ -528,7 +528,7 @@
src.modules += new /obj/item/dogborg/sleeper/K9(src) //Eat criminals. Bring them to the brig.
src.modules += new /obj/item/dogborg/pounce(src) //Pounce
-/obj/item/robot_module/robot/security/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/security/respawn_consumable(mob/living/silicon/robot/R, amount)
..()
var/obj/item/flash/F = locate() in src.modules
if(F.broken)
@@ -551,7 +551,7 @@
channels = list(CHANNEL_SERVICE = 1)
pto_type = PTO_CIVILIAN
-/obj/item/robot_module/robot/janitor/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/janitor/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/soap/nanotrasen(src)
src.modules += new /obj/item/storage/bag/trash(src)
@@ -606,7 +606,7 @@
src.emag += new /obj/item/dogborg/pounce(src) //Pounce
-/obj/item/robot_module/robot/janitor/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/janitor/respawn_consumable(mob/living/silicon/robot/R, amount)
..()
var/obj/item/lightreplacer/LR = locate() in src.modules
LR.Charge(R, amount)
@@ -648,7 +648,7 @@
/obj/item/robot_module/robot/clerical/butler
name = "service robot module"
-/obj/item/robot_module/robot/clerical/butler/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/clerical/butler/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/gripper/service(src)
src.modules += new /obj/item/robotic_multibelt/service(src)
@@ -680,7 +680,7 @@
src.emag += new /obj/item/dogborg/pounce(src) //Pounce
-/obj/item/robot_module/robot/clerical/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/clerical/butler/respawn_consumable(mob/living/silicon/robot/R, amount)
..()
var/obj/item/reagent_containers/food/drinks/bottle/small/beer/PB = locate() in src.emag
if(PB)
@@ -693,7 +693,7 @@
pto_type = PTO_CIVILIAN
can_be_pushed = 0
-/obj/item/robot_module/robot/clerical/honkborg/create_equipment(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/robot/clerical/honkborg/create_equipment(mob/living/silicon/robot/R)
src.modules += new /obj/item/gripper/service(src)
src.modules += new /obj/item/reagent_containers/glass/bucket/cyborg(src)
src.modules += new /obj/item/robotic_multibelt/botanical(src)
@@ -723,7 +723,7 @@
LS.name = "Lube spray"
..()
-/obj/item/robot_module/robot/clerical/honkborg/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/clerical/honkborg/respawn_consumable(mob/living/silicon/robot/R, amount)
..()
var/obj/item/reagent_containers/spray/LS = locate() in src.emag
if(LS)
@@ -732,7 +732,7 @@
/obj/item/robot_module/robot/clerical/general
name = "clerical robot module"
-/obj/item/robot_module/robot/clerical/general/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/clerical/general/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/pen/robopen(src)
src.modules += new /obj/item/form_printer(src)
@@ -754,7 +754,7 @@
pto_type = PTO_CARGO
idcard_type = /obj/item/card/id/synthetic/borg
-/obj/item/robot_module/robot/miner/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/miner/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/tool/wrench/cyborg(src)
@@ -796,7 +796,7 @@
supported_upgrades = list(/obj/item/borg/upgrade/restricted/advrped, /obj/item/borg/upgrade/restricted/anomalygun)
pto_type = PTO_SCIENCE
-/obj/item/robot_module/robot/research/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/research/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/experi_scanner(src)
src.modules += new /obj/item/robotanalyzer(src)
@@ -838,7 +838,7 @@
src.modules += new /obj/item/robotic_multibelt/materials(src)
src.emag += new /obj/item/dogborg/pounce(src)
-/obj/item/robot_module/robot/research/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/research/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
@@ -854,7 +854,7 @@
hide_on_manifest = TRUE
supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade)
-/obj/item/robot_module/robot/security/combat/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/security/combat/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/handcuffs/cyborg(src)
src.modules += new /obj/item/taperoll/police(src)
@@ -880,7 +880,7 @@
no_slip = 1
networks = list(NETWORK_ENGINEERING)
-/obj/item/robot_module/drone/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/drone/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/borg/sight/meson(src)
src.modules += new /obj/item/weldingtool/electric/mounted/cyborg(src)
@@ -930,11 +930,11 @@
channels = list(CHANNEL_ENGINEERING = 1)
languages = list()
-/obj/item/robot_module/drone/construction/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/drone/construction/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/rcd/electric/mounted/borg/lesser(src)
-/obj/item/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/drone/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/lightreplacer/LR = locate() in src.modules
LR.Charge(R, amount)
..()
@@ -945,7 +945,7 @@
channels = list(CHANNEL_SUPPLY = 1)
networks = list(NETWORK_MINE)
-/obj/item/robot_module/drone/mining/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/drone/mining/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/borg/sight/material(src)
src.modules += new /obj/item/pickaxe/borgdrill(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm b/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm
index 9b364ccd78..14cbfe7c1c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/swarm.dm
@@ -3,7 +3,7 @@
var/obj/item/card/id/drone_id
idcard_type = /obj/item/card/id/syndicate
-/obj/item/robot_module/drone/swarm/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/drone/swarm/create_equipment(mob/living/silicon/robot/robot)
..()
var/obj/item/card/id/robot_id = robot.idcard
@@ -20,12 +20,12 @@
/obj/item/robot_module/drone/swarm/ranged
name = "swarm gunner module"
-/obj/item/robot_module/drone/swarm/ranged/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/drone/swarm/ranged/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/gun/energy/xray/swarm(src)
-/obj/item/robot_module/drone/swarm/melee/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/drone/swarm/melee/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/melee/robotic/blade/ionic/lance(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm
index a18ab78693..487361cd6b 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm
@@ -22,7 +22,7 @@
idcard_type = /obj/item/card/id/syndicate
// All syndie modules get these, and the base borg items (flash, crowbar, etc).
-/obj/item/robot_module/robot/syndicate/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/syndicate/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/pinpointer/shuttle/merc(src)
src.modules += new /obj/item/melee/robotic/blade/syndicate(src)
@@ -49,7 +49,7 @@
name = "protector robot module"
supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade)
-/obj/item/robot_module/robot/syndicate/protector/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/syndicate/protector/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/shield_projector/rectangle/weak(src)
src.modules += new /obj/item/gun/energy/robotic/laser/dakkalaser(src)
@@ -64,7 +64,7 @@
/obj/item/robot_module/robot/syndicate/mechanist
name = "mechanist robot module"
-/obj/item/robot_module/robot/syndicate/mechanist/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/syndicate/mechanist/create_equipment(mob/living/silicon/robot/robot)
..()
// General engineering/hacking.
src.modules += new /obj/item/borg/sight/meson(src)
@@ -118,7 +118,7 @@
name = "combat medic robot module"
supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade)
-/obj/item/robot_module/robot/syndicate/combat_medic/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/syndicate/combat_medic/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/healthanalyzer/phasic(src)
src.modules += new /obj/item/reagent_containers/borghypo/merc(src)
@@ -159,7 +159,7 @@
src.modules += new /obj/item/dogborg/sleeper/syndie(src)
src.modules += new /obj/item/dogborg/pounce(src)
-/obj/item/robot_module/robot/syndicate/combat_medic/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/syndicate/combat_medic/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/reagent_containers/syringe/S = locate() in src.modules
if(S.mode == 2)
@@ -173,7 +173,7 @@
name = "ninja robot module"
supported_upgrades = list(/obj/item/borg/upgrade/restricted/bellycapupgrade)
-/obj/item/robot_module/robot/syndicate/ninja/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/syndicate/ninja/create_equipment(mob/living/silicon/robot/robot)
..()
src.modules += new /obj/item/dogborg/sleeper/K9/syndie(src)
src.modules += new /obj/item/dogborg/pounce(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
index caddfa2f0c..f33b83b8bd 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules_yw.dm
@@ -129,7 +129,7 @@
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
-/obj/item/robot_module/medical/robot/surgeon/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/medical/robot/surgeon/respawn_consumable(mob/living/silicon/robot/R, amount)
if(src.emag)
var/obj/item/reagent_containers/spray/PS = src.emag
PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount)
diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm
index 68aff84b8e..d10806f38b 100644
--- a/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -6,7 +6,7 @@
/mob/living/silicon/robot/Check_Shoegrip()
return module && module.no_slip
-/mob/living/silicon/robot/Process_Spacemove(var/check_drift = 0)
+/mob/living/silicon/robot/Process_Spacemove(check_drift = 0)
if(..())//Can move due to other reasons, don't use jetpack fuel
return 1
diff --git a/code/modules/mob/living/silicon/robot/robot_remote_control.dm b/code/modules/mob/living/silicon/robot/robot_remote_control.dm
index b2c0355640..e4db3368b1 100644
--- a/code/modules/mob/living/silicon/robot/robot_remote_control.dm
+++ b/code/modules/mob/living/silicon/robot/robot_remote_control.dm
@@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells)
transfer_shell()
-/mob/living/silicon/robot/proc/transfer_shell(var/mob/living/silicon/robot/target)
+/mob/living/silicon/robot/proc/transfer_shell(mob/living/silicon/robot/target)
var/mob/living/silicon/ai/AI = mainframe
//relay AI
if(!CONFIG_GET(flag/allow_ai_shells)) // CHOMPEdit
diff --git a/code/modules/mob/living/silicon/robot/robot_simple_items.dm b/code/modules/mob/living/silicon/robot/robot_simple_items.dm
index 848fa48981..ba3fb6adf5 100644
--- a/code/modules/mob/living/silicon/robot/robot_simple_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_simple_items.dm
@@ -420,7 +420,7 @@
for(var/obj/item/robotic_multibelt/materials/mat_belt in contents) //If it's in our handstory
mat_belt.generate_tools()
-/mob/living/silicon/robot/proc/can_install_synth(var/datum/matter_synth/type_to_check)
+/mob/living/silicon/robot/proc/can_install_synth(datum/matter_synth/type_to_check)
if(!ispath(type_to_check, /datum/matter_synth))
return FALSE
for(var/datum/matter_synth/synth in module.synths)
@@ -717,7 +717,7 @@
can_hold = list(ORGAN_GRIPPER)
-/obj/item/gripper/no_use/organ/Entered(var/atom/movable/AM)
+/obj/item/gripper/no_use/organ/Entered(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 1
@@ -725,7 +725,7 @@
organ.preserved = 1
..()
-/obj/item/gripper/no_use/organ/Exited(var/atom/movable/AM)
+/obj/item/gripper/no_use/organ/Exited(atom/movable/AM)
if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM
O.preserved = 0
diff --git a/code/modules/mob/living/silicon/robot/robot_ui_module.dm b/code/modules/mob/living/silicon/robot/robot_ui_module.dm
index 4d2ea4a84c..56a07710a2 100644
--- a/code/modules/mob/living/silicon/robot/robot_ui_module.dm
+++ b/code/modules/mob/living/silicon/robot/robot_ui_module.dm
@@ -156,13 +156,13 @@
close_ui()
return TRUE
-/mob/living/silicon/robot/proc/apply_name(var/new_name)
+/mob/living/silicon/robot/proc/apply_name(new_name)
if(!custom_name)
if (new_name)
custom_name = new_name
sprite_name = new_name
-/mob/living/silicon/robot/proc/apply_module(var/datum/robot_sprite/new_datum, var/new_module)
+/mob/living/silicon/robot/proc/apply_module(datum/robot_sprite/new_datum, new_module)
icon_selected = TRUE
var/module_type = GLOB.robot_modules[new_module]
if(modtype != new_module || !module)
diff --git a/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm b/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm
index a634a10eae..c30b179ebe 100644
--- a/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/_sprite_datum.dm
@@ -42,10 +42,10 @@
var/list/hat_offset = list("north" = list(0, -3), "south" = list(0, -3), "east" = list(4, -3), "west" = list(-4, -3))
/// Determines if the borg has the proper flags to show an overlay.
-/datum/robot_sprite/proc/sprite_flag_check(var/flag_to_check)
+/datum/robot_sprite/proc/sprite_flag_check(flag_to_check)
return (sprite_flags & flag_to_check)
-/datum/robot_sprite/proc/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/handle_extra_icon_updates(mob/living/silicon/robot/ourborg)
if(ourborg.resting) //Don't do ANY of the overlay code if we're resting. It just won't look right!
return
if(sprite_flag_check(ROBOT_HAS_SHIELD_SPEED_SPRITE))
@@ -104,7 +104,7 @@
ourborg.add_overlay("[sprite_icon_state]-melee")
continue
-/datum/robot_sprite/proc/get_belly_overlay(var/mob/living/silicon/robot/ourborg, var/size = 1, var/b_class)
+/datum/robot_sprite/proc/get_belly_overlay(mob/living/silicon/robot/ourborg, size = 1, b_class)
//Size
if(has_sleeper_light_indicator || belly_light_list.len)
if(belly_light_list.len)
@@ -126,7 +126,7 @@
return "[sprite_icon_state]-[b_class]-[size]-[sleeperColor]"
return "[sprite_icon_state]-[b_class]-[size]"
-/datum/robot_sprite/proc/get_belly_resting_overlay(var/mob/living/silicon/robot/ourborg, var/size = 1, var/b_class)
+/datum/robot_sprite/proc/get_belly_resting_overlay(mob/living/silicon/robot/ourborg, size = 1, b_class)
if(!(ourborg.rest_style in rest_sprite_options))
ourborg.rest_style = "Default"
switch(ourborg.rest_style)
@@ -137,12 +137,12 @@
else
return "[get_belly_overlay(ourborg, size, b_class)]-rest"
-/datum/robot_sprite/proc/get_glow_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_glow_overlay(mob/living/silicon/robot/ourborg)
if(!ourborg.resting)
return "[sprite_icon_state]-glow"
return "[get_rest_sprite(ourborg)]-glow"
-/datum/robot_sprite/proc/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(!(ourborg.resting && has_rest_sprites))
return "[sprite_icon_state]-eyes"
else if(ourborg.resting && has_rest_eyes_sprites)
@@ -150,7 +150,7 @@
else
return
-/datum/robot_sprite/proc/get_eye_light_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_eye_light_overlay(mob/living/silicon/robot/ourborg)
if(!(ourborg.resting && has_rest_sprites))
return "[sprite_icon_state]-lights"
else if(ourborg.resting && has_rest_lights_sprites)
@@ -159,7 +159,7 @@
return
// This can not use the get_rest_sprite function as it could use belly overlays as decals
-/datum/robot_sprite/proc/get_robotdecal_overlay(var/mob/living/silicon/robot/ourborg, var/type)
+/datum/robot_sprite/proc/get_robotdecal_overlay(mob/living/silicon/robot/ourborg, type)
if(LAZYLEN(sprite_decals))
if(!ourborg.resting)
return "[sprite_icon_state]-[type]"
@@ -172,7 +172,7 @@
return "[sprite_icon_state]-[type]-rest"
-/datum/robot_sprite/proc/get_rest_sprite(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_rest_sprite(mob/living/silicon/robot/ourborg)
if(!(ourborg.rest_style in rest_sprite_options))
ourborg.rest_style = "Default"
switch(ourborg.rest_style)
@@ -183,13 +183,13 @@
else
return "[sprite_icon_state]-rest"
-/datum/robot_sprite/proc/get_dead_sprite(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_dead_sprite(mob/living/silicon/robot/ourborg)
return "[sprite_icon_state]-wreck"
-/datum/robot_sprite/proc/get_dead_sprite_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_dead_sprite_overlay(mob/living/silicon/robot/ourborg)
return "wreck-overlay"
-/datum/robot_sprite/proc/get_open_sprite(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/get_open_sprite(mob/living/silicon/robot/ourborg)
if(!ourborg.opened)
return
if(ourborg.wiresexposed)
@@ -204,10 +204,10 @@
return
-/datum/robot_sprite/proc/handle_extra_customization(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/proc/handle_extra_customization(mob/living/silicon/robot/ourborg)
return
-/datum/robot_sprite/proc/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/proc/do_equipment_glamour(obj/item/robot_module/module)
if(!dogborg_sprites)
var/obj/item/melee/robotic/jaws/small/small_jaws = locate() in module.modules
if(small_jaws)
diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm
index e82820ca77..99d47f836d 100644
--- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm
@@ -227,19 +227,19 @@
REAGENT_WHISKEYSODA = "boozeorange",
REAGENT_COFFEE = "boozebrown")
-/datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(mob/living/silicon/robot/ourborg)
if(!("boozehound" in ourborg.sprite_extra_customization) || !ourborg.sprite_extra_customization["boozehound"])
return ..()
else
ourborg.icon_state = booze_options[ourborg.sprite_extra_customization["boozehound"]]
-/datum/robot_sprite/dogborg/service/booze/get_belly_overlay(var/mob/living/silicon/robot/ourborg, var/size = 1, var/b_class)
+/datum/robot_sprite/dogborg/service/booze/get_belly_overlay(mob/living/silicon/robot/ourborg, size = 1, b_class)
if(!("boozehound" in ourborg.sprite_extra_customization) || !ourborg.sprite_extra_customization["boozehound"] || b_class != "sleeper")
return ..()
else
return "[booze_options[ourborg.sprite_extra_customization["boozehound"]]]-[b_class]-[size]"
-/datum/robot_sprite/dogborg/service/booze/get_rest_sprite(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/service/booze/get_rest_sprite(mob/living/silicon/robot/ourborg)
if(!(ourborg.rest_style in rest_sprite_options))
ourborg.rest_style = "Default"
if(!("boozehound" in ourborg.sprite_extra_customization) || !ourborg.sprite_extra_customization["boozehound"])
@@ -247,7 +247,7 @@
else
return "[booze_options[ourborg.sprite_extra_customization["boozehound"]]]-rest"
-/datum/robot_sprite/dogborg/service/booze/handle_extra_customization(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/service/booze/handle_extra_customization(mob/living/silicon/robot/ourborg)
var/choice = tgui_input_list(ourborg, "Choose your drink!", "Drink Choice", booze_options)
if(ourborg && choice && !ourborg.stat)
if(!("boozehound" in ourborg.sprite_extra_customization))
diff --git a/code/modules/mob/living/silicon/robot/sprites/combat.dm b/code/modules/mob/living/silicon/robot/sprites/combat.dm
index 70faae3ece..c98ee6bc26 100644
--- a/code/modules/mob/living/silicon/robot/sprites/combat.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/combat.dm
@@ -19,7 +19,7 @@
sprite_icon_state = "droid"
sprite_flags = ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_SHIELD_SPRITE
-/datum/robot_sprite/combat/droid/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/combat/droid/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
@@ -91,7 +91,7 @@
sprite_icon = 'icons/mob/robot/combat_large.dmi'
has_custom_equipment_sprites = TRUE
-/datum/robot_sprite/dogborg/tall/combat/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/tall/combat/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
@@ -117,14 +117,14 @@
rest_sprite_options = list("Default", "Sit")
sprite_flags = ROBOT_HAS_GUN_SPRITE | ROBOT_HAS_SHIELD_SPRITE
-/datum/robot_sprite/dogborg/tall/combat/derg/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/derg/handle_extra_icon_updates(mob/living/silicon/robot/ourborg)
..()
if(ourborg.resting)
return
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
ourborg.add_overlay("[sprite_icon_state]-roll")
-/datum/robot_sprite/dogborg/tall/combat/derg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/derg/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
@@ -154,17 +154,17 @@
sprite_flags = ROBOT_HAS_GUN_SPRITE | ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_SPEED_SPRITE
hat_offset = RAPTOR_HAT_OFFSET
-/datum/robot_sprite/dogborg/tall/combat/raptor/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/raptor/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
return ..()
-/datum/robot_sprite/dogborg/tall/combat/raptor/get_eye_light_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/raptor/get_eye_light_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
return ..()
-/datum/robot_sprite/dogborg/tall/combat/raptor/get_belly_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/raptor/get_belly_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
@@ -210,7 +210,7 @@
has_custom_equipment_sprites = TRUE
has_eye_sprites = FALSE
-/datum/robot_sprite/dogborg/wide/combat/blade/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/wide/combat/blade/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
diff --git a/code/modules/mob/living/silicon/robot/sprites/command.dm b/code/modules/mob/living/silicon/robot/sprites/command.dm
index eb885d5e6d..6633e84000 100644
--- a/code/modules/mob/living/silicon/robot/sprites/command.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/command.dm
@@ -36,7 +36,7 @@
pto_type = PTO_CIVILIAN
can_be_pushed = 0
-/obj/item/robot_module/robot/chound/create_equipment(var/mob/living/silicon/robot/R)
+/obj/item/robot_module/robot/chound/create_equipment(mob/living/silicon/robot/R)
src.modules += new /obj/item/pen/robopen(src)
src.modules += new /obj/item/form_printer(src)
src.modules += new /obj/item/gripper/paperwork(src)
diff --git a/code/modules/mob/living/silicon/robot/sprites/event.dm b/code/modules/mob/living/silicon/robot/sprites/event.dm
index 7e6342590c..72453ea042 100644
--- a/code/modules/mob/living/silicon/robot/sprites/event.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/event.dm
@@ -19,7 +19,7 @@
module_type = "Lost"
sprite_icon = 'icons/mob/robot/lost_wide.dmi'
-/datum/robot_sprite/dogborg/lost/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/lost/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm
index 91cb7dac7e..90d52d5afb 100644
--- a/code/modules/mob/living/silicon/robot/sprites/medical.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm
@@ -249,7 +249,7 @@
module_type = "Crisis"
sprite_icon = 'icons/mob/robot/surgical_wide.dmi'
-/datum/robot_sprite/dogborg/surgical/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/surgical/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
@@ -292,7 +292,7 @@
module_type = "Crisis"
sprite_icon = 'icons/mob/robot/surgical_large.dmi'
-/datum/robot_sprite/dogborg/tall/surgical/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/tall/surgical/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
@@ -372,14 +372,14 @@
sprite_icon = 'icons/mob/robot/crisis_wide.dmi'
/* //Handled by the normal belly code now.
-/datum/robot_sprite/dogborg/crisis/get_belly_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/crisis/get_belly_overlay(mob/living/silicon/robot/ourborg)
if(has_sleeper_light_indicator)
if(ourborg.sleeper_state == 2 && !(ourborg.vore_selected?.silicon_belly_overlay_preference == "Vorebelly")) return "[sprite_icon_state]-sleeper_g"
else return "[sprite_icon_state]-sleeper_r"
else
return ..()
*/
-/datum/robot_sprite/dogborg/crisis/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/crisis/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
@@ -436,7 +436,7 @@
module_type = "Crisis"
sprite_icon = 'icons/mob/robot/crisis_large.dmi'
-/datum/robot_sprite/dogborg/tall/crisis/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/tall/crisis/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm
index 63e5f049e5..2177b05e5e 100644
--- a/code/modules/mob/living/silicon/robot/sprites/science.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/science.dm
@@ -106,7 +106,7 @@
module_type = "Research"
sprite_icon = 'icons/mob/robot/science_wide.dmi'
-/datum/robot_sprite/dogborg/science/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/science/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
@@ -160,7 +160,7 @@
module_type = "Research"
sprite_icon = 'icons/mob/robot/science_large.dmi'
-/datum/robot_sprite/dogborg/tall/science/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/tall/science/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
diff --git a/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm b/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm
index ec56290450..d01bc42f12 100644
--- a/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/sprite_organized/gooborgs.dm
@@ -112,7 +112,7 @@
sprite_flags = ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE | ROBOT_HAS_MELEE_SPRITE //Melee is baton.
hat_offset = GOOBORG_HAT_OFFSET
-/datum/robot_sprite/dogborg/tall/security/gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/security/gooborg/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
@@ -169,7 +169,7 @@
sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_SPEED_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE | ROBOT_HAS_MELEE_SPRITE //Baton
hat_offset = GOOBORG_HAT_OFFSET
-/datum/robot_sprite/dogborg/tall/combat/gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat/gooborg/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
return ..()
@@ -225,7 +225,7 @@
sprite_hud_icon_state = "malf" //malf!!
hat_offset = GOOBORG_HAT_OFFSET
-/datum/robot_sprite/dogborg/tall/ninja/gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/ninja/gooborg/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
@@ -250,7 +250,7 @@
module_type = list("Combat Medic", "Mechanist", "Protector") //You get all three modules.
hat_offset = GOOBORG_HAT_OFFSET
-/datum/robot_sprite/dogborg/tall/combat_medic/gooborg/get_eyes_overlay(var/mob/living/silicon/robot/ourborg)
+/datum/robot_sprite/dogborg/tall/combat_medic/gooborg/get_eyes_overlay(mob/living/silicon/robot/ourborg)
if(ourborg.has_active_type(/obj/item/borg/combat/mobility))
return
else
diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm
index c28454e2d9..5abc3c0db5 100644
--- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm
@@ -243,7 +243,7 @@
sprite_hud_icon_state = "malf"
hat_offset = VALE_HAT_OFFSET
-/datum/robot_sprite/dogborg/combat_medic/do_equipment_glamour(var/obj/item/robot_module/module)
+/datum/robot_sprite/dogborg/combat_medic/do_equipment_glamour(obj/item/robot_module/module)
..()
if(!has_custom_equipment_sprites)
diff --git a/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm b/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm
index 2a10807e16..2bf86cc1b2 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/boozeborg.dm
@@ -100,7 +100,7 @@
R.wideborg = TRUE
add_verb(R,/mob/living/silicon/robot/proc/ex_reserve_refill) //TGPanel
-/obj/item/robot_module/robot/booze/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/booze/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
E.reagents.add_reagent("enzyme", 2 * amount)
if(src.emag)
diff --git a/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm b/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
index 06ae59c7e9..cee97874fd 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/boozeborg_ch.dm
@@ -116,7 +116,7 @@ What Borgs are available is sadly handled in the above file in the proc
add_verb(R,/mob/living/silicon/robot/proc/ex_reserve_refill) //CHOMPEdit TGPanel
. = ..()
-/obj/item/robot_module/robot/booze/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
+/obj/item/robot_module/robot/booze/respawn_consumable(mob/living/silicon/robot/R, amount)
var/obj/item/reagent_containers/food/condiment/enzyme/E = locate() in src.modules
E.reagents.add_reagent("enzyme", 2 * amount)
if(src.emag)
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm
index 355adb42a8..309f7306dd 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_icon.dm
@@ -58,7 +58,7 @@
I.appearance_flags |= (RESET_COLOR|PIXEL_SCALE)
add_overlay(I)
-/mob/living/silicon/robot/platform/proc/try_paint(var/obj/item/floor_painter/painting, var/mob/user)
+/mob/living/silicon/robot/platform/proc/try_paint(obj/item/floor_painter/painting, mob/user)
var/obj/item/robot_module/robot/platform/tank_module = module
if(!istype(tank_module))
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
index 946e424eda..c49a22285d 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_module.dm
@@ -48,7 +48,7 @@
CHANNEL_EXPLORATION = 1
)
-/obj/item/robot_module/robot/platform/explorer/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/platform/explorer/create_equipment(mob/living/silicon/robot/robot)
..()
modules += new /obj/item/tool/wrench/cyborg(src)
modules += new /obj/item/weldingtool/electric/mounted/cyborg(src)
@@ -69,7 +69,7 @@
emag += new /obj/item/chainsaw(src)
-/obj/item/robot_module/robot/platform/explorer/respawn_consumable(var/mob/living/silicon/robot/R, rate)
+/obj/item/robot_module/robot/platform/explorer/respawn_consumable(mob/living/silicon/robot/R, rate)
. = ..()
for(var/obj/item/gun/energy/pew in modules)
if(pew.power_supply && pew.power_supply.charge < pew.power_supply.maxcharge)
@@ -88,7 +88,7 @@
channels = list(CHANNEL_SUPPLY = 1)
networks = list(NETWORK_MINE)
-/obj/item/robot_module/robot/platform/cargo/create_equipment(var/mob/living/silicon/robot/robot)
+/obj/item/robot_module/robot/platform/cargo/create_equipment(mob/living/silicon/robot/robot)
..()
modules += new /obj/item/packageWrap(src)
modules += new /obj/item/pen/multi(src)
diff --git a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
index 8019980b9e..e5074603d3 100644
--- a/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
+++ b/code/modules/mob/living/silicon/robot/subtypes/thinktank/thinktank_storage.dm
@@ -19,7 +19,7 @@
. = ..()
-/mob/living/silicon/robot/platform/proc/can_store_atom(var/atom/movable/storing, var/mob/user)
+/mob/living/silicon/robot/platform/proc/can_store_atom(atom/movable/storing, mob/user)
if(!istype(storing))
var/storing_target = (user == src) ? "yourself" : "\the [src]"
@@ -64,12 +64,12 @@
var/storing_target = (user == src) ? "yourself" : "\the [src]"
to_chat(user, span_warning("You cannot store \the [storing] inside [storing_target]."))
-/mob/living/silicon/robot/platform/proc/store_atom(var/atom/movable/storing, var/mob/user)
+/mob/living/silicon/robot/platform/proc/store_atom(atom/movable/storing, mob/user)
if(istype(storing))
storing.forceMove(src)
LAZYDISTINCTADD(stored_atoms, WEAKREF(storing))
-/mob/living/silicon/robot/platform/proc/drop_stored_atom(var/atom/movable/ejecting, var/mob/user)
+/mob/living/silicon/robot/platform/proc/drop_stored_atom(atom/movable/ejecting, mob/user)
if(!ejecting && length(stored_atoms))
var/datum/weakref/stored_ref = stored_atoms[1]
@@ -91,7 +91,7 @@
return try_remove_cargo(user)
return ..()
-/mob/living/silicon/robot/platform/proc/try_remove_cargo(var/mob/user)
+/mob/living/silicon/robot/platform/proc/try_remove_cargo(mob/user)
if(!length(stored_atoms) || !istype(user))
return FALSE
var/datum/weakref/remove_ref = stored_atoms[length(stored_atoms)]
@@ -131,7 +131,7 @@
store_atom(dropping, user)
return FALSE
-/mob/living/silicon/robot/platform/proc/can_mouse_drop(var/atom/dropping, var/mob/user)
+/mob/living/silicon/robot/platform/proc/can_mouse_drop(atom/dropping, mob/user)
if(!istype(user) || !istype(dropping) || QDELETED(dropping) || QDELETED(user) || QDELETED(src))
return FALSE
if(user.incapacitated() || !Adjacent(user) || !dropping.Adjacent(user))
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 6eb82fe00e..1cf502e4eb 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -30,7 +30,7 @@
message_mode = null
return radio.talk_into(src,message,message_mode,verb,speaking)
-/mob/living/silicon/say_quote(var/text)
+/mob/living/silicon/say_quote(text)
var/ending = copytext(text, length(text))
if (ending == "?")
@@ -44,7 +44,7 @@
#define IS_ROBOT 2
#define IS_PAI 3
-/mob/living/silicon/say_understands(var/other, var/datum/language/speaking = null)
+/mob/living/silicon/say_understands(other, datum/language/speaking = null)
//These only pertain to common. Languages are handled by mob/say_understands()
if(!speaking)
if(iscarbon(other))
@@ -79,7 +79,7 @@
return 0
return 1
-/mob/living/silicon/ai/proc/holopad_emote(var/message) //This is called when the AI uses the 'me' verb while using a holopad.
+/mob/living/silicon/ai/proc/holopad_emote(message) //This is called when the AI uses the 'me' verb while using a holopad.
message = trim(message)
if(!message)
@@ -115,7 +115,7 @@
return 0
return 1
-/mob/living/silicon/ai/emote(var/act, var/m_type, var/message)
+/mob/living/silicon/ai/emote(act, m_type, message)
var/obj/machinery/hologram/holopad/T = holo
if(T && T.masters[src]) //Is the AI using a holopad?
. = holopad_emote(message)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index f0e9edd5cc..ad59a5fa64 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -70,7 +70,7 @@
/mob/living/silicon/proc/show_laws()
return
-/mob/living/silicon/drop_item(var/atom/Target)
+/mob/living/silicon/drop_item(atom/Target)
return
/mob/living/silicon/emp_act(severity, recursive)
@@ -94,10 +94,10 @@
to_chat(src, span_bolddanger("*BZZZT*"))
to_chat(src, span_danger("Warning: Electromagnetic pulse detected."))
-/mob/living/silicon/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null, var/electric = FALSE)
+/mob/living/silicon/stun_effect_act(stun_amount, agony_amount, def_zone, used_weapon=null, electric = FALSE)
return //immune
-/mob/living/silicon/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 0.0, var/def_zone = null, var/stun = 1)
+/mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 0.0, def_zone = null, stun = 1)
if(shock_damage > 0)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, loc)
@@ -112,13 +112,13 @@
Stun(2)
return
-/mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0)
+/mob/living/silicon/proc/damage_mob(brute = 0, fire = 0, tox = 0)
return
/mob/living/silicon/IsAdvancedToolUser()
return 1
-/mob/living/silicon/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/silicon/bullet_act(obj/item/projectile/Proj)
if(!Proj.nodamage)
switch(Proj.damage_type)
@@ -131,11 +131,11 @@
updatehealth()
return 2
-/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/check_protection = 1)
+/mob/living/silicon/apply_effect(effect = 0,effecttype = STUN, blocked = 0, check_protection = 1)
return 0//The only effect that can hit them atm is flashes and they still directly edit so this works for now
-/proc/islinked(var/mob/living/silicon/robot/bot, var/mob/living/silicon/ai/ai)
+/proc/islinked(mob/living/silicon/robot/bot, mob/living/silicon/ai/ai)
if(!istype(bot) || !istype(ai))
return 0
if (bot.connected_ai == ai)
@@ -187,7 +187,7 @@
*/
//can't inject synths
-/mob/living/silicon/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE)
+/mob/living/silicon/can_inject(mob/user, error_msg, target_zone, ignore_thickness = FALSE)
if(error_msg)
to_chat(user, span_warning("The armoured plating is too tough."))
return 0
@@ -205,7 +205,7 @@
return TRUE
return FALSE
-/mob/living/silicon/add_language(var/language, var/can_speak=1)
+/mob/living/silicon/add_language(language, can_speak=1)
var/datum/language/added_language = GLOB.all_languages[language]
if(!added_language)
return
@@ -215,7 +215,7 @@
speech_synthesizer_langs += added_language
return 1
-/mob/living/silicon/remove_language(var/rem_language)
+/mob/living/silicon/remove_language(rem_language)
var/datum/language/removed_language = GLOB.all_languages[rem_language]
if(!removed_language)
return
@@ -320,7 +320,7 @@
updatehealth()
-/mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised)
+/mob/living/silicon/proc/receive_alarm(datum/alarm_handler/alarm_handler, datum/alarm/alarm, was_raised)
if(!next_alarm_notice)
next_alarm_notice = world.time + (10 SECONDS)
if(alarm.hidden)
@@ -373,10 +373,10 @@
var/list/alarms = queued_alarms[AH]
alarms.Cut()
-/mob/living/silicon/proc/raised_alarm(var/datum/alarm/A)
+/mob/living/silicon/proc/raised_alarm(datum/alarm/A)
to_chat(src, span_filter_warning("[A.alarm_name()]!"))
-/mob/living/silicon/ai/raised_alarm(var/datum/alarm/A)
+/mob/living/silicon/ai/raised_alarm(datum/alarm/A)
var/cameratext = ""
for(var/obj/machinery/camera/C in A.cameras())
cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]"
diff --git a/code/modules/mob/living/simple_animal/aliens/synx.dm b/code/modules/mob/living/simple_animal/aliens/synx.dm
index 80c8e20647..081689cd57 100644
--- a/code/modules/mob/living/simple_animal/aliens/synx.dm
+++ b/code/modules/mob/living/simple_animal/aliens/synx.dm
@@ -223,7 +223,7 @@
color = "#FFFFFF"
overdose = REAGENTS_OVERDOSE * 4 //But takes a lot to OD
-/datum/reagent/inaprovaline/synxchem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
if(prob(8))
M.custom_pain("You [pick("feel numb!","feel dizzy and heavy.","feel strange!")]",60)
@@ -243,7 +243,7 @@
color = "#00FFFF"
overdose = REAGENTS_OVERDOSE * 20 //it's all fake. But having nanomachines move through you is not good at a certain amount.
-/datum/reagent/inaprovaline/synxchem/holo/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/holo/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
if(prob(5))
M.custom_pain("You feel no pain!",60)
@@ -265,7 +265,7 @@
color = "#FFFFFF"
overdose = REAGENTS_OVERDOSE * 200
-/datum/reagent/inaprovaline/synxchem/clown/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/clown/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustToxLoss(0.01)
playsound(M.loc, 'sound/items/bikehorn.ogg', 50, 1)
M.adjustBruteLoss(-2)//healing brute
@@ -293,7 +293,7 @@
//Since Halloss is not "real" damage this should not cause death
*/
-/datum/reagent/inaprovaline/synxchem/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/overdose(mob/living/carbon/M, alien, removed)
..()
if(alien != IS_DIONA)
M.make_dizzy(10)
@@ -303,10 +303,10 @@
M.AdjustParalysis(1)
-/datum/reagent/inaprovaline/synxchem/holo/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/holo/overdose(mob/living/carbon/M, alien, removed)
return
-/datum/reagent/inaprovaline/synxchem/clown/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/clown/overdose(mob/living/carbon/M, alien, removed)
return
@@ -316,7 +316,7 @@
//////////////////////////////////////////////////////////////////////////////////////
// nevermind. I added any roleplay flavor weird fur mechanics to happen when you touch or attack the synx.
-/mob/living/simple_mob/animal/synx/apply_melee_effects(var/atom/A) //Re-adding this for AI synx
+/mob/living/simple_mob/animal/synx/apply_melee_effects(atom/A) //Re-adding this for AI synx
if(stomach_distended) //Hacky burn damage code
if(isliving(A)) //Only affect living mobs, should include silicons. This could be expanded to deal special effects to acid-vulnerable objects.
var/mob/living/L = A
@@ -351,7 +351,7 @@
-/mob/living/simple_mob/animal/synx/hear_say(message,verb,language,fakename,isItalics,var/mob/living/speaker)
+/mob/living/simple_mob/animal/synx/hear_say(message,verb,language,fakename,isItalics,mob/living/speaker)
. = ..()
if(!message || !speaker) return
if (speaker == src) return
diff --git a/code/modules/mob/living/simple_mob/butchering.dm b/code/modules/mob/living/simple_mob/butchering.dm
index 46e888d925..8b21490476 100644
--- a/code/modules/mob/living/simple_mob/butchering.dm
+++ b/code/modules/mob/living/simple_mob/butchering.dm
@@ -2,7 +2,7 @@
gib_on_butchery = TRUE
butchery_drops_organs = FALSE
-/mob/living/simple_mob/can_butcher(var/mob/user, var/obj/item/I) // Override for special butchering checks.
+/mob/living/simple_mob/can_butcher(mob/user, obj/item/I) // Override for special butchering checks.
. = ..()
if(. && (!is_sharp(I) || !has_edge(I)))
diff --git a/code/modules/mob/living/simple_mob/defense.dm b/code/modules/mob/living/simple_mob/defense.dm
index bd8b91b702..f8c8e09dd5 100644
--- a/code/modules/mob/living/simple_mob/defense.dm
+++ b/code/modules/mob/living/simple_mob/defense.dm
@@ -1,5 +1,5 @@
// Hit by a projectile.
-/mob/living/simple_mob/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/bullet_act(obj/item/projectile/P)
//Projectiles with bonus SA damage
if(!P.nodamage && P.mob_bonus_damage && !mind) //If the projectile is NOT a nodamage projectile, we HAVE A BONUS damage, AND the mob is not player controlled (it has no mind), we do bonus damage
P.damage += P.mob_bonus_damage
@@ -80,7 +80,7 @@
// When somoene clicks us with an item in hand
-/mob/living/simple_mob/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/stack/medical))
if(stat != DEAD)
// This could be done better.
@@ -116,7 +116,7 @@
// Handles the actual harming by a melee weapon.
-/mob/living/simple_mob/hit_with_weapon(obj/item/O, mob/living/user, var/effective_force, var/hit_zone)
+/mob/living/simple_mob/hit_with_weapon(obj/item/O, mob/living/user, effective_force, hit_zone)
effective_force = O.force
//Animals can't be stunned(?)
@@ -192,7 +192,7 @@
. = min(., 1.0)
// Electricity
-/mob/living/simple_mob/electrocute_act(var/shock_damage, var/obj/source, var/siemens_coeff = 1.0, var/def_zone = null, var/stun = 1)
+/mob/living/simple_mob/electrocute_act(shock_damage, obj/source, siemens_coeff = 1.0, def_zone = null, stun = 1)
shock_damage *= siemens_coeff
if(shock_damage < 1)
return 0
@@ -218,7 +218,7 @@
. = min(., 1.0)
// Shot with taser/stunvolver
-/mob/living/simple_mob/stun_effect_act(var/stun_amount, var/agony_amount, var/def_zone, var/used_weapon=null, var/electric = FALSE)
+/mob/living/simple_mob/stun_effect_act(stun_amount, agony_amount, def_zone, used_weapon=null, electric = FALSE)
if(taser_kill)
var/stunDam = 0
var/agonyDam = 0
diff --git a/code/modules/mob/living/simple_mob/hands.dm b/code/modules/mob/living/simple_mob/hands.dm
index 29d41e2c26..a857b49bdd 100644
--- a/code/modules/mob/living/simple_mob/hands.dm
+++ b/code/modules/mob/living/simple_mob/hands.dm
@@ -10,7 +10,7 @@
hud_used.r_hand_hud_object.icon_state = "r_hand_active"
return
-/mob/living/simple_mob/put_in_hands(var/obj/item/W) // No hands.
+/mob/living/simple_mob/put_in_hands(obj/item/W) // No hands.
if(has_hands)
put_in_active_hand(W)
return 1
@@ -18,12 +18,12 @@
return 1
//Puts the item into our active hand if possible. returns 1 on success.
-/mob/living/simple_mob/put_in_active_hand(var/obj/item/W)
+/mob/living/simple_mob/put_in_active_hand(obj/item/W)
if(!has_hands)
return FALSE
return (hand ? put_in_l_hand(W) : put_in_r_hand(W))
-/mob/living/simple_mob/put_in_l_hand(var/obj/item/W)
+/mob/living/simple_mob/put_in_l_hand(obj/item/W)
if(!..() || l_hand)
return 0
W.forceMove(src)
@@ -33,7 +33,7 @@
update_inv_l_hand()
return TRUE
-/mob/living/simple_mob/put_in_r_hand(var/obj/item/W)
+/mob/living/simple_mob/put_in_r_hand(obj/item/W)
if(!..() || r_hand)
return 0
W.forceMove(src)
@@ -118,14 +118,14 @@
update_icon()
//Can insert extra huds into the hud holder here.
-/mob/living/simple_mob/proc/extra_huds(var/datum/hud/hud,var/icon/ui_style,var/list/hud_elements)
+/mob/living/simple_mob/proc/extra_huds(datum/hud/hud,icon/ui_style,list/hud_elements)
return
//If they can or cannot use tools/machines/etc
/mob/living/simple_mob/IsAdvancedToolUser()
return has_hands
-/mob/living/simple_mob/proc/IsHumanoidToolUser(var/atom/tool)
+/mob/living/simple_mob/proc/IsHumanoidToolUser(atom/tool)
if(!humanoid_hands)
var/display_name = null
if(tool)
diff --git a/code/modules/mob/living/simple_mob/harvesting.dm b/code/modules/mob/living/simple_mob/harvesting.dm
index 6cbdc2cb7c..9d3b639132 100644
--- a/code/modules/mob/living/simple_mob/harvesting.dm
+++ b/code/modules/mob/living/simple_mob/harvesting.dm
@@ -30,7 +30,7 @@
if(print_flavor_text()) . += "
[print_flavor_text()]"
-/mob/living/simple_mob/proc/livestock_harvest(var/obj/item/tool, var/mob/living/user)
+/mob/living/simple_mob/proc/livestock_harvest(obj/item/tool, mob/living/user)
if(!LAZYLEN(harvest_results)) // Might be a unique interaction of an object using the proc to do something weird, or just someone's a donk.
harvest_recent = world.time
return
diff --git a/code/modules/mob/living/simple_mob/on_click.dm b/code/modules/mob/living/simple_mob/on_click.dm
index 69e18211f2..48caaf4974 100644
--- a/code/modules/mob/living/simple_mob/on_click.dm
+++ b/code/modules/mob/living/simple_mob/on_click.dm
@@ -1,7 +1,7 @@
/*
Animals
*/
-/mob/living/simple_mob/UnarmedAttack(var/atom/A, var/proximity)
+/mob/living/simple_mob/UnarmedAttack(atom/A, proximity)
if(!(. = ..()))
return
@@ -49,7 +49,7 @@
else
attack_target(A)
-/mob/living/simple_mob/RangedAttack(var/atom/A)
+/mob/living/simple_mob/RangedAttack(atom/A)
// setClickCooldown(get_attack_speed())
if(can_special_attack(A) && special_attack_target(A))
diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm
index 4502635101..539fcb67f6 100644
--- a/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -371,13 +371,13 @@
movement_target = null
-/mob/living/simple_mob/say_quote(var/message, var/datum/language/speaking = null)
+/mob/living/simple_mob/say_quote(message, datum/language/speaking = null)
if(speak_emote.len)
. = pick(speak_emote)
else if(speaking)
. = ..()
-/mob/living/simple_mob/get_speech_ending(verb, var/ending)
+/mob/living/simple_mob/get_speech_ending(verb, ending)
return verb
/mob/living/simple_mob/is_sentient()
@@ -392,7 +392,7 @@
add_overlay(hud_list)
//Makes it so that simplemobs can understand galcomm without being able to speak it.
-/mob/living/simple_mob/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/living/simple_mob/say_understands(mob/other, datum/language/speaking = null)
if(understands_common && (speaking?.name == LANGUAGE_GALCOM || !speaking))
return TRUE
return ..()
@@ -404,7 +404,7 @@
* How injured are we? Returns a number that is then added to movement cooldown and firing/melee delay respectively.
* Called by movement_delay and our firing/melee delay checks
*/
-/mob/living/simple_mob/proc/get_injury_level(var/mob/living/simple_mob/M)
+/mob/living/simple_mob/proc/get_injury_level(mob/living/simple_mob/M)
var/h = getMaxHealth() - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - halloss // We're not updating our actual health here bc we want updatehealth() and other checks to handle that
if(h > 0) // Safety to prevent division by 0 errors
if((h / getMaxHealth()) <= threshold) // Essentially, did our health go down? We don't modify want to modify our total slowdown if we didn't actually take damage, and aren't below our threshold %
diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
index d865973697..0035134044 100644
--- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
@@ -100,7 +100,7 @@
..()
update_icon()
-/mob/living/simple_mob/proc/will_eat(var/mob/living/M)
+/mob/living/simple_mob/proc/will_eat(mob/living/M)
if(client) //You do this yourself, dick!
//ai_log("vr/wont eat [M] because we're player-controlled", 3) //VORESTATION AI TEMPORARY REMOVAL
return 0
@@ -152,7 +152,7 @@
return ..()
-/mob/living/simple_mob/proc/CanPounceTarget(var/mob/living/M) //returns either FALSE or a %chance of success
+/mob/living/simple_mob/proc/CanPounceTarget(mob/living/M) //returns either FALSE or a %chance of success
if(!M.canmove || issilicon(M) || world.time < vore_pounce_cooldown) //eliminate situations where pouncing CANNOT happen
return FALSE
if(M.is_incorporeal())
@@ -168,7 +168,7 @@
return max(0,(vore_pounce_successrate - (vore_pounce_falloff * TargetHealthPercent)))
-/mob/living/simple_mob/proc/PounceTarget(var/mob/living/M, var/successrate = 100)
+/mob/living/simple_mob/proc/PounceTarget(mob/living/M, successrate = 100)
vore_pounce_cooldown = world.time + 20 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
@@ -185,7 +185,7 @@
// Attempt to eat target
// TODO - Review this. Could be some issues here
-/mob/living/simple_mob/proc/EatTarget(var/mob/living/M)
+/mob/living/simple_mob/proc/EatTarget(mob/living/M)
//ai_log("vr/EatTarget() [M]",2) //VORESTATION AI TEMPORARY REMOVAL
//stop_automated_movement = 1 //VORESTATION AI TEMPORARY REMOVAL
var/old_target = M
@@ -285,12 +285,12 @@
B.belly_fullscreen_color = "#823232"
B.belly_fullscreen_color2 = "#823232"
-/mob/living/simple_mob/Bumped(var/atom/movable/AM, yes)
+/mob/living/simple_mob/Bumped(atom/movable/AM, yes)
if(tryBumpNom(AM))
return
..()
-/mob/living/simple_mob/proc/tryBumpNom(var/mob/tmob)
+/mob/living/simple_mob/proc/tryBumpNom(mob/tmob)
//returns TRUE if we actually start an attempt to bumpnom, FALSE if checks fail or the random bump nom chance fails
if(istype(tmob) && will_eat(tmob) && !istype(tmob, type) && prob(vore_bump_chance) && !ckey) //check if they decide to eat. Includes sanity check to prevent cannibalism.
if(!faction_bump_vore && faction == tmob.faction)
@@ -384,7 +384,7 @@
else
. = ..()
-/mob/living/simple_mob/proc/animal_mount(var/mob/living/M in living_mobs(1))
+/mob/living/simple_mob/proc/animal_mount(mob/living/M in living_mobs(1))
set name = "Animal Mount/Dismount"
set category = "Abilities.Mob"
set desc = "Let people ride on you."
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
index df975cf4fb..c85e22ff0c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm
@@ -127,7 +127,7 @@
drop_hat()
return ..()
-/mob/living/simple_mob/vore/alienanimals/catslug/attackby(var/obj/item/reagent_containers/food/snacks/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vore/alienanimals/catslug/attackby(obj/item/reagent_containers/food/snacks/O as obj, mob/user as mob)
if(istype(O, /obj/item/clothing/head)) // Handle hat simulator.
give_hat(O, user)
return
@@ -223,7 +223,7 @@
I.blend_mode = BLEND_OVERLAY
add_overlay(I)
-/mob/living/simple_mob/vore/alienanimals/catslug/proc/give_hat(var/obj/item/clothing/head/new_hat, var/mob/living/user)
+/mob/living/simple_mob/vore/alienanimals/catslug/proc/give_hat(obj/item/clothing/head/new_hat, mob/living/user)
if(!istype(new_hat))
to_chat(user, span_warning("\The [new_hat] isn't a hat."))
return
@@ -240,7 +240,7 @@
update_icon()
return
-/mob/living/simple_mob/vore/alienanimals/catslug/proc/remove_hat(var/mob/living/user)
+/mob/living/simple_mob/vore/alienanimals/catslug/proc/remove_hat(mob/living/user)
if(!hat)
to_chat(user, span_warning("\The [src] doesn't have a hat to remove."))
else
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
index fe7187fe32..44a3bcc54c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm
@@ -109,7 +109,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
B.escapechance = 15
-/mob/living/simple_mob/vore/alienanimals/space_jellyfish/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
var/leech = rand(1,100)
@@ -151,7 +151,7 @@ GLOBAL_VAR_INIT(jellyfish_count, 0)
adjust_nutrition(-400)
reproduction_cooldown = 60
-/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Process_Spacemove(check_drift = 0)
return TRUE
/datum/ai_holder/simple_mob/melee/evasive/jellyfish
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm
index 8887631913..6214dec2b5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm
@@ -138,7 +138,7 @@
mauling = TRUE
base_wander_delay = 50
-/datum/ai_holder/simple_mob/melee/spacewhale/set_stance(var/new_stance)
+/datum/ai_holder/simple_mob/melee/spacewhale/set_stance(new_stance)
. = ..()
var/mob/living/simple_mob/vore/overmap/spacewhale/W = holder
if(stance == STANCE_FIGHT)
@@ -152,7 +152,7 @@
W.movement_cooldown = initial(W.movement_cooldown)
W.child_om_marker.glide_size = 0.384
-/mob/living/simple_mob/vore/overmap/spacewhale/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/overmap/spacewhale/apply_melee_effects(atom/A)
. = ..()
if(isliving(A))
var/mob/living/L = A
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm
index 462c410bb2..0f5a16e6ff 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm
@@ -87,7 +87,7 @@
violent_breakthrough = TRUE
speak_chance = 0
-/mob/living/simple_mob/vore/alienanimals/space_ghost/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/alienanimals/space_ghost/apply_melee_effects(atom/A)
var/mob/living/L = A
if(L.hallucination <= 100)
L.hallucination += rand(1,10)
@@ -189,7 +189,7 @@
. = ..()
qdel(src)
-/mob/living/simple_mob/vore/alienanimals/spooky_ghost/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/alienanimals/spooky_ghost/apply_melee_effects(atom/A)
var/mob/living/L = A
if(L && istype(L))
if(L.hallucination <= 100)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
index c4ca1dae9c..d9570e1631 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
@@ -163,7 +163,7 @@
. += ""
. += "Affinity: [round(affinity)]"
-/mob/living/simple_mob/vore/overmap/stardog/start_pulling(var/atom/movable/AM)
+/mob/living/simple_mob/vore/overmap/stardog/start_pulling(atom/movable/AM)
if(!istype(loc, /turf/unsimulated/map)) //Don't pull stuff on the overmap
..()
@@ -914,7 +914,7 @@
requires_power = 0
spawnstuff = FALSE
-/area/redgate/stardog/flesh_abyss/play_ambience(var/mob/living/L, initial = TRUE)
+/area/redgate/stardog/flesh_abyss/play_ambience(mob/living/L, initial = TRUE)
if(!L.check_sound_preference(/datum/preference/toggle/digestion_noises))
return
..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm
index 7be6409b1b..3c5b4182f4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/succlet.dm
@@ -132,14 +132,14 @@
spawn(25)
qdel(src)
-/mob/living/simple_mob/vore/alienanimals/succlet/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/vore/alienanimals/succlet/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc))
user.visible_message(span_info("[user] swats [src] with [O]!"))
release_vore_contents()
else
..()
-/mob/living/simple_mob/vore/alienanimals/succlet/proc/succlet_move(var/target)
+/mob/living/simple_mob/vore/alienanimals/succlet/proc/succlet_move(target)
if(!target)
return
if(isbelly(loc)) //No teleporting out of bellies
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/synx.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/synx.dm
index 5c5f3360b2..4f6d0392d3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/synx.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/synx.dm
@@ -276,7 +276,7 @@
color = "#FFFFFF"
overdose = REAGENTS_OVERDOSE * 4 //But takes a lot to OD
-/datum/reagent/inaprovaline/synxchem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
if(prob(8))
M.custom_pain("You [pick("feel numb!","feel dizzy and heavy.","feel strange!")]",60)
@@ -296,7 +296,7 @@
color = "#00FFFF"
overdose = REAGENTS_OVERDOSE * 20 //it's all fake. But having nanomachines move through you is not good at a certain amount.
-/datum/reagent/inaprovaline/synxchem/holo/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/holo/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
if(prob(5))
M.custom_pain("You feel no pain!",60)
@@ -318,7 +318,7 @@
color = "#FFFFFF"
overdose = REAGENTS_OVERDOSE * 200
-/datum/reagent/inaprovaline/synxchem/clown/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/clown/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustToxLoss(0.01)
playsound(M.loc, 'sound/items/bikehorn.ogg', 50, 1)
M.adjustBruteLoss(-2)//healing brute
@@ -346,7 +346,7 @@
//Since Halloss is not "real" damage this should not cause death
*/
-/datum/reagent/inaprovaline/synxchem/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/overdose(mob/living/carbon/M, alien, removed)
..()
if(alien != IS_DIONA)
M.make_dizzy(10)
@@ -356,10 +356,10 @@
M.AdjustParalysis(1)
-/datum/reagent/inaprovaline/synxchem/holo/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/holo/overdose(mob/living/carbon/M, alien, removed)
return
-/datum/reagent/inaprovaline/synxchem/clown/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/synxchem/clown/overdose(mob/living/carbon/M, alien, removed)
return
@@ -369,7 +369,7 @@
//////////////////////////////////////////////////////////////////////////////////////
// nevermind. I added any roleplay flavor weird fur mechanics to happen when you touch or attack the synx.
-/mob/living/simple_mob/animal/synx/apply_melee_effects(var/atom/A) //Re-adding this for AI synx
+/mob/living/simple_mob/animal/synx/apply_melee_effects(atom/A) //Re-adding this for AI synx
if(stomach_distended) //Hacky burn damage code
if(isliving(A)) //Only affect living mobs, should include silicons. This could be expanded to deal special effects to acid-vulnerable objects.
var/mob/living/L = A
@@ -404,7 +404,7 @@
-/mob/living/simple_mob/animal/synx/hear_say(message,verb,language,fakename,isItalics,var/mob/living/speaker)
+/mob/living/simple_mob/animal/synx/hear_say(message,verb,language,fakename,isItalics,mob/living/speaker)
. = ..()
if(!message || !speaker) return
if (speaker == src) return
@@ -617,7 +617,7 @@
add_overlay("[icon_state]_[belly_class]-[vs_fullness]")
-/mob/living/simple_mob/animal/synx/proc/build_icons(var/random)
+/mob/living/simple_mob/animal/synx/proc/build_icons(random)
cut_overlays()
if(stat == DEAD)
icon_state = "synx_dead"
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
index 095c4ae76b..11acc9ee31 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
@@ -486,7 +486,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
add_overlay(skin_image)
/////HIGHEST LAYER/////
-/mob/living/simple_mob/vore/alienanimals/teppi/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vore/alienanimals/teppi/attackby(obj/item/O as obj, mob/user as mob)
if(stat == DEAD)
return ..()
/////GRABS AND HOLDERS/////
@@ -731,7 +731,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
return
playsound(src, pick(GLOB.teppi_sound), 75, 1)
-/mob/living/simple_mob/vore/alienanimals/teppi/proc/teppi_shear(var/mob/user as mob, tool)
+/mob/living/simple_mob/vore/alienanimals/teppi/proc/teppi_shear(mob/user as mob, tool)
var/sheartime = 3 SECONDS
if(istype(tool, /obj/item/material/knife))
var/obj/item/material/knife/K = tool
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
index ff7deb2557..b597b49835 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm
@@ -316,21 +316,21 @@
/mob/living/simple_mob/animal/borer/cannot_use_vents()
return host || stat
-/mob/living/simple_mob/animal/borer/extra_huds(var/datum/hud/hud,var/icon/ui_style,var/list/hud_elements)
+/mob/living/simple_mob/animal/borer/extra_huds(datum/hud/hud,icon/ui_style,list/hud_elements)
// Chem hud
borer_chem_display = new /atom/movable/screen/borer/chems()
borer_chem_display.screen_loc = ui_ling_chemical_display
borer_chem_display.icon_state = "ling_chems"
hud_elements |= borer_chem_display
-/mob/living/simple_mob/animal/borer/UnarmedAttack(var/atom/A, var/proximity)
+/mob/living/simple_mob/animal/borer/UnarmedAttack(atom/A, proximity)
if(ismob(loc))
to_chat(src, span_notice("You cannot interact with that from inside a host!"))
return
. = ..()
// This is awful but its literally say code.
-/mob/living/simple_mob/animal/borer/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/simple_mob/animal/borer/say(message, datum/language/speaking = null, whispering = 0)
message = sanitize(message)
message = capitalize(message)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm
index b25d6175ad..81875a6b65 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_captive.dm
@@ -5,7 +5,7 @@
real_name = "host brain"
universal_understand = 1
-/mob/living/captive_brain/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/captive_brain/say(message, datum/language/speaking = null, whispering = 0)
if(client)
if(client.prefs.muted & MUTE_IC)
@@ -35,7 +35,7 @@
to_chat(src, span_danger("You cannot emote as a captive mind."))
return
-/mob/living/captive_brain/emote(var/message)
+/mob/living/captive_brain/emote(message)
to_chat(src, span_danger("You cannot emote as a captive mind."))
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
index 8e3321258e..f054352094 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
@@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
GLOB.chicken_count -= 1
-/mob/living/simple_mob/animal/passive/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/animal/passive/chicken/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/reagent_containers/food/snacks/grown)) //feedin' dem chickens
var/obj/item/reagent_containers/food/snacks/grown/G = O
if(G.seed && G.seed.kitchen_tag == PLANT_WHEAT)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
index cb94fc998d..c6074f7931 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm
@@ -32,7 +32,7 @@
AddComponent(/datum/component/hose_connector/output/cow) // Moo?
-/mob/living/simple_mob/animal/passive/cow/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/animal/passive/cow/attackby(obj/item/O as obj, mob/user as mob)
var/obj/item/reagent_containers/glass/G = O
if(stat == CONSCIOUS && istype(G) && G.is_open_container())
user.visible_message(span_notice("[user] milks [src] using \the [O]."))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
index 28f527494e..6b018b27d5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm
@@ -60,7 +60,7 @@
for(var/obj/effect/plant/SV in loc)
SV.die_off(1)
-/mob/living/simple_mob/animal/goat/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/animal/goat/attackby(obj/item/O as obj, mob/user as mob)
var/obj/item/reagent_containers/glass/G = O
if(stat == CONSCIOUS && istype(G) && G.is_open_container())
user.visible_message(span_notice("[user] milks [src] using \the [O]."))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
index 08727bfbfb..c419a07443 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm
@@ -139,7 +139,7 @@
return FALSE
return ..()
-/mob/living/simple_mob/animal/giant_spider/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/giant_spider/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
index 57b58fa0be..3dc33588ae 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm
@@ -268,7 +268,7 @@
return ..(targets)
-/datum/ai_holder/simple_mob/melee/nurse_spider/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/melee/nurse_spider/can_attack(atom/movable/the_target, vision_required = TRUE)
. = ..()
if(!.) // Parent returned FALSE.
if (istype(the_target, /mob/living/simple_mob/animal/giant_spider))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm b/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm
index 57f1f7387f..3911fe14d1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/hyena/hyena.dm
@@ -95,7 +95,7 @@ They're also cool, and Rykka/Nyria wrote this uwu
drop_hat(usr)
-/mob/living/simple_mob/animal/hyena/proc/drop_hat(var/mob/user)
+/mob/living/simple_mob/animal/hyena/proc/drop_hat(mob/user)
if(hat)
hat.forceMove(get_turf(user))
hat = null
@@ -118,7 +118,7 @@ They're also cool, and Rykka/Nyria wrote this uwu
take_hat(usr)
-/mob/living/simple_mob/animal/hyena/proc/take_hat(var/mob/user)
+/mob/living/simple_mob/animal/hyena/proc/take_hat(mob/user)
if(hat)
if(user == src)
to_chat(user, span_notice("You already have a hat!"))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm
index 2d500177aa..06a5e7079b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/armadillo.dm
@@ -80,7 +80,7 @@
..()
// Hat simulator
-/mob/living/simple_mob/animal/passive/armadillo/proc/give_hat(var/obj/item/clothing/head/new_hat, var/mob/living/user)
+/mob/living/simple_mob/animal/passive/armadillo/proc/give_hat(obj/item/clothing/head/new_hat, mob/living/user)
if(!istype(new_hat))
to_chat(user, span_warning("\The [new_hat] isn't a hat."))
return
@@ -95,7 +95,7 @@
update_icon()
return
-/mob/living/simple_mob/animal/passive/armadillo/proc/remove_hat(var/mob/living/user)
+/mob/living/simple_mob/animal/passive/armadillo/proc/remove_hat(mob/living/user)
if(!hat)
to_chat(user, span_warning("\The [src] doesn't have a hat to remove."))
else
@@ -146,7 +146,7 @@
. = ..()
addtimer(CALLBACK(src, PROC_REF(grande), message), 1 SECOND)
-/datum/ai_holder/simple_mob/armadillo/torta/proc/grande(var/message)
+/datum/ai_holder/simple_mob/armadillo/torta/proc/grande(message)
var/mob/living/simple_mob/animal/passive/armadillo/bol = holder
if(!istype(bol))
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm
index a24e331afd..e523a420ad 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/cockroach.dm
@@ -53,7 +53,7 @@
qdel(src)
//Squish code
-/mob/living/simple_mob/animal/passive/cockroach/Crossed(var/atom/movable/AM)
+/mob/living/simple_mob/animal/passive/cockroach/Crossed(atom/movable/AM)
if(ismob(AM))
if(isliving(AM))
var/mob/living/A = AM
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
index abe76ca019..811debaabf 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm
@@ -35,7 +35,7 @@
break
sleep(3)
/*
-/mob/living/simple_mob/animal/passive/fish/koi/poisonous/react_to_attack(var/atom/A)
+/mob/living/simple_mob/animal/passive/fish/koi/poisonous/react_to_attack(atom/A)
if(isliving(A) && Adjacent(A))
var/mob/living/M = A
visible_message(span_warning("\The [src][is_dead()?"'s corpse":""] flails at [M]!"))
@@ -53,7 +53,7 @@
break
sleep(3)
*/
-/mob/living/simple_mob/animal/passive/fish/koi/poisonous/proc/sting(var/mob/living/M)
+/mob/living/simple_mob/animal/passive/fish/koi/poisonous/proc/sting(mob/living/M)
if(!M.reagents)
return 0
M.reagents.add_reagent(REAGENT_ID_TOXIN, 2)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
index a81891dd69..5edb374dca 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm
@@ -30,7 +30,7 @@
return
return ..()
-/mob/living/proc/mouse_scooped(var/mob/living/carbon/grabber, var/self_grab)
+/mob/living/proc/mouse_scooped(mob/living/carbon/grabber, self_grab)
if(!holder_type || buckled || pinned.len)
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
index 6789e4e9d3..7ade316e64 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm
@@ -90,7 +90,7 @@
. = ..()
addtimer(CALLBACK(src, PROC_REF(check_keywords), message), rand(1 SECOND, 3 SECONDS))
-/datum/ai_holder/simple_mob/passive/possum/poppy/proc/check_keywords(var/message)
+/datum/ai_holder/simple_mob/passive/possum/poppy/proc/check_keywords(message)
var/mob/living/simple_mob/animal/passive/opossum/poss = holder
if(!istype(poss) || holder.client || holder.stat != CONSCIOUS)
return
@@ -140,12 +140,12 @@
catalogue_data = list(/datum/category_item/catalogue/fauna/opossum)
meat_amount = 2
-/mob/living/simple_mob/animal/passive/opossum/adjustBruteLoss(var/amount,var/include_robo)
+/mob/living/simple_mob/animal/passive/opossum/adjustBruteLoss(amount,include_robo)
. = ..()
if(amount >= 3)
respond_to_damage()
-/mob/living/simple_mob/animal/passive/opossum/adjustFireLoss(var/amount,var/include_robo)
+/mob/living/simple_mob/animal/passive/opossum/adjustFireLoss(amount,include_robo)
. = ..()
if(amount >= 3)
respond_to_damage()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
index efd78de3c0..d8865ffe03 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm
@@ -76,7 +76,7 @@ GLOBAL_LIST_INIT(cat_default_emotes, list(
visible_emote("suddenly stops and stares at something unseen[istype(A) ? " near [A]":""].")
// Instakills mice.
-/mob/living/simple_mob/animal/passive/cat/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/passive/cat/apply_melee_effects(atom/A)
if(ismouse(A))
var/mob/living/simple_mob/animal/passive/mouse/mouse = A
if(mouse.getMaxHealth() < 20) // In case a badmin makes giant mice or something.
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm
index 1c49e75fdc..605a65bc67 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/dog.dm
@@ -30,7 +30,7 @@
pain_emote_1p = list("yelp", "whine", "bark", "growl")
pain_emote_3p = list("yelps", "whines", "barks", "growls")
-/mob/living/simple_mob/animal/passive/dog/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/animal/passive/dog/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/newspaper))
if(!stat)
for(var/mob/M in viewers(user, null))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
index 6996457f09..a8d58fc5e6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm
@@ -72,7 +72,7 @@
"The fox's stomach churns hungrily over your form, trying to take you.",
"With a loud glorp, the stomach spills more acids onto you.")
-/mob/living/simple_mob/animal/passive/fox/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/passive/fox/apply_melee_effects(atom/A)
if(ismouse(A))
var/mob/living/simple_mob/animal/passive/mouse/mouse = A
if(mouse.getMaxHealth() < 20) // In case a badmin makes giant mice or something.
@@ -91,7 +91,7 @@
else
return ..()
-/mob/living/simple_mob/animal/passive/fox/get_scooped(var/mob/living/carbon/grabber)
+/mob/living/simple_mob/animal/passive/fox/get_scooped(mob/living/carbon/grabber)
if (stat >= DEAD)
return //since the holder icon looks like a living cat
..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
index 610107fb4a..71df9c0caa 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm
@@ -91,7 +91,7 @@
/mob/living/simple_mob/animal/sif/glitterfly/rare/Initialize(mapload)
. = ..()
-/mob/living/simple_mob/animal/sif/glitterfly/unique_tame_check(var/obj/O, var/mob/user)
+/mob/living/simple_mob/animal/sif/glitterfly/unique_tame_check(obj/O, mob/user)
. = ..()
if(.)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
index de855961be..f2a0da3498 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm
@@ -84,7 +84,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo
emote_cooldown = 20 SECONDS
broadcast_distance = 90
-/datum/decl/emote/audible/drake_howl/broadcast_emote_to(var/send_sound, var/mob/target, var/direction)
+/datum/decl/emote/audible/drake_howl/broadcast_emote_to(send_sound, mob/target, direction)
if((. = ..()))
to_chat(target, span_notice("You hear an eerie howl from somewhere to the [dir2text(direction)]."))
@@ -213,7 +213,7 @@ Field studies suggest analytical abilities on par with some species of cepholapo
var/list/original_armor
GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
-/mob/living/simple_mob/animal/sif/grafadreka/proc/can_tend_wounds(var/mob/living/friend)
+/mob/living/simple_mob/animal/sif/grafadreka/proc/can_tend_wounds(mob/living/friend)
// We can't heal robots.
if(friend.isSynthetic())
@@ -257,7 +257,7 @@ GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
original_armor = armor
update_icon()
-/mob/living/simple_mob/animal/sif/grafadreka/examine(var/mob/living/user)
+/mob/living/simple_mob/animal/sif/grafadreka/examine(mob/living/user)
. = ..()
if(istype(user, /mob/living/simple_mob/animal/sif/grafadreka) || isobserver(user))
var/datum/gender/G = gender_datums[get_visible_gender()]
@@ -268,7 +268,7 @@ GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
else
. += span_danger("[G.His] sap reserves are depleted.")
-/mob/living/simple_mob/animal/sif/grafadreka/can_projectile_attack(var/atom/A)
+/mob/living/simple_mob/animal/sif/grafadreka/can_projectile_attack(atom/A)
if(a_intent != I_HURT || world.time < next_spit)
return FALSE
if(!has_sap(2))
@@ -286,12 +286,12 @@ GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
setMoveCooldown(1 SECOND)
spend_sap(2)
-/mob/living/simple_mob/animal/sif/grafadreka/get_dietary_food_modifier(var/datum/reagent/nutriment/food)
+/mob/living/simple_mob/animal/sif/grafadreka/get_dietary_food_modifier(datum/reagent/nutriment/food)
if(food.allergen_type & ALLERGEN_MEAT)
return ..()
return 0.25 // Quarter nutrition from non-meat.
-/mob/living/simple_mob/animal/sif/grafadreka/handle_reagent_transfer(var/datum/reagents/holder, var/amount = 1, var/chem_type = CHEM_BLOOD, var/multiplier = 1, var/copy = 0)
+/mob/living/simple_mob/animal/sif/grafadreka/handle_reagent_transfer(datum/reagents/holder, amount = 1, chem_type = CHEM_BLOOD, multiplier = 1, copy = 0)
return holder.trans_to_holder(reagents, amount, multiplier, copy)
/mob/living/simple_mob/animal/sif/grafadreka/Life()
@@ -315,15 +315,15 @@ GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
chem.affect_animal(src, removed)
reagents.remove_reagent(chem.id, removed)
-/mob/living/simple_mob/animal/sif/grafadreka/proc/has_sap(var/amt)
+/mob/living/simple_mob/animal/sif/grafadreka/proc/has_sap(amt)
return stored_sap >= amt
-/mob/living/simple_mob/animal/sif/grafadreka/proc/add_sap(var/amt)
+/mob/living/simple_mob/animal/sif/grafadreka/proc/add_sap(amt)
stored_sap = clamp(round(stored_sap + amt, 0.01), 0, max_stored_sap)
update_icon()
return TRUE
-/mob/living/simple_mob/animal/sif/grafadreka/proc/spend_sap(var/amt)
+/mob/living/simple_mob/animal/sif/grafadreka/proc/spend_sap(amt)
if(has_sap(amt))
stored_sap = clamp(round(stored_sap - amt, 0.01), 0, max_stored_sap)
update_icon()
@@ -411,7 +411,7 @@ GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
/mob/living/simple_mob/animal/sif/grafadreka/get_eye_color()
return eye_colour
-/mob/living/simple_mob/animal/sif/grafadreka/do_tame(var/obj/O, var/mob/user)
+/mob/living/simple_mob/animal/sif/grafadreka/do_tame(obj/O, mob/user)
. = ..()
attacked_by_neutral = FALSE
@@ -531,7 +531,7 @@ GLOBAL_LIST_EMPTY(wounds_being_tended_by_drakes)
. += "Nutrition: [nutrition]/[max_nutrition]"
. += "Stored sap: [stored_sap]/[max_stored_sap]"
-/mob/living/simple_mob/animal/sif/grafadreka/proc/can_bite(var/mob/living/M)
+/mob/living/simple_mob/animal/sif/grafadreka/proc/can_bite(mob/living/M)
return istype(M) && (M.lying || M.confused || M.incapacitated())
/mob/living/simple_mob/animal/sif/grafadreka/apply_bonus_melee_damage(atom/A, damage_amount)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index 08c59af8f8..c6d3a1f271 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -227,7 +227,7 @@
do_infest(src)
-/mob/living/simple_mob/animal/sif/leech/proc/do_infest(var/mob/living/user, var/mob/living/target = null)
+/mob/living/simple_mob/animal/sif/leech/proc/do_infest(mob/living/user, mob/living/target = null)
if(host)
to_chat(user, span_alien("We are already within a host."))
return
@@ -352,7 +352,7 @@
poison_inject(src, M)
-/mob/living/simple_mob/animal/sif/leech/proc/poison_inject(var/mob/living/user, var/mob/living/carbon/L)
+/mob/living/simple_mob/animal/sif/leech/proc/poison_inject(mob/living/user, mob/living/carbon/L)
if(!L || !Adjacent(L) || stat)
return
@@ -390,7 +390,7 @@
var/chem = tgui_input_list(src, "Select a chemical to produce.", "Chemicals", produceable_chemicals)
inject_meds(chem)
-/mob/living/simple_mob/animal/sif/leech/proc/inject_meds(var/chem)
+/mob/living/simple_mob/animal/sif/leech/proc/inject_meds(chem)
if(host)
chemicals = max(1, chemicals - 50)
host.reagents.add_reagent(chem, 5)
@@ -428,7 +428,7 @@
else
to_chat(src, span_warning("We cannot feed now."))
-/mob/living/simple_mob/animal/sif/leech/proc/bite_organ(var/obj/item/organ/internal/O)
+/mob/living/simple_mob/animal/sif/leech/proc/bite_organ(obj/item/organ/internal/O)
last_feeding = world.time
if(O)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
index 1855883473..2d7ae39e1b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm
@@ -71,7 +71,7 @@
drop_hat(usr)
-/mob/living/simple_mob/animal/sif/sakimm/proc/drop_hat(var/mob/user)
+/mob/living/simple_mob/animal/sif/sakimm/proc/drop_hat(mob/user)
if(hat)
hat.forceMove(get_turf(user))
hat = null
@@ -94,7 +94,7 @@
take_hat(usr)
-/mob/living/simple_mob/animal/sif/sakimm/proc/take_hat(var/mob/user)
+/mob/living/simple_mob/animal/sif/sakimm/proc/take_hat(mob/user)
if(hat)
if(user == src)
to_chat(user, span_notice("You already have a hat!"))
@@ -240,7 +240,7 @@
. -= holder.contents
-/datum/ai_holder/simple_mob/intentional/sakimm/find_target(var/list/possible_targets, var/has_targets_list = FALSE)
+/datum/ai_holder/simple_mob/intentional/sakimm/find_target(list/possible_targets, has_targets_list = FALSE)
var/can_pick_mobs = TRUE
if(!hostile)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
index 5173d290b6..1f35bcf67b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm
@@ -66,7 +66,7 @@
if(health <= (maxHealth * 0.5)) // At half health, and fighting someone currently.
berserk()
-/mob/living/simple_mob/animal/sif/savik/fail_tame(var/obj/O, var/mob/user)
+/mob/living/simple_mob/animal/sif/savik/fail_tame(obj/O, mob/user)
..()
if(prob(30)) // They don't like people messing with them and their food.
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
index d8f085ee7c..0aa397e75d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm
@@ -41,7 +41,7 @@
can_be_drop_prey = FALSE
-/mob/living/simple_mob/animal/space/bats/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/space/bats/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(scare_chance))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm
index 0de18e7da2..404ae6ecac 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm
@@ -144,7 +144,7 @@
else
add_dead_carp_overlay()
-/mob/living/simple_mob/animal/space/carp/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/space/carp/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(knockdown_chance))
@@ -362,7 +362,7 @@
/mob/living/simple_mob/animal/space/carp/puffer/apply_melee_effects() //it gets close enough to attack? EXPLODE
kaboom()
-/mob/living/simple_mob/animal/space/carp/puffer/adjustFireLoss(var/amount,var/include_robo) //you make it hot? EXPLODE
+/mob/living/simple_mob/animal/space/carp/puffer/adjustFireLoss(amount,include_robo) //you make it hot? EXPLODE
if(amount>0)
kaboom()
..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm
index d5a5c15eaf..20fcf8a82c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/ray.dm
@@ -65,7 +65,7 @@
var/knockdown_chance = 66
-/mob/living/simple_mob/animal/space/ray/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/space/ray/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(knockdown_chance))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm
index e89f3dc084..29beea91c2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/shark.dm
@@ -45,7 +45,7 @@
var/knockdown_chance = 10 //slightly reduced their knockdown prob compared to carp given their greater power
-/mob/living/simple_mob/animal/space/shark/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/space/shark/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(knockdown_chance))
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
index 389a4222c8..44aa85e063 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm
@@ -161,7 +161,7 @@
if(movement_target)
chase_target()
-/mob/living/simple_mob/animal/passive/snake/python/noodle/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/passive/snake/python/noodle/apply_melee_effects(atom/A)
if(ismouse(A))
var/mob/living/simple_mob/animal/passive/mouse/mouse = A
if(mouse.getMaxHealth() < 20) // In case a badmin makes giant mice or something.
@@ -170,7 +170,7 @@
else
..()
-/mob/living/simple_mob/animal/passive/snake/python/noodle/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/animal/passive/snake/python/noodle/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/reagent_containers/food/snacks/snakesnack))
visible_message(span_notice("[user] feeds \the [O] to [src]."))
adjust_nutrition(100) //It's sugar!
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/space.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/space.dm
index 6ff1d2e45b..ae8f78e721 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/space.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/space.dm
@@ -11,5 +11,5 @@
minbodytemp = 0
// They can also, you know, move around, in space
-/mob/living/simple_mob/animal/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/animal/space/Process_Spacemove(check_drift = 0)
return TRUE
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm
index b3720cf3aa..cda4c78424 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm
@@ -138,7 +138,7 @@
else
set_maw(!open_maw)
-/mob/living/simple_mob/animal/space/space_worm/proc/set_maw(var/state = FALSE)
+/mob/living/simple_mob/animal/space/space_worm/proc/set_maw(state = FALSE)
open_maw = state
if(open_maw)
time_maw_opened = world.time
@@ -241,7 +241,7 @@
return
-/mob/living/simple_mob/animal/space/space_worm/proc/AttemptToEat(var/atom/target)
+/mob/living/simple_mob/animal/space/space_worm/proc/AttemptToEat(atom/target)
if(istype(target,/turf/simulated/wall))
var/turf/simulated/wall/W = target
if((!W.reinf_material && do_after(src, 5 SECONDS, target)) || do_after(src, 10 SECONDS, target)) // 10 seconds for an R-wall, 5 seconds for a normal one.
@@ -292,7 +292,7 @@
return 0
-/mob/living/simple_mob/animal/space/space_worm/proc/Attach(var/mob/living/simple_mob/animal/space/space_worm/attachement)
+/mob/living/simple_mob/animal/space/space_worm/proc/Attach(mob/living/simple_mob/animal/space/space_worm/attachement)
if(!attachement)
return
@@ -360,10 +360,10 @@
stomachContent.forceMove(get_turf(src))
return
-/mob/living/simple_mob/animal/space/space_worm/proc/stomach_special(var/atom/A) // Futureproof. Anything that interacts with contents without relying on digestion probability. Return TRUE if it should skip digest.
+/mob/living/simple_mob/animal/space/space_worm/proc/stomach_special(atom/A) // Futureproof. Anything that interacts with contents without relying on digestion probability. Return TRUE if it should skip digest.
return FALSE
-/mob/living/simple_mob/animal/space/space_worm/proc/stomach_special_digest(var/atom/A) // Futureproof. Any special checks that interact with digested atoms. I.E., ore processing. Return TRUE if it should skip future digest checks.
+/mob/living/simple_mob/animal/space/space_worm/proc/stomach_special_digest(atom/A) // Futureproof. Any special checks that interact with digested atoms. I.E., ore processing. Return TRUE if it should skip future digest checks.
return FALSE
/mob/living/simple_mob/animal/space/space_worm/proc/update_body_faction()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/turkeygirl.dm b/code/modules/mob/living/simple_mob/subtypes/animal/turkeygirl.dm
index 2f8c56893e..61795193ed 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/turkeygirl.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/turkeygirl.dm
@@ -73,7 +73,7 @@
if(resting)
icon_state = "[icon_state]-resting"
-/mob/living/simple_mob/vore/turkeygirl/attackby(var/obj/item/reagent_containers/food/snacks/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vore/turkeygirl/attackby(obj/item/reagent_containers/food/snacks/O as obj, mob/user as mob)
if(stat)
return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm b/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
index f9ac37507c..6522777c01 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/vox.dm
@@ -35,7 +35,7 @@
var/amp = null
var/quills = 3
-/mob/living/simple_mob/vox/armalis/death(var/gibbed = FALSE)
+/mob/living/simple_mob/vox/armalis/death(gibbed = FALSE)
..(TRUE)
var/turf/gloc = get_turf(loc)
visible_message(span_bolddanger("[src] shudders violently and explodes!"),span_warning("You feel your body rupture!"))
@@ -43,7 +43,7 @@
explosion(gloc, -1, -1, 3, 5)
qdel(src)
-/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vox/armalis/attackby(obj/item/O as obj, mob/user as mob)
base_attack_cooldown = 5
if(O.force)
if(O.force >= 25)
@@ -123,7 +123,7 @@
set name = "Shriek"
set desc = "Give voice to a psychic shriek."
-/mob/living/simple_mob/vox/armalis/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vox/armalis/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O,/obj/item/vox/armalis_armour))
user.drop_item(O)
armour = O
diff --git a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm
index 4c177e588f..93cb7f145b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/blob/spore.dm
@@ -49,7 +49,7 @@
melee_damage_lower = 1
melee_damage_upper = 2
-/mob/living/simple_mob/blob/spore/Initialize(mapload, var/obj/structure/blob/factory/my_factory)
+/mob/living/simple_mob/blob/spore/Initialize(mapload, obj/structure/blob/factory/my_factory)
if(istype(my_factory))
factory = my_factory
factory.spores += src
diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/blaidd.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/blaidd.dm
index 3751639258..ee0a83bfe8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/glamour/blaidd.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/glamour/blaidd.dm
@@ -189,7 +189,7 @@
give_target(new_target)
return new_target
-/datum/ai_holder/simple_mob/vore/blaidd/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/vore/blaidd/can_attack(atom/movable/the_target, vision_required = TRUE)
ai_log("can_attack() : Entering.", AI_LOG_TRACE)
if(!can_see_target(the_target) && vision_required)
return FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm
index b43b7b25ad..d545a49a9b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/glamour/ddraig.dm
@@ -179,7 +179,7 @@
if(Adjacent(L)) //We leapt at them but we didn't manage to hit them, let's see if we're next to them
L.Weaken(2) //get knocked down, idiot
-/mob/living/simple_mob/vore/ddraig/proc/firebreathstart(var/atom/A) //Borrowed from le big dragon
+/mob/living/simple_mob/vore/ddraig/proc/firebreathstart(atom/A) //Borrowed from le big dragon
glow_toggle = 1
set_light(glow_range, glow_intensity, glow_color) //Setting it here so the light starts immediately
flames = 1
@@ -189,7 +189,7 @@
firebreathtimer = addtimer(CALLBACK(src, PROC_REF(firebreathend), A), charge_warmup, TIMER_STOPPABLE)
playsound(src, "sound/magic/Fireball.ogg", 50, 1)
-/mob/living/simple_mob/vore/ddraig/proc/firebreathend(var/atom/A)
+/mob/living/simple_mob/vore/ddraig/proc/firebreathend(atom/A)
//make sure our target still exists and is on a turf
if(QDELETED(A) || !isturf(get_turf(A)))
set_AI_busy(FALSE)
@@ -202,7 +202,7 @@
glow_toggle = 0
flames = 0
-/mob/living/simple_mob/vore/ddraig/proc/tfbeam(var/atom/A)
+/mob/living/simple_mob/vore/ddraig/proc/tfbeam(atom/A)
if(!isturf(get_turf(A)))
return
set_AI_busy(TRUE)
@@ -222,7 +222,7 @@
tracer_type = /obj/effect/projectile/tracer/rainbow
impact_type = /obj/effect/projectile/impact/rainbow
-/obj/item/projectile/beam/mouselaser/ddraig/on_hit(var/atom/target)
+/obj/item/projectile/beam/mouselaser/ddraig/on_hit(atom/target)
var/mob/living/M = target
if(!istype(M))
return
@@ -241,7 +241,7 @@
addtimer(CALLBACK(new_mob, TYPE_PROC_REF(/mob/living, revert_mob_tf)), 30 SECONDS, TIMER_DELETE_ME)
-/obj/item/projectile/beam/mouselaser/ddraig/spawn_mob(var/mob/living/target)
+/obj/item/projectile/beam/mouselaser/ddraig/spawn_mob(mob/living/target)
var/list/tf_list = list(/mob/living/simple_mob/animal/passive/mouse,
/mob/living/simple_mob/animal/passive/mouse/rat/strong,
/mob/living/simple_mob/vore/alienanimals/dustjumper,
@@ -459,7 +459,7 @@
transfer_mob_identity(new_mob)
new_mob.visible_message("\The [src] has transformed into \the [chosen_beast]!")
-/mob/living/proc/spawn_polymorph_mob(var/chosen_beast)
+/mob/living/proc/spawn_polymorph_mob(chosen_beast)
var/tf_type = chosen_beast
if(!ispath(tf_type))
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/fluffball.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/fluffball.dm
index 277195131c..c0cfd666ba 100644
--- a/code/modules/mob/living/simple_mob/subtypes/glamour/fluffball.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/glamour/fluffball.dm
@@ -115,7 +115,7 @@
though it is known to act more calm around those carrying food, which it is quick to steal from people's hands if offered. However, they have been observed to use their tails as weapons when panicked and unable to flee."
value = CATALOGUER_REWARD_HARD
-/mob/living/simple_mob/vore/fluffball/PounceTarget(var/mob/living/M, var/successrate = 100)
+/mob/living/simple_mob/vore/fluffball/PounceTarget(mob/living/M, successrate = 100)
vore_pounce_cooldown = world.time + 20 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
diff --git a/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm b/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm
index db7c8cfa36..49e5ef04ef 100644
--- a/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/glamour/ysbryd.dm
@@ -112,7 +112,7 @@
icon_living = "ysbryd_deco"
icon_state = "ysbryd_deco"
-/mob/living/simple_mob/ysbryd/proc/connect_target(var/mob/living/M)
+/mob/living/simple_mob/ysbryd/proc/connect_target(mob/living/M)
if(!isliving(M))
return
chosen_target = M
@@ -157,7 +157,7 @@
chosen_target << sound(chosen_sound, repeat = 0, wait = 0, volume = 15, channel = CHANNEL_AMBIENCE_FORCED)
last_effect = world.time
-/mob/living/simple_mob/ysbryd/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/ysbryd/bullet_act(obj/item/projectile/Proj)
if(istype(Proj ,/obj/item/projectile/beam/xray) || istype(Proj ,/obj/item/projectile/beam/gamma) || istype(Proj ,/obj/item/projectile/beam/emitter))
plane = MOB_PLANE
@@ -167,7 +167,7 @@
/datum/ai_holder/simple_mob/ysbryd
var/find_target_cooldown = 1 MINUTE
-/datum/ai_holder/simple_mob/ysbryd/find_target(var/list/possible_targets, var/has_targets_list = FALSE)
+/datum/ai_holder/simple_mob/ysbryd/find_target(list/possible_targets, has_targets_list = FALSE)
ai_log("find_target() : Entered.", AI_LOG_TRACE)
if(world.time <= (find_target_cooldown + last_target_time))
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm
index 581b143dc0..a6b7527f83 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist.dm
@@ -493,7 +493,7 @@
ai_holder_type = /datum/ai_holder/simple_mob/melee
-/mob/living/simple_mob/humanoid/cultist/elite/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/humanoid/cultist/elite/attackby(obj/item/O as obj, mob/user as mob)
if(O.force)
if(prob(30))
visible_message(span_danger("\The [src] blocks \the [O] with its shield!"))
@@ -506,7 +506,7 @@
to_chat(user, span_warning("This weapon is ineffective, it does no damage."))
visible_message(span_warning("\The [user] gently taps [src] with \the [O]."))
-/mob/living/simple_mob/humanoid/cultist/elite/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/cultist/elite/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
if(prob(50))
visible_message(span_bolddanger("[Proj] disappears into the mirror world as it hits the shield."))
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
index 28acf9298c..d815b75cf0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
@@ -132,7 +132,7 @@
loot_list = list(/obj/item/melee/energy/sword = 100, /obj/item/shield/energy = 100)
// They have a shield, so they try to block
-/mob/living/simple_mob/humanoid/merc/melee/sword/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/humanoid/merc/melee/sword/attackby(obj/item/O as obj, mob/user as mob)
if(O.force)
if(prob(20))
visible_message(span_danger("\The [src] blocks \the [O] with its shield!"))
@@ -145,7 +145,7 @@
to_chat(user, span_warning("This weapon is ineffective, it does no damage."))
visible_message(span_warning("\The [user] gently taps [src] with \the [O]."))
-/mob/living/simple_mob/humanoid/merc/melee/sword/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/merc/melee/sword/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
if(prob(35))
visible_message(span_bolddanger("[src] blocks [Proj] with its shield!"))
@@ -428,7 +428,7 @@
corpse = /obj/effect/landmark/mobcorpse/syndicatecommando
-/mob/living/simple_mob/humanoid/merc/melee/sword/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/humanoid/merc/melee/sword/space/Process_Spacemove(check_drift = 0)
return
// Ranged Space Merc
@@ -550,7 +550,7 @@
grenade_timer = 30 // well, look what you've done, you've grouped up
// being Actual Professionals, they have better (read: player-level) blocking chances
-/mob/living/simple_mob/humanoid/merc/ranged/space/suppressor/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/humanoid/merc/ranged/space/suppressor/attackby(obj/item/O, mob/user)
if(O.force)
if(prob(50))
visible_message(span_danger("\The [src] blocks \the [O] with its shield!"))
@@ -562,7 +562,7 @@
else
visible_message(span_warning("\The [user] gently taps [src] with \the [O]."))
-/mob/living/simple_mob/humanoid/merc/ranged/space/suppressor/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/merc/ranged/space/suppressor/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
if(prob(50))
visible_message(span_warning("[src] blocks [Proj] with its shield!"))
@@ -572,7 +572,7 @@
else
..()
-/mob/living/simple_mob/humanoid/merc/ranged/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/humanoid/merc/ranged/space/Process_Spacemove(check_drift = 0)
return
////////////////////////////////
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/vox.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/vox.dm
index afc0225388..09e594f146 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/vox.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/vox.dm
@@ -95,7 +95,7 @@
loot_list = list(/obj/item/melee/energy/sword = 100)
// They're good with the swords? I dunno. I like the idea they can deflect.
-/mob/living/simple_mob/humanoid/merc/voxpirate/boarder/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/humanoid/merc/voxpirate/boarder/attackby(obj/item/O, mob/user)
if(O.force)
if(prob(20))
visible_message(span_danger("\The [src] blocks \the [O] with its sword!"))
@@ -108,7 +108,7 @@
to_chat(user, span_warning("This weapon is ineffective, it does no damage."))
visible_message(span_warning("\The [user] gently taps [src] with \the [O]."))
-/mob/living/simple_mob/humanoid/merc/voxpirate/boarder/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/merc/voxpirate/boarder/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
if(prob(35))
visible_message(span_warning("[src] blocks [Proj] with its sword!"))
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm
index 9e0d37bf47..917eea86ed 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm
@@ -144,7 +144,7 @@
icon_living = "piratemelee-shield"
//This Should Allow all childs of the shield priate to block
-/mob/living/simple_mob/humanoid/pirate/shield/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/humanoid/pirate/shield/attackby(obj/item/O as obj, mob/user as mob)
if(O.force)
if(prob(15))
visible_message(span_danger("\The [src] blocks \the [O] with its shield!"))
@@ -157,7 +157,7 @@
to_chat(user, span_warning("This weapon is ineffective, it does no damage."))
visible_message(span_warning("\The [user] gently taps [src] with \the [O]."))
-/mob/living/simple_mob/humanoid/merc/melee/sword/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/merc/melee/sword/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
if(prob(25))
visible_message(span_bolddanger("[src] blocks [Proj] with its shield!"))
@@ -451,7 +451,7 @@
shields = new /obj/item/shield_projector/rectangle/automatic/drone(src)
return ..()
-/mob/living/simple_mob/humanoid/pirate/captain/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/humanoid/pirate/captain/Process_Spacemove(check_drift = 0)
return TRUE
/obj/item/shield_projector/rectangle/automatic/drone
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm
index 834f815cef..2032eadfb4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/corrupt_maint_drone_vr.dm
@@ -51,7 +51,7 @@
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
-/mob/living/simple_mob/mechanical/corrupt_maint_drone/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/mechanical/corrupt_maint_drone/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror.dm
index 14928ba265..53bbef01e2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror.dm
@@ -94,7 +94,7 @@
/datum/say_list/cyber_horror/plasma
threaten_sound = 'sound/mob/robots/Cyber_Horror_Plasma.ogg'
-/mob/living/simple_mob/mechanical/cyber_horror/plasma_cyber_horror/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/mechanical/cyber_horror/plasma_cyber_horror/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
@@ -379,7 +379,7 @@
/datum/say_list/cyber_horror/cat
threaten_sound = 'sound/mob/robots/Cyber_Horror_Cat.ogg'
-/mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm
index e925674468..4b4caceda8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm
@@ -55,7 +55,7 @@
say_maybe_target = list("BIOLOGICAL TRACES FOUND, ATTEMTPTING TO LOCATE SOURCE.","TRACE SOURCES FOUND, POWERING SCANNERS.",)
say_got_target = list("LIFEFORM LOCATED, ATTEMPTING TO COLLECT SAMPLE","CREATURE SPOTTED, PHEROMONE GENERATORS DAMAGED, ATTEMPTING TO COLLECT GENETIC SAMPLE.")
-/mob/living/simple_mob/mechanical/infectionbot/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/mechanical/infectionbot/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
index 70aaf129a7..f008ca77af 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
@@ -84,7 +84,7 @@
..(null,"suddenly breaks apart.")
qdel(src)
-/mob/living/simple_mob/mechanical/combat_drone/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/mechanical/combat_drone/Process_Spacemove(check_drift = 0)
return TRUE
/obj/item/projectile/beam/drone
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
index 8401527e51..4efd800dcc 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/mining_drone.dm
@@ -90,7 +90,7 @@
..(null,"suddenly breaks apart.")
qdel(src)
-/mob/living/simple_mob/mechanical/mining_drone/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/mechanical/mining_drone/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/mechanical/mining_drone/IIsAlly(mob/living/L)
@@ -137,12 +137,12 @@
if(ai_holder)
ai_holder.add_attacker(L)
-/mob/living/simple_mob/mechanical/mining_drone/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/simple_mob/mechanical/mining_drone/bullet_act(obj/item/projectile/P, def_zone)
..()
if(ai_holder && P.firer)
ai_holder.add_attacker(P.firer)
-/mob/living/simple_mob/mechanical/mining_drone/hit_with_weapon(obj/item/I, mob/living/user, var/effective_force, var/hit_zone)
+/mob/living/simple_mob/mechanical/mining_drone/hit_with_weapon(obj/item/I, mob/living/user, effective_force, hit_zone)
..()
if(ai_holder)
ai_holder.add_attacker(user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
index 9b6784a324..ba00989651 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
@@ -78,7 +78,7 @@
s.start()
qdel(src)
-/mob/living/simple_mob/mechanical/technomancer_golem/place_spell_in_hand(var/path)
+/mob/living/simple_mob/mechanical/technomancer_golem/place_spell_in_hand(path)
if(!path || !ispath(path))
return FALSE
if(active_spell)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
index d26eb35909..2ef15aaa7a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/hoverpod.dm
@@ -45,7 +45,7 @@
QDEL_NULL(ion_trail)
. = ..()
-/mob/living/simple_mob/mechanical/mecha/hoverpod/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/mechanical/mecha/hoverpod/Process_Spacemove(check_drift = 0)
return TRUE
/datum/decl/mob_organ_names/hoverpod
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm
index c166bba7dd..2615d0fa29 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/ward/monitor_ward.dm
@@ -45,7 +45,7 @@
/mob/living/simple_mob/mechanical/ward/monitor/crew
icon_state = "ward-nt"
-/mob/living/simple_mob/mechanical/ward/monitor/crew/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/mechanical/ward/monitor/crew/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/card/id) && !owner)
owner = user
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
index d3ee95a995..d28124e5fe 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm
@@ -67,7 +67,7 @@
can_pain_emote = FALSE
ai_holder_type = /datum/ai_holder/simple_mob/melee
-/mob/living/simple_mob/construct/place_spell_in_hand(var/path)
+/mob/living/simple_mob/construct/place_spell_in_hand(path)
if(!path || !ispath(path))
return 0
@@ -123,7 +123,7 @@
ghostize()
qdel(src)
-/mob/living/simple_mob/construct/attack_generic(var/mob/user)
+/mob/living/simple_mob/construct/attack_generic(mob/user)
if(istype(user, /mob/living/simple_mob/construct/artificer))
var/mob/living/simple_mob/construct/artificer/A = user
if(health < getMaxHealth())
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm
index ab7addb228..def9d5e04c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/bishop.dm
@@ -31,7 +31,7 @@
// environment_smash = 1 // Whatever this gets renamed to, Wraiths need to break things
-/mob/living/simple_mob/construct/bishop/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/construct/bishop/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
L.add_modifier(/datum/modifier/deep_wounds, 30 SECONDS)
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm
index 822671bdec..3ccdc0123e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/cardinal.dm
@@ -46,7 +46,7 @@
SetWeakened(0)
..()
-/mob/living/simple_mob/construct/cardinal/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/construct/cardinal/bullet_act(obj/item/projectile/P)
var/reflectchance = 100 - round(P.damage)
if(prob(reflectchance))
var/damage_mod = rand(2,4)
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
index 9d892d4ad7..74f296a4fc 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
@@ -52,7 +52,7 @@
SetWeakened(0)
..()
-/mob/living/simple_mob/construct/juggernaut/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/construct/juggernaut/bullet_act(obj/item/projectile/P)
var/reflectchance = 100 - round(P.damage*2) // CHOMPEdit: We have lower damage values now
if(prob(reflectchance))
var/damage_mod = rand(2,4)
@@ -128,7 +128,7 @@
/datum/spell/targeted/construct_advanced/slam
)
-/mob/living/simple_mob/construct/juggernaut/behemoth/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/construct/juggernaut/behemoth/bullet_act(obj/item/projectile/P)
var/reflectchance = 100 - round(P.damage*2) //CHOMPEdit: We have lower damage values now
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
@@ -164,7 +164,7 @@
// loot_list = list(/obj/item/rig/ch/aegis = 100) // Downstream only
-/mob/living/simple_mob/construct/juggernaut/behemoth/unstoppable/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/construct/juggernaut/behemoth/unstoppable/bullet_act(obj/item/projectile/P)
var/reflectchance = 100 - round(P.damage*2)
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm
index a34a8feb6a..0bfcab73a5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/shade.dm
@@ -31,7 +31,7 @@
loot_list = list(/obj/item/ectoplasm = 100)
-/mob/living/simple_mob/construct/shade/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/construct/shade/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/soulstone))
var/obj/item/soulstone/S = O;
S.transfer_soul("SHADE", src, user)
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm
index 6608b9bcc6..78454e8868 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/wraith.dm
@@ -33,7 +33,7 @@
// environment_smash = 1 // Whatever this gets renamed to, Wraiths need to break things
-/mob/living/simple_mob/construct/wraith/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/construct/wraith/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
L.add_modifier(/datum/modifier/deep_wounds, 30 SECONDS)
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
index 30b1963608..1887e905e6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/faithless.dm
@@ -45,11 +45,11 @@
can_be_drop_prey = FALSE
can_pain_emote = FALSE
-/mob/living/simple_mob/faithless/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/faithless/Process_Spacemove(check_drift = 0)
return 1
/* CHOMPRemove Start, no hardstuns
-/mob/living/simple_mob/faithless/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/faithless/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(12))
diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
index 78271df080..3b2603fe39 100644
--- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm
@@ -35,7 +35,7 @@
can_be_drop_prey = FALSE
can_pain_emote = FALSE // Can't feel pain and shouldn't take damage anyways, but, sanity
-/mob/living/simple_mob/animal/space/tree/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/animal/space/tree/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(15))
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
index 6428eeb68b..d5a99f3cb5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm
@@ -224,7 +224,7 @@ GLOBAL_LIST_INIT(slime_default_emotes, list(
return
// Hat simulator
-/mob/living/simple_mob/slime/proc/give_hat(var/obj/item/clothing/head/new_hat, var/mob/living/user)
+/mob/living/simple_mob/slime/proc/give_hat(obj/item/clothing/head/new_hat, mob/living/user)
if(!istype(new_hat))
to_chat(user, span_warning("\The [new_hat] isn't a hat."))
return
@@ -239,7 +239,7 @@ GLOBAL_LIST_INIT(slime_default_emotes, list(
update_icon()
return
-/mob/living/simple_mob/slime/proc/remove_hat(var/mob/living/user)
+/mob/living/simple_mob/slime/proc/remove_hat(mob/living/user)
if(!hat)
to_chat(user, span_warning("\The [src] doesn't have a hat to remove."))
else
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm
index 7197c9266f..d1f353ed18 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/consumption.dm
@@ -1,6 +1,6 @@
// Handles hunger, starvation, growth, and eatting humans.
-/mob/living/simple_mob/slime/xenobio/adjust_nutrition(input, var/heal = 1)
+/mob/living/simple_mob/slime/xenobio/adjust_nutrition(input, heal = 1)
..(input)
if(input > 0)
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
index 45d3f45b04..028e74c0f5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -193,14 +193,14 @@
log_and_message_admins("ignited due to exposure to fire.", src)
ignite()
-/mob/living/simple_mob/slime/xenobio/dark_purple/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/simple_mob/slime/xenobio/dark_purple/bullet_act(obj/item/projectile/P, def_zone)
if(P.damage_type && P.damage_type == BURN && P.damage) // Most bullets won't trigger the explosion, as a mercy towards Security.
log_and_message_admins("ignited due to bring hit by a burning projectile[P.firer ? " by [key_name(P.firer)]" : ""].", src)
ignite()
else
..()
-/mob/living/simple_mob/slime/xenobio/dark_purple/attackby(var/obj/item/W, var/mob/user)
+/mob/living/simple_mob/slime/xenobio/dark_purple/attackby(obj/item/W, mob/user)
if(istype(W) && W.force && W.damtype == BURN)
log_and_message_admins("ignited due to being hit with a burning weapon ([W]) by [key_name(user)].", src)
ignite()
@@ -281,7 +281,7 @@
/mob/living/simple_mob/slime/xenobio/amber
)
-/mob/living/simple_mob/slime/xenobio/silver/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/simple_mob/slime/xenobio/silver/bullet_act(obj/item/projectile/P, def_zone)
if(istype(P,/obj/item/projectile/beam) || istype(P, /obj/item/projectile/energy))
visible_message(span_danger("\The [src] reflects \the [P]!"))
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm
index 0a2fe0521f..0af178fd5f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio.dm
@@ -24,7 +24,7 @@
var/number = 0 // This is used to make the slime semi-unique for indentification.
var/harmless = FALSE // Set to true when pacified. Makes the slime harmless, not get hungry, and not be able to grow/reproduce.
-/mob/living/simple_mob/slime/xenobio/Initialize(mapload, var/mob/living/simple_mob/slime/xenobio/my_predecessor)
+/mob/living/simple_mob/slime/xenobio/Initialize(mapload, mob/living/simple_mob/slime/xenobio/my_predecessor)
ASSERT(ispath(ai_holder_type, /datum/ai_holder/simple_mob/xenobio_slime))
number = rand(1, 1000)
update_name()
@@ -41,7 +41,7 @@
return ..()
// Called when a slime makes another slime by splitting. The predecessor slime will be deleted shortly afterwards.
-/mob/living/simple_mob/slime/xenobio/proc/inherit_information(var/mob/living/simple_mob/slime/xenobio/predecessor)
+/mob/living/simple_mob/slime/xenobio/proc/inherit_information(mob/living/simple_mob/slime/xenobio/predecessor)
if(!predecessor)
return
@@ -284,7 +284,7 @@
to_chat(src, span_warning("I have not evolved enough to reproduce yet..."))
// Used when reproducing or dying.
-/mob/living/simple_mob/slime/xenobio/proc/make_new_slime(var/desired_type, var/no_step)
+/mob/living/simple_mob/slime/xenobio/proc/make_new_slime(desired_type, no_step)
var/t = src.type
if(desired_type)
t = desired_type
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio_vr.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio_vr.dm
index 4cf9c3151a..f970af244b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/xenobio_vr.dm
@@ -3,6 +3,6 @@
mob_bump_flag = SLIME
vore_attack_override = TRUE
-/mob/living/simple_mob/slime/xenobio/Initialize(mapload, var/mob/living/simple_mob/slime/xenobio/my_predecessor)
+/mob/living/simple_mob/slime/xenobio/Initialize(mapload, mob/living/simple_mob/slime/xenobio/my_predecessor)
. = ..()
Weaken(10)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
index fc899683a5..8c78c4abf0 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm
@@ -50,7 +50,7 @@
. = ..()
AddComponent(/datum/component/swarming)
-/mob/living/simple_mob/vore/bee/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/bee/Process_Spacemove(check_drift = 0)
return 1 //No drifting in space for space bee!
// Activate Noms!
@@ -58,7 +58,7 @@
vore_active = 1
vore_icons = SA_ICON_LIVING
-/mob/living/simple_mob/vore/bee/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/bee/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
index 36852e89d0..3a0b132312 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
@@ -335,7 +335,7 @@ I think I covered everything.
update_fullness()
build_icons()
-/mob/living/simple_mob/vore/bigdragon/proc/build_icons(var/random)
+/mob/living/simple_mob/vore/bigdragon/proc/build_icons(random)
cut_overlays()
if(stat == DEAD)
plane = MOB_LAYER
@@ -733,7 +733,7 @@ I think I covered everything.
/// AI handling stuff
///
// It hurts me a little to make these mob specific procs instead of effects that can be invoked by any mob, but I'm too lazy to go fix mob attacks like that.
-/mob/living/simple_mob/vore/bigdragon/proc/repulse(var/range = 2)
+/mob/living/simple_mob/vore/bigdragon/proc/repulse(range = 2)
var/list/thrownatoms = list()
for(var/mob/living/victim in oview(range, src))
thrownatoms += victim
@@ -746,7 +746,7 @@ I think I covered everything.
playsound(src, "sound/weapons/punchmiss.ogg", 50, 1)
//Split repulse into two parts so I can recycle this later
-/mob/living/simple_mob/vore/bigdragon/proc/yeet(var/atom/movable/AM, var/gentle = 0)
+/mob/living/simple_mob/vore/bigdragon/proc/yeet(atom/movable/AM, gentle = 0)
var/maxthrow = 7
var/atom/throwtarget
var/distfromcaster
@@ -769,7 +769,7 @@ I think I covered everything.
playsound(src, get_sfx("punch"), 50, 1)
AM.throw_at(throwtarget, maxthrow, 3, src)
-/mob/living/simple_mob/vore/bigdragon/proc/chargestart(var/atom/A)
+/mob/living/simple_mob/vore/bigdragon/proc/chargestart(atom/A)
if(!enraged)
set_AI_busy(TRUE)
@@ -778,7 +778,7 @@ I think I covered everything.
chargetimer = addtimer(CALLBACK(src, PROC_REF(chargeend), A), charge_warmup, TIMER_STOPPABLE)
-/mob/living/simple_mob/vore/bigdragon/proc/chargeend(var/atom/A, var/explicit = 0, var/gentle = 0)
+/mob/living/simple_mob/vore/bigdragon/proc/chargeend(atom/A, explicit = 0, gentle = 0)
//make sure our target still exists and is on a turf
if(QDELETED(A) || !isturf(get_turf(A)))
set_AI_busy(FALSE)
@@ -810,7 +810,7 @@ I think I covered everything.
yeet(target, gentle)
set_AI_busy(FALSE)
-/mob/living/simple_mob/vore/bigdragon/proc/firebreathstart(var/atom/A)
+/mob/living/simple_mob/vore/bigdragon/proc/firebreathstart(atom/A)
glow_toggle = 1
set_light(glow_range, glow_intensity, glow_color) //Setting it here so the light starts immediately
if(!enraged)
@@ -820,7 +820,7 @@ I think I covered everything.
firebreathtimer = addtimer(CALLBACK(src, PROC_REF(firebreathend), A), charge_warmup, TIMER_STOPPABLE)
playsound(src, "sound/magic/Fireball.ogg", 50, 1)
-/mob/living/simple_mob/vore/bigdragon/proc/firebreathend(var/atom/A)
+/mob/living/simple_mob/vore/bigdragon/proc/firebreathend(atom/A)
//make sure our target still exists and is on a turf
if(QDELETED(A) || !isturf(get_turf(A)))
set_AI_busy(FALSE)
@@ -860,7 +860,7 @@ I think I covered everything.
var/fire_stacks = 1
//Making it so fire passes through mobs but not walls
-/obj/item/projectile/bullet/incendiary/dragonflame/check_penetrate(var/atom/A)
+/obj/item/projectile/bullet/incendiary/dragonflame/check_penetrate(atom/A)
if(!A || !A.density) return 1
if(istype(A, /obj/mecha))
@@ -891,7 +891,7 @@ I think I covered everything.
else
. = ..()
-/mob/living/simple_mob/vore/bigdragon/do_tame(var/obj/O, var/mob/user)
+/mob/living/simple_mob/vore/bigdragon/do_tame(obj/O, mob/user)
if(!user)
return
if(faction == FACTION_NEUTRAL)
@@ -925,7 +925,7 @@ I think I covered everything.
var/warnings = 0
var/last_warning
-/datum/ai_holder/simple_mob/healbelly/proc/confirmPatient(var/mob/living/P)
+/datum/ai_holder/simple_mob/healbelly/proc/confirmPatient(mob/living/P)
if(isanimal(holder))
var/mob/living/simple_mob/H = holder
if(H.will_eat(P))
@@ -984,7 +984,7 @@ I think I covered everything.
holder.a_intent = I_HURT
return 1
-/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/can_attack(atom/movable/the_target, vision_required = TRUE)
if(istype(holder,/mob/living/simple_mob/vore/bigdragon))
var/mob/living/simple_mob/vore/bigdragon/BG = holder
if(holder.IIsAlly(the_target))
@@ -1042,7 +1042,7 @@ I think I covered everything.
return
return .=..()
-/mob/living/simple_mob/vore/bigdragon/proc/enrage(var/atom/movable/attacker)
+/mob/living/simple_mob/vore/bigdragon/proc/enrage(atom/movable/attacker)
enraged = 1
norange = 0
faction = FACTION_DRAGON
@@ -1065,7 +1065,7 @@ I think I covered everything.
set_AI_busy(FALSE)
//Smack people it warns
-/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/proc/dissuade(var/chump)
+/datum/ai_holder/simple_mob/healbelly/retaliate/dragon/proc/dissuade(chump)
if(chump in check_trajectory(chump, holder, pass_flags = PASSTABLE))
if(istype(holder,/mob/living/simple_mob/vore/bigdragon))
var/mob/living/simple_mob/vore/bigdragon/H = holder
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
index eefa56fddd..dd2caf5fd6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/corrupt_hounds.dm
@@ -98,7 +98,7 @@
/mob/living/simple_mob/vore/aggressive/corrupthound/speech_bubble_appearance()
return "synthetic_evil"
-/mob/living/simple_mob/vore/aggressive/corrupthound/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/aggressive/corrupthound/apply_melee_effects(atom/A)
if(ismouse(A))
var/mob/living/simple_mob/animal/passive/mouse/mouse = A
if(mouse.getMaxHealth() < 20) // In case a badmin makes giant mice or something.
@@ -123,7 +123,7 @@
/mob/living/simple_mob/vore/aggressive/corrupthound/MouseDrop_T(mob/living/M, mob/living/user)
return
-/mob/living/simple_mob/vore/aggressive/corrupthound/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/aggressive/corrupthound/space/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/vore/aggressive/corrupthound/load_default_bellies()
@@ -345,7 +345,7 @@
/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/speech_bubble_appearance()
return "synthetic_evil"
-/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/apply_melee_effects(atom/A)
if(ismouse(A))
var/mob/living/simple_mob/animal/passive/mouse/mouse = A
if(mouse.getMaxHealth() < 20) // In case a badmin makes giant mice or something.
@@ -370,7 +370,7 @@
/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/MouseDrop_T(mob/living/M, mob/living/user)
return
-/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/space/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/vore/retaliate/corrupthound/janihound/load_default_bellies()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm
index 112126086a..ffbfb32990 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demon.dm
@@ -102,7 +102,7 @@
return canmove
. = ..()
-/mob/living/simple_mob/vore/demon/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/demon/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI.dm b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI.dm
index 3b3b67e4cb..a37737251b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/demon/demonAI.dm
@@ -158,7 +158,7 @@
. = ..()
break_cloak()
-/mob/living/simple_mob/vore/demonAI/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/demonAI/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm
index a9754c4cad..a8ed4d76e4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/devil.dm
@@ -67,7 +67,7 @@
However, when lifeforms exist nearby, these oddly curvaceous devils spring to life, lighting up and attempting to devour all living things. We assume they reduce their targets to biofuel to sustain themselves, but they have been known to break their disguise when attacked to defend themselves."
value = CATALOGUER_REWARD_HARD
-/mob/living/simple_mob/vore/devil/PounceTarget(var/mob/living/M, var/successrate = 100)
+/mob/living/simple_mob/vore/devil/PounceTarget(mob/living/M, successrate = 100)
vore_pounce_cooldown = world.time + 1 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
@@ -140,7 +140,7 @@
give_target(new_target)
return new_target
-/datum/ai_holder/simple_mob/vore/devil/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/vore/devil/can_attack(atom/movable/the_target, vision_required = TRUE)
ai_log("can_attack() : Entering.", AI_LOG_TRACE)
if(!can_see_target(the_target) && vision_required)
return FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
index 298406e6b0..7553a4502c 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
@@ -26,7 +26,7 @@
var/prey_ooc_dislikes
var/was_mob
-/mob/living/dominated_brain/Initialize(mapload, var/mob/living/pred, preyname, var/mob/living/prey)
+/mob/living/dominated_brain/Initialize(mapload, mob/living/pred, preyname, mob/living/prey)
prey_name = preyname
if(prey)
prey_body = prey
@@ -44,7 +44,7 @@
if(!ckey)
qdel(src)
-/mob/living/dominated_brain/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/living/dominated_brain/say_understands(mob/other, datum/language/speaking = null)
if(pred_body.say_understands(other, speaking))
return TRUE
else return FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
index fd8df11fb5..3d3cc05db5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm
@@ -52,7 +52,7 @@
can_be_drop_prey = FALSE
-/mob/living/simple_mob/vore/aggressive/dragon/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/aggressive/dragon/Process_Spacemove(check_drift = 0)
return 1 //No drifting in space for space dragons!
/*
/mob/living/simple_mob/vore/aggressive/dragon/FindTarget()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/goia.dm b/code/modules/mob/living/simple_mob/subtypes/vore/goia.dm
index 747d5ad6a5..88e1aa3129 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/goia.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/goia.dm
@@ -467,7 +467,7 @@
/datum/ai_holder/simple_mob/melee/evasive/zorgoia
-/datum/ai_holder/simple_mob/melee/evasive/zorgoia/New(var/mob/living/simple_mob/vore/zorgoia/new_holder)
+/datum/ai_holder/simple_mob/melee/evasive/zorgoia/New(mob/living/simple_mob/vore/zorgoia/new_holder)
.=..()
if(new_holder.tamed)
hostile = FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm
index f246ff93f0..7f5766366f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/greatwolf.dm
@@ -103,7 +103,7 @@
return
-/mob/living/simple_mob/vore/greatwolf/attackby(var/obj/item/O, var/mob/user) // Trade food for people!
+/mob/living/simple_mob/vore/greatwolf/attackby(obj/item/O, mob/user) // Trade food for people!
if(istype(O, /obj/item/reagent_containers/food))
qdel(O)
playsound(src,'sound/vore/gulp.ogg', rand(10,50), 1)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm
index 5038f2846f..70b3eed30b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/gryphon.dm
@@ -111,7 +111,7 @@
eat_attempts = 0
return null
-/datum/ai_holder/simple_mob/vore/gryphon/proc/possibly_eat(var/target, var/alone)
+/datum/ai_holder/simple_mob/vore/gryphon/proc/possibly_eat(target, alone)
if (target != maybe_eating)
eat_attempts = 0
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm b/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm
index 6118a77c3a..ba226b36c4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/macrophage.dm
@@ -96,13 +96,13 @@
var/mob/living/carbon/human/H = A
H.ContractDisease(base_disease)
/*
-/mob/living/simple_mob/vore/aggressive/macrophage/do_special_attack(var/atom/A)
+/mob/living/simple_mob/vore/aggressive/macrophage/do_special_attack(atom/A)
. = TRUE
set_AI_busy(TRUE)
do_windup_animation(A, 20)
addtimer(CALLBACK(src, PROC_REF(charge), A), 20, TIMER_STOPPABLE)
-/mob/living/simple_mob/vore/aggressive/macrophage/proc/charge(var/atom/A)
+/mob/living/simple_mob/vore/aggressive/macrophage/proc/charge(atom/A)
if(QDELETED(A) || !isturf(get_turf(A)))
set_AI_busy(FALSE)
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm
index 29d4d65786..fcdf884f56 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/meowl.dm
@@ -100,7 +100,7 @@
"Unfortunately, %pred seems to have absolutely no intention of letting you go, and your futile effort goes nowhere.",
"Strain as you might, you can't keep up the effort long enough before you sink back into %pred's %belly.")
-/mob/living/simple_mob/vore/meowl/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vore/meowl/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/reagent_containers/food))
if(health <= 0)
return
@@ -111,7 +111,7 @@
return
return ..()
-/mob/living/simple_mob/vore/meowl/PounceTarget(var/mob/living/M, var/successrate = 100)
+/mob/living/simple_mob/vore/meowl/PounceTarget(mob/living/M, successrate = 100)
vore_pounce_cooldown = world.time + 1 SECONDS // don't attempt another pounce for a while
if(prob(max(successrate,33))) // pounce success!
M.Weaken(5)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
index 7e00b0401a..f9c0de48ce 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
@@ -55,7 +55,7 @@
qdel(src)
return
-/obj/structure/closet/crate/mimic/damage(var/damage)
+/obj/structure/closet/crate/mimic/damage(damage)
if(contents.len)
visible_message(span_bolddanger("[src] makes out a crunchy noise as its contents are destroyed!"))
for(var/obj/O in src.contents)
@@ -133,7 +133,7 @@
wander = FALSE
hostile = TRUE
-/mob/living/simple_mob/vore/aggressive/mimic/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/aggressive/mimic/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(knockdown_chance))
@@ -193,7 +193,7 @@
qdel(src)
return
-/obj/structure/closet/crate/mimic/airlock/damage(var/damage)
+/obj/structure/closet/crate/mimic/airlock/damage(damage)
if(contents.len)
visible_message(span_bolddanger("The [src] let's out an enraged screach!"))
for(var/obj/O in src.contents)
@@ -287,7 +287,7 @@
qdel(src)
return
-/obj/structure/closet/crate/mimic/closet/damage(var/damage)
+/obj/structure/closet/crate/mimic/closet/damage(damage)
if(contents.len)
visible_message(span_bolddanger("The [src] makes out a crunchy noise as its contents are destroyed!"))
for(var/obj/O in src.contents)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm
index cf4ac935a3..a879521dfd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/hespawner.dm
@@ -15,7 +15,7 @@
/obj/structure/ghost_pod/manual/clegg/trigger()
..(span_warning("\The [usr] places their hand on the egg!"), "is attempting to make a mistake!")
-/obj/structure/ghost_pod/manual/clegg/create_occupant(var/mob/M)
+/obj/structure/ghost_pod/manual/clegg/create_occupant(mob/M)
lightning_strike(get_turf(src), cosmetic = TRUE)
var/list/choices = list(/mob/living/simple_mob/clowns/normal, /mob/living/simple_mob/clowns/honkling, /mob/living/simple_mob/clowns/mayor, /mob/living/simple_mob/clowns/blob, /mob/living/simple_mob/clowns/mutant, /mob/living/simple_mob/clowns/clowns, /mob/living/simple_mob/clowns/flesh, /mob/living/simple_mob/clowns/scary, /mob/living/simple_mob/clowns/chlown, /mob/living/simple_mob/clowns/destroyer, /mob/living/simple_mob/clowns/giggles, /mob/living/simple_mob/clowns/longface, /mob/living/simple_mob/clowns/hulk, /mob/living/simple_mob/clowns/thin, /mob/living/simple_mob/clowns/wide, /mob/living/simple_mob/clowns/perm, /mob/living/simple_mob/clowns/thicc, /mob/living/simple_mob/clowns/punished, /mob/living/simple_mob/clowns/sentinel, /mob/living/simple_mob/clowns/tunnelclown, /mob/living/simple_mob/clowns/cluwne, /mob/living/simple_mob/clowns/honkmunculus)
var/chosen_clown = tgui_input_list(M, "Redspace clowns like themes, what's yours?", "Theme Choice", choices)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index 559f251fdb..8c426913fb 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -142,7 +142,7 @@
return
-/mob/living/simple_mob/vore/morph/proc/restore(var/silent = FALSE)
+/mob/living/simple_mob/vore/morph/proc/restore(silent = FALSE)
if(!morphed)
to_chat(src, span_warning("You're already in your normal form!"))
return
@@ -196,7 +196,7 @@
/mob/living/simple_mob/vore/morph/will_show_tooltip()
return (!morphed)
-/mob/living/simple_mob/vore/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = FALSE, var/allow_stripping = FALSE) //CHOMPEdit - Disable aura_animation. Too expensive for something you can't even see.
+/mob/living/simple_mob/vore/morph/resize(new_size, animate = TRUE, uncapped = FALSE, ignore_prefs = FALSE, aura_animation = FALSE, allow_stripping = FALSE) //CHOMPEdit - Disable aura_animation. Too expensive for something you can't even see.
if(morphed && !ismob(form))
return
return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
index 2496a325ac..5da8395a95 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
@@ -125,7 +125,7 @@
/datum/say_list/oregrub
emote_see = list("burbles", "chitters", "snuffles around for fresh ore")
-/mob/living/simple_mob/vore/oregrub/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/oregrub/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
index e8e0225909..4f5adafda3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/otie.dm
@@ -239,7 +239,7 @@
icon_living = "hotiesc"
icon_rest = "hotiesc_rest"
-/mob/living/simple_mob/vore/otie/attackby(var/obj/item/O, var/mob/user) // Trade donuts for bellybrig victims.
+/mob/living/simple_mob/vore/otie/attackby(obj/item/O, mob/user) // Trade donuts for bellybrig victims.
if(istype(O, /obj/item/reagent_containers/food))
qdel(O)
playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
@@ -254,7 +254,7 @@
return
. = ..()
-/mob/living/simple_mob/vore/otie/security/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey) // Make the gut start out safe for bellybrigging.
+/mob/living/simple_mob/vore/otie/security/feed_grabbed_to_self(mob/living/user, mob/living/prey) // Make the gut start out safe for bellybrigging.
if(ishuman(prey))
vore_selected.digest_mode = DM_HOLD
if(check_threat(prey) >= 4)
@@ -263,7 +263,7 @@
vore_selected.digest_mode = DM_DIGEST
. = ..()
-/mob/living/simple_mob/vore/otie/security/proc/check_threat(var/mob/living/M)
+/mob/living/simple_mob/vore/otie/security/proc/check_threat(mob/living/M)
if(!M || !ishuman(M) || M.stat == DEAD || src == M)
return 0
return M.assess_perp(0, 0, 0, check_records, check_arrest)
@@ -338,7 +338,7 @@
/datum/ai_holder/simple_mob/melee/evasive/otie
-/datum/ai_holder/simple_mob/melee/evasive/otie/New(var/mob/living/simple_mob/vore/otie/new_holder)
+/datum/ai_holder/simple_mob/melee/evasive/otie/New(mob/living/simple_mob/vore/otie/new_holder)
.=..()
if(new_holder.tamed)
hostile = FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm
index 5a0f318ae9..b1f9a3915a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm
@@ -128,7 +128,7 @@
our_targets -= SM.prey_excludes // Lazylist, but subtracting a null from the list seems fine.
return our_targets
-/datum/ai_holder/simple_mob/ranged/pakkun/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/ranged/pakkun/can_attack(atom/movable/the_target, vision_required = TRUE)
.=..()
if(isliving(the_target))
var/mob/living/L = the_target
@@ -141,7 +141,7 @@
else
return FALSE
-/mob/living/simple_mob/vore/pakkun/on_throw_vore_special(var/pred, var/mob/living/target)
+/mob/living/simple_mob/vore/pakkun/on_throw_vore_special(pred, mob/living/target)
if(pred && !extra_possessive && !(LAZYFIND(prey_excludes, target)))
LAZYSET(prey_excludes, target, world.time)
addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(target)), 5 MINUTES)
@@ -162,7 +162,7 @@
B.digestchance = 0
B.digest_mode = DM_SELECT
-/mob/living/simple_mob/vore/pakkun/attackby(var/obj/item/O, var/mob/user) //if they're newspapered, they'll spit out any junk they've eaten for whatever reason
+/mob/living/simple_mob/vore/pakkun/attackby(obj/item/O, mob/user) //if they're newspapered, they'll spit out any junk they've eaten for whatever reason
if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc))
user.visible_message(span_info("[user] swats [src] with [O]!"))
release_vore_contents()
@@ -185,7 +185,7 @@
extra_possessive = TRUE //you're gonna get KEPT, at least the first time you go in
-/mob/living/simple_mob/vore/pakkun/snapdragon/on_throw_vore_special(var/pred, var/mob/living/target)
+/mob/living/simple_mob/vore/pakkun/snapdragon/on_throw_vore_special(pred, mob/living/target)
..()
extra_possessive = !extra_possessive //toggle their possessiveness on and off every time they eat someone
@@ -201,7 +201,7 @@
extra_possessive = TRUE // won't let its prey go if it's awake, luckily, see below.
-/mob/living/simple_mob/vore/pakkun/sand/on_throw_vore_special(var/pred, var/mob/living/target)
+/mob/living/simple_mob/vore/pakkun/sand/on_throw_vore_special(pred, mob/living/target)
..()
autorest_cooldown = 0 // Sand pakkuns, also known as napdragons, like to curl up for an small sleemp after eating. This is your chance to escape.
@@ -255,7 +255,7 @@
our_targets -= list_target
return our_targets
-/datum/ai_holder/simple_mob/ranged/pakkun/snappy/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/ranged/pakkun/snappy/can_attack(atom/movable/the_target, vision_required = TRUE)
.=..()
var/mob/living/simple_mob/vore/pakkun/snapdragon/snappy/SM = holder
if(!(the_target in SM.petters))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm b/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm
index 9ec5516cec..5800a9a588 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/plants/plants.dm
@@ -67,7 +67,7 @@
vision_range = 1
wander = FALSE
-/mob/living/simple_mob/vore/mantrap/Crossed(var/atom/movable/AM) // Transplanting this from /mob/living/carbon/human/Crossed()
+/mob/living/simple_mob/vore/mantrap/Crossed(atom/movable/AM) // Transplanting this from /mob/living/carbon/human/Crossed()
if(AM == src || AM.is_incorporeal()) // We're not going to run over ourselves or ghosts
return
if(src.stat)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
index 901caf81b4..495520461e 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm
@@ -177,7 +177,7 @@
hunger = 0
food = null
-/mob/living/simple_mob/vore/aggressive/rat/tame/attackby(var/obj/item/O, var/mob/user) // Feed the rat your food to satisfy it.
+/mob/living/simple_mob/vore/aggressive/rat/tame/attackby(obj/item/O, mob/user) // Feed the rat your food to satisfy it.
if(istype(O, /obj/item/reagent_containers/food/snacks))
qdel(O)
playsound(src,'sound/items/eatfood.ogg', rand(10,50), 1)
@@ -186,7 +186,7 @@
return
. = ..()
-/mob/living/simple_mob/vore/aggressive/rat/tame/Found(var/atom/found_atom)
+/mob/living/simple_mob/vore/aggressive/rat/tame/Found(atom/found_atom)
if(!SA_attackable(found_atom))
return null
else if(ishuman(found_atom) && will_eat(found_atom))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm
index 8c5cb5015f..573eb00259 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/scrubble.dm
@@ -69,7 +69,7 @@
Their geneneral behaviour supports this, as they will heavily avoid interaction with any other species that approach it, usually darting away rapidly and keeping a distance. However, they have been known to act defensively should they be completely cornered."
value = CATALOGUER_REWARD_HARD
-/mob/living/simple_mob/vore/scrubble/PounceTarget(var/mob/living/M, var/successrate = 100)
+/mob/living/simple_mob/vore/scrubble/PounceTarget(mob/living/M, successrate = 100)
vore_pounce_cooldown = world.time + 20 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
index b39871d468..7d33663ffd 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/ability_objects.dm
@@ -31,7 +31,7 @@
name = my_kin.comp.dark_energy >= cost ? "Activate" : "No Energy"
return src
-/obj/effect/shadekin_ability/Click(var/location, var/control, var/params)
+/obj/effect/shadekin_ability/Click(location, control, params)
if(my_kin.stat) return
var/list/clickprops = params2list(params)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
index b47105375a..8281b23429 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm
@@ -306,7 +306,7 @@
/* //VOREStation AI Temporary Removal
//Blue-eyes want to nom people to heal them
-/mob/living/simple_mob/shadekin/Found(var/atom/A)
+/mob/living/simple_mob/shadekin/Found(atom/A)
if(specific_targets && isliving(A)) //Healing!
var/mob/living/L = A
var/health_percent = (L.health/L.getMaxHealth())*100
@@ -407,7 +407,7 @@
/mob/living/simple_mob/shadekin/speech_bubble_appearance()
return "ghost"
-/mob/living/simple_mob/shadekin/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/shadekin/apply_melee_effects(atom/A)
. = ..(A)
if(isliving(A)) //We punched something!
var/mob/living/L = A
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
index d2a64583ca..173e62c726 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm
@@ -86,7 +86,7 @@
//If you just update icon_living it should still work with vore states and dying, you'll just need to make and label the sprites appropriately.
//Make sure you un-comment the variables above too.
-/mob/living/simple_mob/vore/sheep/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vore/sheep/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/material/knife) || istype(O, /obj/item/tool/wirecutters))
if(user.a_intent != I_HELP)
return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
index 4953e27074..4eae201be6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm
@@ -194,7 +194,7 @@
hostile = 1
retaliate = 1
-/mob/living/simple_mob/vore/woof/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/woof/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(knockdown_chance))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
index 34fd1a782d..7c23dbf4ea 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
@@ -131,7 +131,7 @@ GLOBAL_VAR_INIT(moth_amount, 0)
vore_pounce_chance = 0 //grubs only eat incapacitated targets
vore_default_mode = DM_DIGEST
-/mob/living/simple_mob/vore/solargrub/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/solargrub/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(shock_chance))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
index 16b4cc9b2b..4761e66d76 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm
@@ -116,7 +116,7 @@ GLOBAL_LIST_EMPTY(grub_machine_overlays)
return FALSE
-/mob/living/simple_mob/animal/solargrub_larva/proc/enter_machine(var/obj/machinery/M)
+/mob/living/simple_mob/animal/solargrub_larva/proc/enter_machine(obj/machinery/M)
if(!istype(M))
return
set_AI_busy(TRUE)
@@ -129,13 +129,13 @@ GLOBAL_LIST_EMPTY(grub_machine_overlays)
for(var/mob/L in GLOB.player_list) //because nearly every machine updates its icon by removing all overlays first
L << machine_effect
-/mob/living/simple_mob/animal/solargrub_larva/proc/generate_machine_effect(var/obj/machinery/M)
+/mob/living/simple_mob/animal/solargrub_larva/proc/generate_machine_effect(obj/machinery/M)
var/icon/I = new /icon(M.icon, M.icon_state)
I.Blend(new /icon('icons/effects/blood.dmi', rgb(255,255,255)),ICON_ADD)
I.Blend(new /icon('icons/effects/alert.dmi', "_red"),ICON_MULTIPLY)
GLOB.grub_machine_overlays[M.type] = I
-/mob/living/simple_mob/animal/solargrub_larva/proc/eject_from_machine(var/obj/machinery/M)
+/mob/living/simple_mob/animal/solargrub_larva/proc/eject_from_machine(obj/machinery/M)
if(!M)
if(istype(loc, /obj/machinery))
M = loc
@@ -150,7 +150,7 @@ GLOBAL_LIST_EMPTY(grub_machine_overlays)
spawn(30)
set_AI_busy(FALSE)
-/mob/living/simple_mob/animal/solargrub_larva/proc/do_ventcrawl(var/obj/machinery/atmospherics/unary/vent_pump/vent)
+/mob/living/simple_mob/animal/solargrub_larva/proc/do_ventcrawl(obj/machinery/atmospherics/unary/vent_pump/vent)
if(!vent)
return
var/obj/machinery/atmospherics/unary/vent_pump/end_vent = get_safe_ventcrawl_target(vent)
@@ -231,7 +231,7 @@ GLOBAL_LIST_EMPTY(grub_machine_overlays)
actual_targets += M
return actual_targets
-/datum/ai_holder/simple_mob/solargrub_larva/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/solargrub_larva/can_attack(atom/movable/the_target, vision_required = TRUE)
.=..()
var/obj/machinery/M = the_target
if(!istype(M))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm
index 0ebd13d816..40365cfe47 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solarmoth.dm
@@ -75,7 +75,7 @@
/datum/say_list/solarmoth
emote_see = list("flutters")
-/mob/living/simple_mob/vore/solarmoth/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/solarmoth/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
if(prob(shock_chance))
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm
index f82c216391..29363ae218 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/stalker.dm
@@ -72,7 +72,7 @@
Typically they will follow their prey from a distance, and when they are not paying attention, will rush in to tackle their meal. However, they're stealth hunters and are easily startled if spotted. They will not attack their prey head on unless physically provoked to defend themselves."
value = CATALOGUER_REWARD_HARD
-/mob/living/simple_mob/vore/stalker/PounceTarget(var/mob/living/M, var/successrate = 100)
+/mob/living/simple_mob/vore/stalker/PounceTarget(mob/living/M, successrate = 100)
vore_pounce_cooldown = world.time + 1 SECONDS // don't attempt another pounce for a while
if(prob(successrate)) // pounce success!
M.Weaken(5)
@@ -146,7 +146,7 @@
give_target(new_target)
return new_target
-/datum/ai_holder/simple_mob/vore/stalker/can_attack(atom/movable/the_target, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/vore/stalker/can_attack(atom/movable/the_target, vision_required = TRUE)
ai_log("can_attack() : Entering.", AI_LOG_TRACE)
if(!can_see_target(the_target) && vision_required)
return FALSE
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm b/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm
index 03a8e7e22a..dc10079fbc 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm
@@ -229,7 +229,7 @@
say_maybe_target = list("Pest detected?")
say_got_target = list("PEST DETECTED!")
-/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/ClickOn(var/atom/A, var/params)
+/mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/ClickOn(atom/A, params)
var/list/modifiers = params2list(params)
if(modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"] || modifiers["alt"])
return ..()
@@ -370,7 +370,7 @@
return ..(targets)
-/datum/ai_holder/simple_mob/retaliate/swoopie/find_target(var/list/possible_targets, var/has_targets_list = FALSE)
+/datum/ai_holder/simple_mob/retaliate/swoopie/find_target(list/possible_targets, has_targets_list = FALSE)
ai_log("find_target() : Entered.", AI_LOG_TRACE)
if(!hostile) // So retaliating mobs only attack the thing that hit it.
return null
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
index ac603f5acf..d4d839d5ca 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
@@ -78,7 +78,7 @@
minbodytemp = 0
maxbodytemp = 700
-/mob/living/simple_mob/vore/wolf/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/vore/wolf/space/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/vore/wolf/direwolf
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm
index 869b9953bf..97fc2202f4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/zz_vore_overrides.dm
@@ -155,7 +155,7 @@
return EatTarget()
else ..()
-/mob/living/simple_mob/animal/passive/cat/Found(var/atom/found_atom)
+/mob/living/simple_mob/animal/passive/cat/Found(atom/found_atom)
if(!SA_attackable(found_atom))
return null
if(istype(found_atom,/mob/living/simple_mob/animal/passive/mouse))
@@ -165,7 +165,7 @@
if(will_eat(found_atom))
return found_atom
-/mob/living/simple_mob/animal/passive/cat/fluff/Found(var/atom/found_atom)
+/mob/living/simple_mob/animal/passive/cat/fluff/Found(atom/found_atom)
if (friend == found_atom)
return null
return ..()
@@ -231,7 +231,7 @@
for(var/obj/belly/B as anything in vore_organs)
B.digest_mode = safe ? DM_HOLD : vore_default_mode
-/mob/living/simple_mob/animal/space/carp/holographic/set_safety(var/safe)
+/mob/living/simple_mob/animal/space/carp/holographic/set_safety(safe)
. = ..()
for(var/obj/belly/B as anything in vore_organs)
B.digest_mode = safe ? DM_HOLD : vore_default_mode
diff --git a/code/modules/mob/living/simple_mob/taming.dm b/code/modules/mob/living/simple_mob/taming.dm
index 2b997c4e4c..7dccb0a948 100644
--- a/code/modules/mob/living/simple_mob/taming.dm
+++ b/code/modules/mob/living/simple_mob/taming.dm
@@ -13,7 +13,7 @@
if(L in tamers)
return TRUE
-/mob/living/simple_mob/proc/can_tame(var/obj/O, var/mob/user)
+/mob/living/simple_mob/proc/can_tame(obj/O, mob/user)
if(!LAZYLEN(tame_items))
return FALSE
@@ -29,19 +29,19 @@
return FALSE
-/mob/living/simple_mob/proc/unique_tame_check(var/obj/O, var/mob/user)
+/mob/living/simple_mob/proc/unique_tame_check(obj/O, mob/user)
if(do_after(user, 0.5 SECONDS, target = src))
return TRUE
return FALSE
-/mob/living/simple_mob/proc/tame_prob(var/obj/O, var/mob/user)
+/mob/living/simple_mob/proc/tame_prob(obj/O, mob/user)
for(var/path in tame_items)
if(istype(O, path))
if(prob(tame_items[path]))
return TRUE
return FALSE
-/mob/living/simple_mob/proc/do_tame(var/obj/O, var/mob/user)
+/mob/living/simple_mob/proc/do_tame(obj/O, mob/user)
if(!user)
return
@@ -53,10 +53,10 @@
tamers |= user
ai_holder.forget_everything()
-/mob/living/simple_mob/proc/handle_tame_item(var/obj/O, var/mob/user)
+/mob/living/simple_mob/proc/handle_tame_item(obj/O, mob/user)
user.drop_from_inventory(O)
qdel(O)
-/mob/living/simple_mob/proc/fail_tame(var/obj/O, var/mob/user)
+/mob/living/simple_mob/proc/fail_tame(obj/O, mob/user)
user.drop_from_inventory(O)
qdel(O)
diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm
index bba5b5f027..689b81591c 100644
--- a/code/modules/mob/living/voice/voice.dm
+++ b/code/modules/mob/living/voice/voice.dm
@@ -105,7 +105,7 @@
// Proc: say()
// Parameters: 4 (generic say() arguments)
// Description: Adds a speech bubble to the communicator device, then calls ..() to do the real work.
-/mob/living/voice/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/voice/say(message, datum/language/speaking = null, whispering = 0)
//Speech bubbles.
if(comm)
var/speech_bubble_test = say_test(message)
@@ -129,7 +129,7 @@
/mob/living/voice/speech_bubble_appearance()
return "comm"
-/mob/living/voice/say_understands(var/other, var/datum/language/speaking = null)
+/mob/living/voice/say_understands(other, datum/language/speaking = null)
//These only pertain to common. Languages are handled by mob/say_understands()
if(!speaking)
if(iscarbon(other))
@@ -140,7 +140,7 @@
return TRUE
return ..()
-/mob/living/voice/custom_emote(var/m_type = VISIBLE_MESSAGE, var/message = null, var/range = world.view)
+/mob/living/voice/custom_emote(m_type = VISIBLE_MESSAGE, message = null, range = world.view)
if(comm)
..(m_type,message,comm.video_range)
else if(item_tf)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 0ef3f6c80c..8ca512f47a 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -124,7 +124,7 @@
// message is the message output to anyone who can see e.g. "[src] does something!"
// self_message (optional) is what the src mob sees e.g. "You do something!"
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
-/mob/visible_message(var/message, var/self_message, var/blind_message, var/list/exclude_mobs = null, var/range = world.view, var/runemessage)
+/mob/visible_message(message, self_message, blind_message, list/exclude_mobs = null, range = world.view, runemessage)
if(self_message)
if(LAZYLEN(exclude_mobs))
exclude_mobs |= src
@@ -139,7 +139,7 @@
// If drain_check is set it will not actually drain power, just return a value.
// If surge is set, it will destroy/damage the recipient and not return any power.
// Not sure where to define this, so it can sit here for the rest of time.
-/atom/proc/drain_power(var/drain_check,var/surge, var/amount = 0)
+/atom/proc/drain_power(drain_check,surge, amount = 0)
return -1
// used for petrification machines
@@ -159,7 +159,7 @@
// self_message (optional) is what the src mob hears.
// deaf_message (optional) is what deaf people will see.
// hearing_distance (optional) is the range, how many tiles away the message can be heard.
-/mob/audible_message(var/message, var/deaf_message, var/hearing_distance, var/self_message, var/radio_message, var/runemessage)
+/mob/audible_message(message, deaf_message, hearing_distance, self_message, radio_message, runemessage)
var/range = hearing_distance || world.view
var/list/hear = get_mobs_and_objs_in_view_fast(get_turf(src),range,remote_ghosts = FALSE)
@@ -221,7 +221,7 @@
/mob/proc/cannot_stand()
return incapacitated(INCAPACITATION_KNOCKDOWN)
-/mob/proc/incapacitated(var/incapacitation_flags = INCAPACITATION_DEFAULT)
+/mob/proc/incapacitated(incapacitation_flags = INCAPACITATION_DEFAULT)
if((incapacitation_flags & INCAPACITATION_STUNNED) && stunned)
return 1
@@ -403,7 +403,7 @@
return
*/
-/mob/proc/set_respawn_timer(var/time)
+/mob/proc/set_respawn_timer(time)
// Try to figure out what time to use
// Special cases, can never respawn
@@ -628,7 +628,7 @@
if(pullin)
pullin.icon_state = "pull0"
-/mob/proc/start_pulling(var/atom/movable/AM)
+/mob/proc/start_pulling(atom/movable/AM)
if ( !AM || src==AM || !isturf(loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
return
@@ -720,7 +720,7 @@
pulled.inertia_dir = 0
// We have pulled something before, so we should be able to safely continue pulling it. This proc is only for portals!
-/mob/proc/continue_pulling(var/atom/movable/AM)
+/mob/proc/continue_pulling(atom/movable/AM)
if ( !AM || src==AM || !isturf(loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
return
@@ -803,7 +803,7 @@
return canmove
-/mob/proc/facedir(var/ndir)
+/mob/proc/facedir(ndir)
if(!canface() || (client && (client.moving || !checkMoveCooldown())))
DEBUG_INPUT("Denying Facedir for [src] (moving=[client?.moving])")
return 0
@@ -993,7 +993,7 @@
/mob/proc/flash_weak_pain()
flick("weak_pain",pain)
-/mob/proc/get_visible_implants(var/class = 0)
+/mob/proc/get_visible_implants(class = 0)
var/list/visible_implants = list()
for(var/obj/item/O in embedded)
if(O.w_class > class)
@@ -1108,7 +1108,7 @@
return 0
// Please always use this proc, never just set the var directly.
-/mob/proc/set_stat(var/new_stat)
+/mob/proc/set_stat(new_stat)
. = (stat != new_stat)
stat = new_stat
@@ -1125,7 +1125,7 @@
else
to_chat(src, span_filter_notice("You are now facing [dir2text(facing_dir)]."))
-/mob/proc/set_face_dir(var/newdir)
+/mob/proc/set_face_dir(newdir)
if(newdir == facing_dir)
facing_dir = null
else if(newdir)
@@ -1230,7 +1230,7 @@
return
// Set client view distance (size of client's screen). Returns TRUE if anything changed.
-/mob/proc/set_viewsize(var/new_view = world.view)
+/mob/proc/set_viewsize(new_view = world.view)
if (client && new_view != client.view)
client.view = new_view
client.attempt_auto_fit_viewport()
@@ -1273,7 +1273,7 @@
/mob/proc/is_muzzled()
return 0
-/mob/proc/amend_exploitable(var/obj/item/I)
+/mob/proc/amend_exploitable(obj/item/I)
if(istype(I))
exploit_addons |= I
var/exploitmsg = html_decode("\n" + "Has " + I.name + ".")
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index cc5128a881..1fe25876d2 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -156,7 +156,7 @@
adjust_position()
-/obj/item/grab/proc/handle_eye_mouth_covering(mob/living/carbon/target, mob/user, var/target_zone)
+/obj/item/grab/proc/handle_eye_mouth_covering(mob/living/carbon/target, mob/user, target_zone)
var/announce = (target_zone != last_hit_zone) //only display messages when switching between different target zones
last_hit_zone = target_zone
diff --git a/code/modules/mob/mob_grab_specials.dm b/code/modules/mob/mob_grab_specials.dm
index 9b4f366de8..ab85d0edc3 100644
--- a/code/modules/mob/mob_grab_specials.dm
+++ b/code/modules/mob/mob_grab_specials.dm
@@ -1,4 +1,4 @@
-/obj/item/grab/proc/inspect_organ(mob/living/carbon/human/H, mob/user, var/target_zone)
+/obj/item/grab/proc/inspect_organ(mob/living/carbon/human/H, mob/user, target_zone)
var/obj/item/organ/external/E = H.get_organ(target_zone)
@@ -114,7 +114,7 @@
to_chat(user, span_danger("[H] jolts when you let go of their [E.name], indicating appendicitis!"))
H.custom_pain("You feel pure agony as [src] pushes down on your [E.name]!", 200)
-/obj/item/grab/proc/jointlock(mob/living/carbon/human/target, mob/attacker, var/target_zone)
+/obj/item/grab/proc/jointlock(mob/living/carbon/human/target, mob/attacker, target_zone)
if(state < GRAB_AGGRESSIVE)
to_chat(attacker, span_warning("You require a better grab to do this."))
return
@@ -186,7 +186,7 @@
qdel(src)
return
-/obj/item/grab/proc/dislocate(mob/living/carbon/human/target, mob/living/attacker, var/target_zone)
+/obj/item/grab/proc/dislocate(mob/living/carbon/human/target, mob/living/attacker, target_zone)
if(state < GRAB_NECK)
to_chat(attacker, span_warning("You require a better grab to do this."))
return
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 13a8771ca1..f5c97736da 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -12,7 +12,7 @@
return 0
//returns the number of size categories between two mob_sizes, rounded. Positive means A is larger than B
-/proc/mob_size_difference(var/mob_size_A, var/mob_size_B)
+/proc/mob_size_difference(mob_size_A, mob_size_B)
return round(log(2, mob_size_A/mob_size_B), 1)
/mob/proc/can_wield_item(obj/item/W)
@@ -64,7 +64,7 @@
return 1
return 0
-/proc/hassensorlevel(A, var/level)
+/proc/hassensorlevel(A, level)
var/mob/living/carbon/human/H = A
if(istype(H) && istype(H.w_uniform, /obj/item/clothing/under))
var/obj/item/clothing/under/U = H.w_uniform
@@ -79,7 +79,7 @@
return SUIT_SENSOR_OFF
-/proc/is_admin(var/mob/user)
+/proc/is_admin(mob/user)
return check_rights_for(user.client, R_ADMIN|R_EVENT) != 0
/**
@@ -384,7 +384,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return 0
-/mob/proc/abiotic(var/full_body = 0)
+/mob/proc/abiotic(full_body = 0)
return 0
//converts intent-strings into numbers and back
@@ -439,7 +439,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return 1
return 0
-/proc/mobs_in_area(var/area/A)
+/proc/mobs_in_area(area/A)
var/list/mobs = list()
for(var/M in GLOB.mob_list)
if(get_area(M) == A)
@@ -449,7 +449,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
//Direct dead say used both by emote and say
//It is somewhat messy. I don't know what to do.
//I know you can't see the change, but I rewrote the name code. It is significantly less messy now
-/proc/say_dead_direct(var/message, var/mob/subject = null)
+/proc/say_dead_direct(message, mob/subject = null)
var/name
var/keyname
if(subject && subject.client)
@@ -502,7 +502,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
lname = span_name("[lname]") + " "
to_chat(M, span_deadsay("" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]"))
-/proc/say_dead_object(var/message, var/obj/subject = null)
+/proc/say_dead_object(message, obj/subject = null)
for(var/mob/M in GLOB.player_list)
if(M.client && ((!isnewplayer(M) && M.stat == DEAD) || (check_rights_for(M.client, R_HOLDER) && M.client?.prefs?.read_preference(/datum/preference/toggle/holder/show_staff_dsay))) && M.client?.prefs?.read_preference(/datum/preference/toggle/show_dsay))
var/follow
@@ -517,7 +517,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
to_chat(M, span_deadsay(create_text_tag("event_dead", "EVENT:", M.client) + " [lname][follow][message]"))
//Announces that a ghost has joined/left, mainly for use with wizards
-/proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "")
+/proc/announce_ghost_joinleave(O, joined_ghosts = 1, message = "")
var/client/C
//Accept any type, sort what we want here
if(istype(O, /mob))
@@ -556,12 +556,12 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
log_and_message_admins("[name] left ghost/observe mode. [message]") //ChompEDIT
-/mob/proc/switch_to_camera(var/obj/machinery/camera/C)
+/mob/proc/switch_to_camera(obj/machinery/camera/C)
if (!C.can_use() || stat || (get_dist(C, src) > 1 || !check_current_machine(src) || blinded || !canmove))
return 0
return 1
-/mob/living/silicon/ai/switch_to_camera(var/obj/machinery/camera/C)
+/mob/living/silicon/ai/switch_to_camera(obj/machinery/camera/C)
if(!C.can_use() || !is_in_chassis())
return 0
@@ -569,7 +569,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return 1
// Returns true if the mob has a client which has been active in the last given X minutes.
-/mob/proc/is_client_active(var/active = 1)
+/mob/proc/is_client_active(active = 1)
return client && client.inactivity < active MINUTES
/mob/proc/can_eat()
@@ -579,19 +579,19 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return 1
#define SAFE_PERP -50
-/mob/living/proc/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+/mob/living/proc/assess_perp(obj/access_obj, check_access, auth_weapons, check_records, check_arrest)
if(stat == DEAD)
return SAFE_PERP
return 0
-/mob/living/carbon/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+/mob/living/carbon/assess_perp(obj/access_obj, check_access, auth_weapons, check_records, check_arrest)
if(handcuffed)
return SAFE_PERP
return ..()
-/mob/living/carbon/human/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+/mob/living/carbon/human/assess_perp(obj/access_obj, check_access, auth_weapons, check_records, check_arrest)
var/threatcount = ..()
if(. == SAFE_PERP)
return SAFE_PERP
@@ -634,7 +634,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return threatcount
-/mob/living/simple_mob/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+/mob/living/simple_mob/assess_perp(obj/access_obj, check_access, auth_weapons, check_records, check_arrest)
var/threatcount = ..()
if(. == SAFE_PERP)
return SAFE_PERP
@@ -644,7 +644,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return threatcount
// Beepsky will (try to) only beat 'bad' slimes.
-/mob/living/simple_mob/slime/xenobio/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+/mob/living/simple_mob/slime/xenobio/assess_perp(obj/access_obj, check_access, auth_weapons, check_records, check_arrest)
var/threatcount = 0
if(stat == DEAD)
@@ -740,14 +740,14 @@ GLOBAL_DATUM_INIT(backplane, /image, generate_backplane())
return backplane
-/mob/proc/get_sound_env(var/spot, var/pressure_factor)
+/mob/proc/get_sound_env(spot, pressure_factor)
if (pressure_factor < 0.5)
return SPACE
else
var/area/A = get_area(spot)
return A.sound_env
-/mob/proc/position_hud_item(var/obj/item/item, var/slot)
+/mob/proc/position_hud_item(obj/item/item, slot)
if(!istype(hud_used) || !slot || !LAZYLEN(hud_used.slot_info))
return
@@ -772,7 +772,7 @@ GLOBAL_DATUM_INIT(backplane, /image, generate_backplane())
return TRUE
-/atom/proc/living_mobs_in_view(var/range = world.view, var/count_held = FALSE, var/needs_client = FALSE)
+/atom/proc/living_mobs_in_view(range = world.view, count_held = FALSE, needs_client = FALSE)
var/list/viewers = oviewers(src, range)
if(count_held)
viewers = viewers(src,range)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 54becc0100..5407eb01ce 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -1,4 +1,4 @@
-/mob/proc/setMoveCooldown(var/timeout)
+/mob/proc/setMoveCooldown(timeout)
next_move = max(world.time + timeout, next_move)
/mob/proc/checkMoveCooldown()
@@ -480,7 +480,7 @@
///Called by /client/Move()
///For moving in space
///Return 1 for movement 0 for none
-/mob/proc/Process_Spacemove(var/check_drift = 0)
+/mob/proc/Process_Spacemove(check_drift = 0)
if(is_incorporeal())
return
diff --git a/code/modules/mob/mob_planes.dm b/code/modules/mob/mob_planes.dm
index 3910a274d4..cd773c7855 100644
--- a/code/modules/mob/mob_planes.dm
+++ b/code/modules/mob/mob_planes.dm
@@ -57,7 +57,7 @@
QDEL_LIST_NULL(plane_masters) //Goodbye my children, be free
return ..()
-/datum/plane_holder/proc/set_vis(var/which = null, var/state = FALSE)
+/datum/plane_holder/proc/set_vis(which = null, state = FALSE)
ASSERT(which)
var/atom/movable/screen/plane_master/PM = plane_masters[which]
if(!PM)
@@ -73,21 +73,21 @@
else if(!state && (plane in my_mob.planes_visible))
LAZYREMOVE(my_mob.planes_visible, plane)
-/datum/plane_holder/proc/set_desired_alpha(var/which = null, var/new_alpha)
+/datum/plane_holder/proc/set_desired_alpha(which = null, new_alpha)
ASSERT(which)
var/atom/movable/screen/plane_master/PM = plane_masters[which]
if(!PM)
stack_trace("Tried to alter [which] in plane_holder on [my_mob]!")
PM.set_desired_alpha(new_alpha)
-/datum/plane_holder/proc/set_ao(var/which = null, var/enabled = FALSE)
+/datum/plane_holder/proc/set_ao(which = null, enabled = FALSE)
ASSERT(which)
var/atom/movable/screen/plane_master/PM = plane_masters[which]
if(!PM)
stack_trace("Tried to set_ao [which] in plane_holder on [my_mob]!")
PM.set_ambient_occlusion(enabled)
-/datum/plane_holder/proc/alter_values(var/which = null, var/list/values = null)
+/datum/plane_holder/proc/alter_values(which = null, list/values = null)
ASSERT(which)
var/atom/movable/screen/plane_master/PM = plane_masters[which]
if(!PM)
@@ -110,13 +110,13 @@
var/desired_alpha = 255 //What we go to when we're enabled
var/invis_toggle = FALSE
-/atom/movable/screen/plane_master/proc/set_desired_alpha(var/new_alpha)
+/atom/movable/screen/plane_master/proc/set_desired_alpha(new_alpha)
if(new_alpha != alpha && new_alpha > 0 && new_alpha <= 255)
desired_alpha = new_alpha
if(alpha) //If we're already visible, update it now.
alpha = new_alpha
-/atom/movable/screen/plane_master/proc/set_visibility(var/want = FALSE)
+/atom/movable/screen/plane_master/proc/set_visibility(want = FALSE)
//Invisibility-managed
if(invis_toggle)
if(want && invisibility)
@@ -132,12 +132,12 @@
alpha = 0
mouse_opacity = 0
-/atom/movable/screen/plane_master/proc/set_alpha(var/new_alpha = 255)
+/atom/movable/screen/plane_master/proc/set_alpha(new_alpha = 255)
if(new_alpha != alpha)
new_alpha = sanitize_integer(new_alpha, 0, 255, 255)
alpha = new_alpha
-/atom/movable/screen/plane_master/proc/set_ambient_occlusion(var/enabled = FALSE)
+/atom/movable/screen/plane_master/proc/set_ambient_occlusion(enabled = FALSE)
filters -= AMBIENT_OCCLUSION
if(enabled)
filters += AMBIENT_OCCLUSION
diff --git a/code/modules/mob/mob_planes_vr.dm b/code/modules/mob/mob_planes_vr.dm
index 1437cb8896..72ada85c5e 100644
--- a/code/modules/mob/mob_planes_vr.dm
+++ b/code/modules/mob/mob_planes_vr.dm
@@ -18,7 +18,7 @@
var/state = FALSE //Saves cost with the lists
var/mob/my_mob
-/atom/movable/screen/plane_master/augmented/Initialize(mapload, var/mob/M)
+/atom/movable/screen/plane_master/augmented/Initialize(mapload, mob/M)
. = ..()
my_mob = M
@@ -27,7 +27,7 @@
my_mob = null
. = ..()
-/atom/movable/screen/plane_master/augmented/set_visibility(var/want = FALSE)
+/atom/movable/screen/plane_master/augmented/set_visibility(want = FALSE)
. = ..()
state = want
apply()
diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm
index fe6a532066..02abc81eaf 100644
--- a/code/modules/mob/mob_transformation_simple.dm
+++ b/code/modules/mob/mob_transformation_simple.dm
@@ -2,7 +2,7 @@
//This proc is the most basic of the procs. All it does is make a new mob on the same tile and transfer over a few variables.
//Returns the new mob
//Note that this proc does NOT do MMI related stuff!
-/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies)
+/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = 0 as num, subspecies)
if(isnewplayer(src))
to_chat(src, span_red("cannot convert players who have not entered yet."))
diff --git a/code/modules/mob/motiontracker.dm b/code/modules/mob/motiontracker.dm
index c612330e46..c13987b71b 100644
--- a/code/modules/mob/motiontracker.dm
+++ b/code/modules/mob/motiontracker.dm
@@ -9,7 +9,7 @@
RegisterSignal(SSmotiontracker, COMSIG_MOVABLE_MOTIONTRACKER, PROC_REF(handle_motion_tracking))
add_verb(src,/mob/proc/toggle_motion_echo_vis)
-/mob/proc/motiontracker_unsubscribe(var/destroying = FALSE)
+/mob/proc/motiontracker_unsubscribe(destroying = FALSE)
if(is_motion_tracking)
is_motion_tracking = FALSE
UnregisterSignal(SSmotiontracker, COMSIG_MOVABLE_MOTIONTRACKER)
@@ -22,7 +22,7 @@
. = ..()
// For COMSIG_MOVABLE_MOTIONTRACKER
-/mob/proc/handle_motion_tracking(mob/source, var/datum/weakref/RW, var/turf/T)
+/mob/proc/handle_motion_tracking(mob/source, datum/weakref/RW, turf/T)
SIGNAL_HANDLER
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 2b05781831..069ff17888 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -370,7 +370,7 @@
character.client.init_verbs()
qdel(src) // Delete new_player mob
-/mob/new_player/proc/AnnounceCyborg(var/mob/living/character, var/rank, var/join_message, var/channel, var/zlevel)
+/mob/new_player/proc/AnnounceCyborg(mob/living/character, rank, join_message, channel, zlevel)
if (SSticker.current_state == GAME_STATE_PLAYING)
var/list/zlevels = zlevel ? using_map.get_map_levels(zlevel, TRUE, om_range = DEFAULT_OVERMAP_RANGE) : null
if(character.mind.role_alt_title)
@@ -383,7 +383,7 @@
late_choices_dialog = new(src)
late_choices_dialog.tgui_interact(src)
-/mob/new_player/proc/create_character(var/turf/T)
+/mob/new_player/proc/create_character(turf/T)
SHOULD_NOT_SLEEP(TRUE)
spawning = 1
close_spawn_windows()
@@ -496,13 +496,13 @@
return ready && ..()
// Prevents lobby players from seeing say, even with ghostears
-/mob/new_player/hear_say(var/list/message_pieces, var/verb = "says", var/italics = 0, var/mob/speaker = null)
+/mob/new_player/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null)
return
-/mob/new_player/hear_holopad_talk(list/message_pieces, var/verb = "says", var/mob/speaker = null)
+/mob/new_player/hear_holopad_talk(list/message_pieces, verb = "says", mob/speaker = null)
return
-/mob/new_player/hear_holopad_talk(list/message_pieces, var/verb = "says", var/mob/speaker = null)
+/mob/new_player/hear_holopad_talk(list/message_pieces, verb = "says", mob/speaker = null)
return
// Prevents lobby players from seeing emotes, even with ghosteyes
diff --git a/code/modules/mob/new_player/new_player_vr.dm b/code/modules/mob/new_player/new_player_vr.dm
index 7c393fcab4..02ee78f95b 100644
--- a/code/modules/mob/new_player/new_player_vr.dm
+++ b/code/modules/mob/new_player/new_player_vr.dm
@@ -1,4 +1,4 @@
-/mob/new_player/proc/spawn_checks_vr(var/rank)
+/mob/new_player/proc/spawn_checks_vr(rank)
var/pass = TRUE
var/datum/job/J = SSjob.get_job(rank)
diff --git a/code/modules/mob/new_player/news.dm b/code/modules/mob/new_player/news.dm
index 667bf41b02..eefa681c40 100644
--- a/code/modules/mob/new_player/news.dm
+++ b/code/modules/mob/new_player/news.dm
@@ -40,7 +40,7 @@
show_latest_news(GLOB.news_data.station_newspaper)
-/mob/new_player/proc/show_latest_news(var/datum/feed_channel/CHANNEL)
+/mob/new_player/proc/show_latest_news(datum/feed_channel/CHANNEL)
if(!GLOB.news_data) return
if(!GLOB.news_data.station_newspaper) return
@@ -67,7 +67,7 @@
client.seen_news = 1
-/proc/get_news_page(var/datum/feed_channel/CHANNEL, var/datum/feed_message/MESSAGE, current_page)
+/proc/get_news_page(datum/feed_channel/CHANNEL, datum/feed_message/MESSAGE, current_page)
var/dat
dat += get_newspaper_header(CHANNEL.channel_name, "Aggregated News", "#d4cec1")
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index 0a9027e8d2..daa0f1be29 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -77,7 +77,7 @@
-/mob/new_player/proc/poll_player(var/pollid = -1)
+/mob/new_player/proc/poll_player(pollid = -1)
if(pollid == -1) return
if(SSdbcore.IsConnected())
@@ -334,7 +334,7 @@
src << browse("[output]","window=playerpoll;size=500x250")
return
-/mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/multichoice = 0)
+/mob/new_player/proc/vote_on_poll(pollid = -1, optionid = -1, multichoice = 0)
if(pollid == -1 || optionid == -1)
return
@@ -405,7 +405,7 @@
usr << browse(null,"window=playerpoll")
-/mob/new_player/proc/log_text_poll_reply(var/pollid = -1, var/replytext = "")
+/mob/new_player/proc/log_text_poll_reply(pollid = -1, replytext = "")
if(pollid == -1 || replytext == "")
return
@@ -463,7 +463,7 @@
usr << browse(null,"window=playerpoll")
-/mob/new_player/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null)
+/mob/new_player/proc/vote_on_numval_poll(pollid = -1, optionid = -1, rating = null)
if(pollid == -1 || optionid == -1)
return
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index cfe1c624de..06af696e0c 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -35,7 +35,7 @@
-/datum/preferences/proc/randomize_hair_color(var/target = "hair")
+/datum/preferences/proc/randomize_hair_color(target = "hair")
if(prob (75) && target == "facial") // Chance to inherit hair color
update_preference_by_type(/datum/preference/color/human/facial_color, read_preference(/datum/preference/color/human/hair_color))
return
@@ -181,7 +181,7 @@
update_preference_by_type(/datum/preference/color/human/skin_color, rgb(red, green, blue))
-/datum/preferences/proc/dress_preview_mob(var/mob/living/carbon/human/mannequin)
+/datum/preferences/proc/dress_preview_mob(mob/living/carbon/human/mannequin)
if(!mannequin.dna) // Special handling for preview icons before SSAtoms has initailized.
mannequin.dna = new /datum/dna(null)
copy_to(mannequin, TRUE)
diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm
index 87de41b8c0..34689e234f 100644
--- a/code/modules/mob/new_player/sprite_accessories_taur.dm
+++ b/code/modules/mob/new_player/sprite_accessories_taur.dm
@@ -128,7 +128,7 @@
/mob/living/carbon/human/MouseDrop_T(mob/living/M, mob/living/user) //Prevention for forced relocation caused by can_buckle. Base proc has no other use.
return
-/mob/living/carbon/human/proc/taur_mount(var/mob/living/M in living_mobs(1))
+/mob/living/carbon/human/proc/taur_mount(mob/living/M in living_mobs(1))
set name = "Taur Mount/Dismount"
set category = "Abilities.General"
set desc = "Let people ride on you."
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index a3b7383b0c..bb501a6bff 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -1,8 +1,8 @@
-/mob/proc/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/proc/say(message, datum/language/speaking = null, whispering = 0)
return
// MUST BE NON-BLOCKING, signals can call this
-/mob/proc/direct_say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/proc/direct_say(message, datum/language/speaking = null, whispering = 0)
SHOULD_NOT_SLEEP(TRUE)
return
@@ -51,7 +51,7 @@
else
emote(message)
-/mob/proc/say_dead(var/message)
+/mob/proc/say_dead(message)
if(!client)
return // Clientless mobs shouldn't be trying to talk in deadchat.
@@ -68,7 +68,7 @@
say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], " + span_message("\"[message]\""), src)
-/mob/proc/say_understands(var/mob/other, var/datum/language/speaking = null)
+/mob/proc/say_understands(mob/other, datum/language/speaking = null)
if(stat == DEAD)
return TRUE
@@ -124,7 +124,7 @@
return FALSE
-/mob/proc/say_quote(var/message, var/datum/language/speaking = null)
+/mob/proc/say_quote(message, datum/language/speaking = null)
var/verb = "says"
var/ending = copytext(message, length(message))
@@ -145,7 +145,7 @@
return get_turf(src)
-/proc/say_test(var/text)
+/proc/say_test(text)
var/ending = copytext(text, length(text))
if(ending == "?")
return "1"
@@ -156,7 +156,7 @@
//parses the message mode code (e.g. :h, :w) from text, such as that supplied to say.
//returns the message mode string or null for no message mode.
//standard mode is the mode returned for the special ';' radio code.
-/mob/proc/parse_message_mode(var/message, var/standard_mode = "headset")
+/mob/proc/parse_message_mode(message, standard_mode = "headset")
if(length(message) >= 1 && copytext(message, 1, 2) == ";")
return standard_mode
@@ -275,7 +275,7 @@
/proc/message_to_multilingual(message, datum/language/speaking = null)
. = list(new /datum/multilingual_say_piece(speaking, message))
-/proc/multilingual_to_message(list/message_pieces, var/requires_machine_understands = FALSE, var/with_capitalization = FALSE)
+/proc/multilingual_to_message(list/message_pieces, requires_machine_understands = FALSE, with_capitalization = FALSE)
. = ""
for(var/datum/multilingual_say_piece/S in message_pieces)
var/message_to_append = S.message
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index a8f6799ee5..2b84ac4004 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -39,7 +39,7 @@
else
emote_vr(message)
-/mob/proc/custom_emote_vr(var/m_type=1,var/message = null,var/mode_selection = FALSE) //This would normally go in emote.dm
+/mob/proc/custom_emote_vr(m_type=1,message = null,mode_selection = FALSE) //This would normally go in emote.dm
if(stat || !use_me && usr == src)
to_chat(src, "You are unable to emote.")
return
@@ -221,7 +221,7 @@
spawn(0)
O.see_emote(src, message, 2)
-/mob/proc/emote_vr(var/act, var/type, var/message, var/mode_selection) //This would normally go in say.dm
+/mob/proc/emote_vr(act, type, message, mode_selection) //This would normally go in say.dm
if(act == "me")
return custom_emote_vr(type, message, mode_selection)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 620ce48d64..4550652a28 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -39,11 +39,11 @@
return src
-/mob/new_player/AIize(var/move = TRUE)
+/mob/new_player/AIize(move = TRUE)
spawning = 1
return ..()
-/mob/living/carbon/human/AIize(var/move = TRUE) // 'move' argument needs defining here too because BYOND is dumb
+/mob/living/carbon/human/AIize(move = TRUE) // 'move' argument needs defining here too because BYOND is dumb
if (transforming)
return
for(var/t in organs)
@@ -56,7 +56,7 @@
return ..(move)
-/mob/living/carbon/AIize(var/move = TRUE)
+/mob/living/carbon/AIize(move = TRUE)
if (transforming)
return
for(var/obj/item/W in src)
@@ -67,7 +67,7 @@
invisibility = INVISIBILITY_ABSTRACT
return ..()
-/mob/proc/AIize(var/move = TRUE)
+/mob/proc/AIize(move = TRUE)
if(client)
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs
@@ -297,7 +297,7 @@
* This proc is here to force coders to manually place their mob in this list, hopefully tested.
* This also gives a place to explain -why- players shouldnt be turn into certain mobs and hopefully someone can fix them.
*/
-/mob/proc/safe_animal(var/MP)
+/mob/proc/safe_animal(MP)
//Bad mobs! - Remember to add a comment explaining what's wrong with the mob
if(!MP)
diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm
index 1435612a2b..c627063c07 100644
--- a/code/modules/mob/update_icons.dm
+++ b/code/modules/mob/update_icons.dm
@@ -28,7 +28,7 @@
/mob/proc/update_inv_active_hand()
return
-/mob/living/update_inv_active_hand(var/A)
+/mob/living/update_inv_active_hand(A)
if(hand)
update_inv_l_hand(A)
else
diff --git a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm
index 2e26b3f510..37b4fd8d1c 100644
--- a/code/modules/modular_computers/NTNet/NTNRC/conversation.dm
+++ b/code/modules/modular_computers/NTNet/NTNRC/conversation.dm
@@ -15,12 +15,12 @@ GLOBAL_VAR_INIT(ntnrc_uid, 0)
GLOB.ntnet_global.chat_channels.Add(src)
..()
-/datum/ntnet_conversation/proc/add_message(var/message, var/username)
+/datum/ntnet_conversation/proc/add_message(message, username)
message = "[stationtime2text()] [username]: [message]"
messages.Add(message)
trim_message_list()
-/datum/ntnet_conversation/proc/add_status_message(var/message)
+/datum/ntnet_conversation/proc/add_status_message(message)
messages.Add("[stationtime2text()] -!- [message]")
trim_message_list()
@@ -29,7 +29,7 @@ GLOBAL_VAR_INIT(ntnrc_uid, 0)
return
messages.Cut(1, (messages.len-49))
-/datum/ntnet_conversation/proc/add_client(var/datum/computer_file/program/chatclient/C)
+/datum/ntnet_conversation/proc/add_client(datum/computer_file/program/chatclient/C)
if(!istype(C))
return
clients.Add(C)
@@ -38,7 +38,7 @@ GLOBAL_VAR_INIT(ntnrc_uid, 0)
if(!operator)
changeop(C)
-/datum/ntnet_conversation/proc/remove_client(var/datum/computer_file/program/chatclient/C)
+/datum/ntnet_conversation/proc/remove_client(datum/computer_file/program/chatclient/C)
if(!istype(C) || !(C in clients))
return
clients.Remove(C)
@@ -52,12 +52,12 @@ GLOBAL_VAR_INIT(ntnrc_uid, 0)
changeop(newop)
-/datum/ntnet_conversation/proc/changeop(var/datum/computer_file/program/chatclient/newop)
+/datum/ntnet_conversation/proc/changeop(datum/computer_file/program/chatclient/newop)
if(istype(newop))
operator = newop
add_status_message("Channel operator status transferred to [newop.username].")
-/datum/ntnet_conversation/proc/change_title(var/newtitle, var/datum/computer_file/program/chatclient/client)
+/datum/ntnet_conversation/proc/change_title(newtitle, datum/computer_file/program/chatclient/client)
if(operator != client)
return 0 // Not Authorised
diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm
index 8cd4ecf91b..4b9b46c9be 100644
--- a/code/modules/modular_computers/NTNet/NTNet.dm
+++ b/code/modules/modular_computers/NTNet/NTNet.dm
@@ -49,12 +49,12 @@
build_emails_list()
add_log("NTNet logging system activated.")
-/datum/ntnet/proc/add_log_with_ids_check(var/log_string, var/obj/item/computer_hardware/network_card/source = null)
+/datum/ntnet/proc/add_log_with_ids_check(log_string, obj/item/computer_hardware/network_card/source = null)
if(intrusion_detection_enabled)
add_log(log_string, source)
// Simplified logging: Adds a log. log_string is mandatory parameter, source is optional.
-/datum/ntnet/proc/add_log(var/log_string, var/obj/item/computer_hardware/network_card/source = null)
+/datum/ntnet/proc/add_log(log_string, obj/item/computer_hardware/network_card/source = null)
var/log_text = "[stationtime2text()] - "
if(source)
log_text += "[source.get_network_tag()] - "
@@ -88,7 +88,7 @@
return FALSE
// Checks whether NTNet operates. If parameter is passed checks whether specific function is enabled.
-/datum/ntnet/proc/check_function(var/specific_action = 0)
+/datum/ntnet/proc/check_function(specific_action = 0)
if(!relays || !relays.len) // No relays found. NTNet is down
return 0
@@ -142,7 +142,7 @@
email_accounts += new F(TRUE)
// Attempts to find a downloadable file according to filename var
-/datum/ntnet/proc/find_ntnet_file_by_name(var/filename)
+/datum/ntnet/proc/find_ntnet_file_by_name(filename)
for(var/datum/computer_file/program/P in available_station_software)
if(filename == P.filename)
return P
@@ -166,7 +166,7 @@
add_log("-!- LOGS DELETED BY SYSTEM OPERATOR -!-")
// Updates maximal amount of stored logs. Use this instead of setting the number, it performs required checks.
-/datum/ntnet/proc/update_max_log_count(var/lognumber)
+/datum/ntnet/proc/update_max_log_count(lognumber)
if(!lognumber)
return 0
// Trim the value if necessary
@@ -174,7 +174,7 @@
setting_maxlogcount = lognumber
add_log("Configuration Updated. Now keeping [setting_maxlogcount] logs in system memory.")
-/datum/ntnet/proc/toggle_function(var/function)
+/datum/ntnet/proc/toggle_function(function)
if(!function)
return
function = text2num(function)
@@ -192,7 +192,7 @@
setting_systemcontrol = !setting_systemcontrol
add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of station's systems.")
-/datum/ntnet/proc/does_email_exist(var/login)
+/datum/ntnet/proc/does_email_exist(login)
for(var/datum/computer_file/data/email_account/A in GLOB.ntnet_global.email_accounts)
if(A.login == login)
return 1
diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm
index 4371fdbc6d..a707f5b313 100644
--- a/code/modules/modular_computers/NTNet/NTNet_relay.dm
+++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm
@@ -79,7 +79,7 @@
data["dos_crashed"] = dos_failure
return data
-/obj/machinery/ntnet_relay/attack_hand(var/mob/living/user)
+/obj/machinery/ntnet_relay/attack_hand(mob/living/user)
tgui_interact(user)
/obj/machinery/ntnet_relay/tgui_act(action, params)
@@ -138,7 +138,7 @@
QDEL_NULL(soundloop)
. = ..()
-/obj/machinery/ntnet_relay/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/ntnet_relay/attackby(obj/item/W as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, W))
return
if(default_deconstruction_crowbar(user, W))
diff --git a/code/modules/modular_computers/NTNet/emails/email_account.dm b/code/modules/modular_computers/NTNet/emails/email_account.dm
index 36daa64add..8d3be1798f 100644
--- a/code/modules/modular_computers/NTNet/emails/email_account.dm
+++ b/code/modules/modular_computers/NTNet/emails/email_account.dm
@@ -36,7 +36,7 @@
/datum/computer_file/data/email_account/proc/all_emails()
return (inbox | spam | deleted)
-/datum/computer_file/data/email_account/proc/send_mail(var/recipient_address, var/datum/computer_file/data/email_message/message, var/relayed = 0)
+/datum/computer_file/data/email_account/proc/send_mail(recipient_address, datum/computer_file/data/email_message/message, relayed = 0)
var/datum/computer_file/data/email_account/recipient
for(var/datum/computer_file/data/email_account/account in GLOB.ntnet_global.email_accounts)
if(account.login == recipient_address)
@@ -52,7 +52,7 @@
GLOB.ntnet_global.add_log_with_ids_check("EMAIL LOG: [login] -> [recipient.login] title: [message.title].")
return 1
-/datum/computer_file/data/email_account/proc/receive_mail(var/datum/computer_file/data/email_message/received_message, var/relayed)
+/datum/computer_file/data/email_account/proc/receive_mail(datum/computer_file/data/email_message/received_message, relayed)
received_message.set_timestamp()
if(!GLOB.ntnet_global.intrusion_detection_enabled)
inbox.Add(received_message)
@@ -77,7 +77,7 @@
/datum/computer_file/data/email_account/service/broadcaster
login = EMAIL_BROADCAST
-/datum/computer_file/data/email_account/service/broadcaster/receive_mail(var/datum/computer_file/data/email_message/received_message, var/relayed)
+/datum/computer_file/data/email_account/service/broadcaster/receive_mail(datum/computer_file/data/email_message/received_message, relayed)
if(suspended || !istype(received_message) || relayed)
return FALSE
// Possibly exploitable for user spamming so keep admins informed.
@@ -98,7 +98,7 @@
/datum/computer_file/data/email_account/service/sysadmin
login = EMAIL_SYSADMIN
-/datum/computer_file/data/email_account/service/broadcaster/receive_mail(var/datum/computer_file/data/email_message/received_message, var/relayed)
+/datum/computer_file/data/email_account/service/broadcaster/receive_mail(datum/computer_file/data/email_message/received_message, relayed)
if(!istype(received_message) || relayed)
return 0
// Possibly exploitable for user spamming so keep admins informed.
diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm
index 3709761dec..bb67b79950 100644
--- a/code/modules/modular_computers/computers/modular_computer/core.dm
+++ b/code/modules/modular_computers/computers/modular_computer/core.dm
@@ -61,7 +61,7 @@
paired_uavs.Cut()
return ..()
-/obj/item/modular_computer/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/modular_computer/emag_act(remaining_charges, mob/user)
if(computer_emagged)
to_chat(user, "\The [src] was already emagged.")
return //NO_EMAG_ACT
@@ -102,7 +102,7 @@
return add_overlay(.)
-/obj/item/modular_computer/proc/turn_on(var/mob/user)
+/obj/item/modular_computer/proc/turn_on(mob/user)
if(bsod)
return
if(tesla_link)
@@ -129,7 +129,7 @@
to_chat(user, "You press the power button but \the [src] does not respond")
// Relays kill program request to currently active program. Use this to quit current program.
-/obj/item/modular_computer/proc/kill_program(var/forced = 0)
+/obj/item/modular_computer/proc/kill_program(forced = 0)
if(active_program)
active_program.kill_program(forced)
active_program = null
@@ -137,7 +137,7 @@
addtimer(CALLBACK(src, PROC_REF(delayed_reopen_ui), user), 1, TIMER_DELETE_ME)
update_icon()
-/obj/item/modular_computer/proc/delayed_reopen_ui(var/mob/user)
+/obj/item/modular_computer/proc/delayed_reopen_ui(mob/user)
// Re-open the UI on this computer. It should show the main screen now.
// Expected from kill_program()
PRIVATE_PROC(TRUE)
@@ -147,18 +147,18 @@
tgui_interact(user)
// Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on)
-/obj/item/modular_computer/proc/get_ntnet_status(var/specific_action = 0)
+/obj/item/modular_computer/proc/get_ntnet_status(specific_action = 0)
if(network_card)
return network_card.get_signal(specific_action)
else
return 0
-/obj/item/modular_computer/proc/add_log(var/text)
+/obj/item/modular_computer/proc/add_log(text)
if(!get_ntnet_status())
return 0
return GLOB.ntnet_global.add_log(text, network_card)
-/obj/item/modular_computer/proc/shutdown_computer(var/loud = 1)
+/obj/item/modular_computer/proc/shutdown_computer(loud = 1)
kill_program(1)
for(var/datum/computer_file/program/P in idle_threads)
P.kill_program(1)
@@ -168,7 +168,7 @@
enabled = 0
update_icon()
-/obj/item/modular_computer/proc/enable_computer(var/mob/user = null)
+/obj/item/modular_computer/proc/enable_computer(mob/user = null)
enabled = 1
update_icon()
@@ -285,7 +285,7 @@
else
autorun.stored_data = program
-/obj/item/modular_computer/proc/find_file_by_uid(var/uid)
+/obj/item/modular_computer/proc/find_file_by_uid(uid)
if(hard_drive)
. = hard_drive.find_file_by_uid(uid)
if(portable_drive && !.)
diff --git a/code/modules/modular_computers/computers/modular_computer/damage.dm b/code/modules/modular_computers/computers/modular_computer/damage.dm
index e608006718..cc3542dc2a 100644
--- a/code/modules/modular_computers/computers/modular_computer/damage.dm
+++ b/code/modules/modular_computers/computers/modular_computer/damage.dm
@@ -1,4 +1,4 @@
-/obj/item/modular_computer/examine(var/mob/user)
+/obj/item/modular_computer/examine(mob/user)
. = ..()
if(damage > broken_damage)
. += span_danger("It is heavily damaged!")
@@ -16,7 +16,7 @@
H.take_damage(rand(10,30))
qdel()
-/obj/item/modular_computer/take_damage(var/amount, var/component_probability, var/damage_casing = 1, var/randomize = 1)
+/obj/item/modular_computer/take_damage(amount, component_probability, damage_casing = 1, randomize = 1)
if(randomize)
// 75%-125%, rand() works with integers, apparently.
amount *= (rand(75, 125) / 100.0)
@@ -35,7 +35,7 @@
// Stronger explosions cause serious damage to internal components
// Minor explosions are mostly mitigitated by casing.
-/obj/item/modular_computer/ex_act(var/severity)
+/obj/item/modular_computer/ex_act(severity)
take_damage(rand(100,200) / severity, 30 / severity)
// EMPs are similar to explosions, but don't cause physical damage to the casing. Instead they screw up the components
@@ -48,7 +48,7 @@
// "Stun" weapons can cause minor damage to components (short-circuits?)
// "Burn" damage is equally strong against internal components and exterior casing
// "Brute" damage mostly damages the casing.
-/obj/item/modular_computer/bullet_act(var/obj/item/projectile/Proj)
+/obj/item/modular_computer/bullet_act(obj/item/projectile/Proj)
switch(Proj.damage_type)
if(BRUTE)
take_damage(Proj.damage, Proj.damage / 2)
diff --git a/code/modules/modular_computers/computers/modular_computer/hardware.dm b/code/modules/modular_computers/computers/modular_computer/hardware.dm
index 28510f97c1..5fdfc696ca 100644
--- a/code/modules/modular_computers/computers/modular_computer/hardware.dm
+++ b/code/modules/modular_computers/computers/modular_computer/hardware.dm
@@ -1,5 +1,5 @@
// Attempts to install the hardware into apropriate slot.
-/obj/item/modular_computer/proc/try_install_component(var/mob/living/user, var/obj/item/computer_hardware/H, var/found = 0)
+/obj/item/modular_computer/proc/try_install_component(mob/living/user, obj/item/computer_hardware/H, found = 0)
// "USB" flash drive.
if(istype(H, /obj/item/computer_hardware/hard_drive/portable))
if(portable_drive)
@@ -57,7 +57,7 @@
update_verbs()
// Uninstalls component. Found and Critical vars may be passed by parent types, if they have additional hardware.
-/obj/item/modular_computer/proc/uninstall_component(var/mob/living/user, var/obj/item/computer_hardware/H, var/found = 0, var/critical = 0)
+/obj/item/modular_computer/proc/uninstall_component(mob/living/user, obj/item/computer_hardware/H, found = 0, critical = 0)
if(portable_drive == H)
portable_drive = null
found = 1
@@ -98,7 +98,7 @@
// Checks all hardware pieces to determine if name matches, if yes, returns the hardware piece, otherwise returns null
-/obj/item/modular_computer/proc/find_hardware_by_name(var/name)
+/obj/item/modular_computer/proc/find_hardware_by_name(name)
if(portable_drive && (portable_drive.name == name))
return portable_drive
if(hard_drive && (hard_drive.name == name))
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index fbd9114425..c3ca55c7c5 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -97,7 +97,7 @@
uninstall_component(user, portable_drive)
update_uis()
-/obj/item/modular_computer/attack_ghost(var/mob/observer/dead/user)
+/obj/item/modular_computer/attack_ghost(mob/observer/dead/user)
if(enabled)
tgui_interact(user)
else if(check_rights_for(user.client, R_ADMIN|R_EVENT|R_DEBUG))
@@ -105,10 +105,10 @@
if(response == "Yes")
turn_on(user)
-/obj/item/modular_computer/attack_ai(var/mob/user)
+/obj/item/modular_computer/attack_ai(mob/user)
return attack_self(user)
-/obj/item/modular_computer/attack_hand(var/mob/user)
+/obj/item/modular_computer/attack_hand(mob/user)
if(anchored || ispAI(user))
return attack_self(user)
return ..()
@@ -134,7 +134,7 @@
return
turn_on(user)
-/obj/item/modular_computer/attackby(var/obj/item/W, var/mob/user)
+/obj/item/modular_computer/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/card/id)) // ID Card, try to insert it.
var/obj/item/card/id/I = W
if(!card_slot)
diff --git a/code/modules/modular_computers/computers/modular_computer/power.dm b/code/modules/modular_computers/computers/modular_computer/power.dm
index 29ea856d0d..7c71b2007c 100644
--- a/code/modules/modular_computers/computers/modular_computer/power.dm
+++ b/code/modules/modular_computers/computers/modular_computer/power.dm
@@ -1,4 +1,4 @@
-/obj/item/modular_computer/proc/power_failure(var/malfunction = 0)
+/obj/item/modular_computer/proc/power_failure(malfunction = 0)
if(enabled) // Shut down the computer
visible_message(span_danger("\The [src]'s screen flickers briefly and then goes dark."))
if(active_program)
@@ -8,7 +8,7 @@
shutdown_computer(0)
// Tries to use power from battery. Passing 0 as parameter results in this proc returning whether battery is functional or not.
-/obj/item/modular_computer/proc/battery_power(var/power_usage = 0)
+/obj/item/modular_computer/proc/battery_power(power_usage = 0)
apc_powered = FALSE
if(!battery_module || !battery_module.check_functionality() || battery_module.battery.charge <= 0)
return FALSE
@@ -23,7 +23,7 @@
..()
// Tries to use power from APC, if present.
-/obj/item/modular_computer/proc/apc_power(var/power_usage = 0)
+/obj/item/modular_computer/proc/apc_power(power_usage = 0)
apc_powered = TRUE
// Tesla link was originally limited to machinery only, but this probably works too, and the benefit of being able to power all devices from an APC outweights
// the possible minor performance loss.
diff --git a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
index 8b5d6a0dce..53d4e7aeed 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_telescreen.dm
@@ -19,7 +19,7 @@
broken_damage = 150
w_class = ITEMSIZE_HUGE
-/obj/item/modular_computer/telescreen/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/modular_computer/telescreen/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_CROWBAR))
if(anchored)
shutdown_computer()
diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm
index 285799dd27..de2ac46b04 100644
--- a/code/modules/modular_computers/file_system/computer_file.dm
+++ b/code/modules/modular_computers/file_system/computer_file.dm
@@ -43,7 +43,7 @@ GLOBAL_VAR_INIT(file_uid, 0)
return ..()
// Returns independent copy of this file.
-/datum/computer_file/proc/clone(var/rename = 0)
+/datum/computer_file/proc/clone(rename = 0)
var/datum/computer_file/temp = new type
temp.unsendable = unsendable
temp.undeletable = undeletable
diff --git a/code/modules/modular_computers/file_system/news_article.dm b/code/modules/modular_computers/file_system/news_article.dm
index 50aa1879bb..e878868a2a 100644
--- a/code/modules/modular_computers/file_system/news_article.dm
+++ b/code/modules/modular_computers/file_system/news_article.dm
@@ -9,7 +9,7 @@
var/archived // Set to 1 for older stuff
var/cover //filename of cover.
-/datum/computer_file/data/news_article/New(var/load_from_file = 0)
+/datum/computer_file/data/news_article/New(load_from_file = 0)
..()
if(server_file_path && load_from_file)
stored_data = file2text(server_file_path)
diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm
index dc06e82279..5800a1c307 100644
--- a/code/modules/modular_computers/file_system/program.dm
+++ b/code/modules/modular_computers/file_system/program.dm
@@ -38,7 +38,7 @@
/// Name of the tgui interface
var/tgui_id
-/datum/computer_file/program/New(var/obj/item/modular_computer/comp = null)
+/datum/computer_file/program/New(obj/item/modular_computer/comp = null)
..()
if(comp && istype(comp))
computer = comp
@@ -66,19 +66,19 @@
computer.update_icon()
// Attempts to create a log in global ntnet datum. Returns 1 on success, 0 on fail.
-/datum/computer_file/program/proc/generate_network_log(var/text)
+/datum/computer_file/program/proc/generate_network_log(text)
if(computer)
return computer.add_log(text)
return 0
-/datum/computer_file/program/proc/is_supported_by_hardware(var/hardware_flag = 0, var/loud = 0, var/mob/user = null)
+/datum/computer_file/program/proc/is_supported_by_hardware(hardware_flag = 0, loud = 0, mob/user = null)
if(!(hardware_flag & usage_flags))
if(loud && computer && user)
to_chat(user, span_warning("\The [computer] flashes: \"Hardware Error - Incompatible software\"."))
return 0
return 1
-/datum/computer_file/program/proc/get_signal(var/specific_action = 0)
+/datum/computer_file/program/proc/get_signal(specific_action = 0)
if(computer)
return computer.get_ntnet_status(specific_action)
return 0
@@ -102,7 +102,7 @@
// User has to wear their ID or have it inhand for ID Scan to work.
// Can also be called manually, with optional parameter being access_to_check to scan the user's ID.
// explicit_card can be passed by callers that already have a card reference (e.g. the laptop's inserted card).
-/datum/computer_file/program/proc/can_run(var/mob/living/user, var/loud = 0, var/access_to_check, var/obj/item/card/id/explicit_card)
+/datum/computer_file/program/proc/can_run(mob/living/user, loud = 0, access_to_check, obj/item/card/id/explicit_card)
// Defaults to required_access
if(!access_to_check)
access_to_check = required_access
@@ -138,7 +138,7 @@
// This is performed on program startup. May be overriden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure.
// When implementing new program based device, use this to run the program.
-/datum/computer_file/program/proc/run_program(var/mob/living/user)
+/datum/computer_file/program/proc/run_program(mob/living/user)
if(can_run(user, 1) || !requires_access_to_run)
computer.active_program = src
if(tguimodule_path)
@@ -154,7 +154,7 @@
return 0
// Use this proc to kill the program. Designed to be implemented by each program if it requires on-quit logic, such as the NTNRC client.
-/datum/computer_file/program/proc/kill_program(var/forced = 0)
+/datum/computer_file/program/proc/kill_program(forced = 0)
program_state = PROGRAM_STATE_KILLED
if(network_destination)
generate_network_log("Connection to [network_destination] closed.")
diff --git a/code/modules/modular_computers/file_system/program_events.dm b/code/modules/modular_computers/file_system/program_events.dm
index 46089cc0a2..f5b3f4e006 100644
--- a/code/modules/modular_computers/file_system/program_events.dm
+++ b/code/modules/modular_computers/file_system/program_events.dm
@@ -2,15 +2,15 @@
// Always include a parent call when overriding an event.
// Called when the ID card is removed from computer. ID is removed AFTER this proc.
-/datum/computer_file/program/proc/event_idremoved(var/background)
+/datum/computer_file/program/proc/event_idremoved(background)
return
// Called when the computer fails due to power loss. Override when program wants to specifically react to power loss.
-/datum/computer_file/program/proc/event_powerfailure(var/background)
+/datum/computer_file/program/proc/event_powerfailure(background)
kill_program(1)
// Called when the network connectivity fails. Computer does necessary checks and only calls this when requires_ntnet_feature and similar variables are not met.
-/datum/computer_file/program/proc/event_networkfailure(var/background)
+/datum/computer_file/program/proc/event_networkfailure(background)
kill_program(1)
if(background)
computer.visible_message(span_warning("\The [computer]'s screen displays an error: \"Network connectivity lost - process [filename].[filetype] (PID [rand(100,999)]) terminated.\""))
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
index eb699eb5d6..07be981770 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
@@ -18,7 +18,7 @@
var/datum/access/target_access = null
var/list/restricted_access_codes = list(ACCESS_CHANGE_IDS, ACCESS_NETWORK) // access codes that are not hackable due to balance reasons
-/datum/computer_file/program/access_decrypter/kill_program(var/forced)
+/datum/computer_file/program/access_decrypter/kill_program(forced)
reset()
..(forced)
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
index d13c56f95f..59c37d7bf2 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
@@ -32,7 +32,7 @@
target = null
error = "Connection to destination relay lost."
-/datum/computer_file/program/ntnet_dos/kill_program(var/forced)
+/datum/computer_file/program/ntnet_dos/kill_program(forced)
if(target)
target.dos_sources.Remove(src)
target = null
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
index bc2f77547f..02c95e6f00 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
@@ -12,7 +12,7 @@
tgui_id = "NtosRevelation"
var/armed = 0
-/datum/computer_file/program/revelation/run_program(var/mob/living/user)
+/datum/computer_file/program/revelation/run_program(mob/living/user)
. = ..(user)
if(armed)
activate()
diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm
index a1c2d19237..59610256dd 100644
--- a/code/modules/modular_computers/file_system/programs/command/comm.dm
+++ b/code/modules/modular_computers/file_system/programs/command/comm.dm
@@ -14,7 +14,7 @@
category = PROG_COMMAND
var/datum/comm_message_listener/message_core
-/datum/computer_file/program/comm/New(var/obj/item/modular_computer/comp = null)
+/datum/computer_file/program/comm/New(obj/item/modular_computer/comp = null)
..()
message_core = new
@@ -32,7 +32,7 @@ General message handling stuff
GLOB.last_message_id = GLOB.last_message_id + 1
return GLOB.last_message_id
-/proc/post_comm_message(var/message_title, var/message_text)
+/proc/post_comm_message(message_title, message_text)
var/list/message = list()
message["id"] = get_comm_message_id()
message["title"] = message_title
@@ -49,8 +49,8 @@ General message handling stuff
messages = list()
GLOB.comm_message_listeners.Add(src)
-/datum/comm_message_listener/proc/Add(var/list/message)
+/datum/comm_message_listener/proc/Add(list/message)
messages[++messages.len] = message
-/datum/comm_message_listener/proc/Remove(var/list/message)
+/datum/comm_message_listener/proc/Remove(list/message)
messages -= list(message)
diff --git a/code/modules/modular_computers/file_system/programs/generic/camera.dm b/code/modules/modular_computers/file_system/programs/generic/camera.dm
index 2a0ee74dad..0c4ab64f62 100644
--- a/code/modules/modular_computers/file_system/programs/generic/camera.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm
@@ -1,5 +1,5 @@
// Returns which access is relevant to passed network. Used by the program.
-/proc/get_camera_access(var/network)
+/proc/get_camera_access(network)
if(!network)
return 0
. = using_map.get_network_access(network)
diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm
index d8398c7577..fbe76ff367 100644
--- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm
@@ -33,7 +33,7 @@
..()
abort_file_download()
-/datum/computer_file/program/ntnetdownload/proc/begin_file_download(var/filename)
+/datum/computer_file/program/ntnetdownload/proc/begin_file_download(filename)
if(downloaded_file)
return 0
@@ -56,7 +56,7 @@
downloaded_file = PRG.clone()
-/datum/computer_file/program/ntnetdownload/proc/check_file_download(var/filename)
+/datum/computer_file/program/ntnetdownload/proc/check_file_download(filename)
//returns 1 if file can be downloaded, returns 0 if download prohibited
var/datum/computer_file/program/PRG = GLOB.ntnet_global.find_ntnet_file_by_name(filename)
diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm
index 591bf0ec21..52bfaf191e 100644
--- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm
@@ -47,7 +47,7 @@ GLOBAL_VAR_INIT(nttransfer_uid, 0)
if(!remote)
crash_download("Connection to remote server lost")
-/datum/computer_file/program/nttransfer/kill_program(var/forced = 0)
+/datum/computer_file/program/nttransfer/kill_program(forced = 0)
if(downloaded_file) // Client mode, clean up variables for next use
finalize_download()
@@ -64,7 +64,7 @@ GLOBAL_VAR_INIT(nttransfer_uid, 0)
finalize_download()
// Crashes the download and displays specific error message
-/datum/computer_file/program/nttransfer/proc/crash_download(var/message)
+/datum/computer_file/program/nttransfer/proc/crash_download(message)
error = message ? message : "An unknown error has occurred during download"
finalize_download()
diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm
index 976136fa25..5103fb2ec3 100644
--- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm
@@ -18,7 +18,7 @@
usage_flags = PROGRAM_ALL
category = PROG_OFFICE
-/datum/computer_file/program/wordprocessor/proc/get_file(var/filename)
+/datum/computer_file/program/wordprocessor/proc/get_file(filename)
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return
@@ -27,14 +27,14 @@
return
return F
-/datum/computer_file/program/wordprocessor/proc/open_file(var/filename)
+/datum/computer_file/program/wordprocessor/proc/open_file(filename)
var/datum/computer_file/data/F = get_file(filename)
if(F)
open_file = F.filename
loaded_data = F.stored_data
return TRUE
-/datum/computer_file/program/wordprocessor/proc/save_file(var/filename)
+/datum/computer_file/program/wordprocessor/proc/save_file(filename)
var/datum/computer_file/data/F = get_file(filename)
if(!F) //try to make one if it doesn't exist
F = create_file(filename, loaded_data)
@@ -52,7 +52,7 @@
is_edited = 0
return TRUE
-/datum/computer_file/program/wordprocessor/proc/create_file(var/newname, var/data = "")
+/datum/computer_file/program/wordprocessor/proc/create_file(newname, data = "")
if(!newname)
return
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm
index a51d0be7b4..81a5082e23 100644
--- a/code/modules/modular_computers/hardware/_hardware.dm
+++ b/code/modules/modular_computers/hardware/_hardware.dm
@@ -56,7 +56,7 @@
/// Returns a list of lines containing diagnostic information for display.
-/obj/item/computer_hardware/proc/diagnostics(var/mob/user)
+/obj/item/computer_hardware/proc/diagnostics(mob/user)
to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")
/obj/item/computer_hardware/Initialize(mapload)
@@ -84,7 +84,7 @@
// Good to go.
return TRUE
-/obj/item/computer_hardware/examine(var/mob/user)
+/obj/item/computer_hardware/examine(mob/user)
. = ..()
if(damage > damage_failure)
. += span_danger("It seems to be severely damaged!")
@@ -94,6 +94,6 @@
. += "It seems to be slightly damaged."
/// Damages the component. Contains necessary checks. Negative damage "heals" the component.
-/obj/item/computer_hardware/take_damage(var/amount)
+/obj/item/computer_hardware/take_damage(amount)
damage += round(amount) // We want nice rounded numbers here.
damage = between(0, damage, max_damage) // Clamp the value.
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index a34bb173c2..1016438627 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -53,7 +53,7 @@
/obj/item/computer_hardware/battery_module/lambda/Initialize(mapload)
. = ..(mapload, /obj/item/cell/infinite)
-/obj/item/computer_hardware/battery_module/diagnostics(var/mob/user)
+/obj/item/computer_hardware/battery_module/diagnostics(mob/user)
..()
to_chat(user, "Internal battery charge: [battery.charge]/[battery.maxcharge] CU")
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index 935fdfa6a3..90abe3064f 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -53,7 +53,7 @@
icon_state = "hdd_micro"
hardware_size = 1
-/obj/item/computer_hardware/hard_drive/diagnostics(var/mob/user)
+/obj/item/computer_hardware/hard_drive/diagnostics(mob/user)
..()
// 999 is a byond limit that is in place. It's unlikely someone will reach that many files anyway, since you would sooner run out of space.
to_chat(user, "NT-NFS File Table Status: [stored_files.len]/999")
@@ -61,7 +61,7 @@
to_chat(user, "Read-only mode: [(read_only ? "ON" : "OFF")]")
// Use this proc to add file to the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks.
-/obj/item/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F)
+/obj/item/computer_hardware/hard_drive/proc/store_file(datum/computer_file/F)
if(!F || !istype(F))
return 0
@@ -91,7 +91,7 @@
// Use this proc to remove file from the drive. Returns 1 on success and 0 on failure. Contains necessary sanity checks.
-/obj/item/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F)
+/obj/item/computer_hardware/hard_drive/proc/remove_file(datum/computer_file/F)
if(!F || !istype(F))
return 0
@@ -117,7 +117,7 @@
used_capacity = total_size
// Checks whether file can be stored on the hard drive.
-/obj/item/computer_hardware/hard_drive/proc/can_store_file(var/size = 1)
+/obj/item/computer_hardware/hard_drive/proc/can_store_file(size = 1)
// In the unlikely event someone manages to create that many files.
// BYOND is acting weird with numbers above 999 in loops (infinite loop prevention)
if(stored_files.len >= 999)
@@ -128,7 +128,7 @@
return 1
// Checks whether we can store the file. We can only store unique files, so this checks whether we wouldn't get a duplicity by adding a file.
-/obj/item/computer_hardware/hard_drive/proc/try_store_file(var/datum/computer_file/F)
+/obj/item/computer_hardware/hard_drive/proc/try_store_file(datum/computer_file/F)
if(!F || !istype(F))
return 0
var/name = F.filename + "." + F.filetype
@@ -140,7 +140,7 @@
// Tries to find the file by filename. Returns null on failure
-/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(var/filename)
+/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(filename)
if(!check_functionality())
return null
@@ -156,7 +156,7 @@
return null
// Tries to find the file by unique ID. Returns null on failure
-/obj/item/computer_hardware/hard_drive/proc/find_file_by_uid(var/uid)
+/obj/item/computer_hardware/hard_drive/proc/find_file_by_uid(uid)
if(!check_functionality())
return null
diff --git a/code/modules/modular_computers/hardware/nano_printer.dm b/code/modules/modular_computers/hardware/nano_printer.dm
index 9d78c241d6..a6c85c05ad 100644
--- a/code/modules/modular_computers/hardware/nano_printer.dm
+++ b/code/modules/modular_computers/hardware/nano_printer.dm
@@ -8,11 +8,11 @@
var/stored_paper = 5
var/max_paper = 10
-/obj/item/computer_hardware/nano_printer/diagnostics(var/mob/user)
+/obj/item/computer_hardware/nano_printer/diagnostics(mob/user)
..()
to_chat(user, "Paper buffer level: [stored_paper]/[max_paper]")
-/obj/item/computer_hardware/nano_printer/proc/print_text(var/text_to_print, var/paper_title = null)
+/obj/item/computer_hardware/nano_printer/proc/print_text(text_to_print, paper_title = null)
if(!stored_paper)
return 0
if(!enabled)
@@ -36,7 +36,7 @@
stored_paper--
return 1
-/obj/item/computer_hardware/nano_printer/proc/count_fields(var/info)
+/obj/item/computer_hardware/nano_printer/proc/count_fields(info)
//Count the fields. This is taken directly from paper.dm, /obj/item/paper/proc/parsepencode(). -Hawk_v3
var/fields = 0
var/t = info
diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm
index 0226d759a2..33c229dcf1 100644
--- a/code/modules/modular_computers/hardware/network_card.dm
+++ b/code/modules/modular_computers/hardware/network_card.dm
@@ -21,7 +21,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1)
/// If set, uses the value to funnel connections through another network card.
var/proxy_id
-/obj/item/computer_hardware/network_card/diagnostics(var/mob/user)
+/obj/item/computer_hardware/network_card/diagnostics(mob/user)
..()
to_chat(user, "NIX Unique ID: [identification_id]")
to_chat(user, "NIX User Tag: [identification_string]")
@@ -53,7 +53,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1)
icon_state = "netcard_advanced"
hardware_size = 1
-/obj/item/computer_hardware/network_card/quantum/get_signal(var/specific_action = 0)
+/obj/item/computer_hardware/network_card/quantum/get_signal(specific_action = 0)
if(!holder2)
return 0
@@ -87,7 +87,7 @@ GLOBAL_VAR_INIT(ntnet_card_uid, 1)
return GLOB.ntnet_global.check_banned(identification_id)
// 0 - No signal, 1 - Low signal, 2 - High signal. 3 - Wired Connection
-/obj/item/computer_hardware/network_card/proc/get_signal(var/specific_action = 0)
+/obj/item/computer_hardware/network_card/proc/get_signal(specific_action = 0)
if(!holder2) // Hardware is not installed in anything. No signal. How did this even get called?
return 0
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index 4969a9e739..a4a73d6f59 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -46,7 +46,7 @@
dev_card = 0
// Recalculates the price and optionally even fabricates the device.
-/obj/machinery/lapvend/proc/fabricate_and_recalc_price(var/fabricate = 0)
+/obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = 0)
total_price = 0
if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles
if(fabricate)
@@ -214,7 +214,7 @@
-/obj/machinery/lapvend/attack_hand(var/mob/user)
+/obj/machinery/lapvend/attack_hand(mob/user)
tgui_interact(user)
/obj/machinery/lapvend/tgui_interact(mob/user, datum/tgui/ui)
@@ -274,7 +274,7 @@
return ..()
// Simplified payment processing, returns 1 on success.
-/obj/machinery/lapvend/proc/process_payment(mob/user, var/obj/item/card/id/I, var/obj/item/ID_container)
+/obj/machinery/lapvend/proc/process_payment(mob/user, obj/item/card/id/I, obj/item/ID_container)
if(I==ID_container || ID_container == null)
visible_message(span_info("\The [user] swipes \the [I] through \the [src]."))
else
diff --git a/code/modules/multi-tile/multi-tile.dm b/code/modules/multi-tile/multi-tile.dm
index 3c590c5b6d..ca2c541da6 100644
--- a/code/modules/multi-tile/multi-tile.dm
+++ b/code/modules/multi-tile/multi-tile.dm
@@ -2,7 +2,7 @@
* This is the home of multi-tile movement checks, and thus here be dragons. You are warned.
*/
-/atom/movable/proc/check_multi_tile_move_density_dir(var/stepdir)
+/atom/movable/proc/check_multi_tile_move_density_dir(stepdir)
if(!locs || !locs.len)
return TRUE
diff --git a/code/modules/multiz/basic.dm b/code/modules/multiz/basic.dm
index f0e9e96bec..ace91b8e74 100644
--- a/code/modules/multiz/basic.dm
+++ b/code/modules/multiz/basic.dm
@@ -12,24 +12,24 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/map_data)
return INITIALIZE_HINT_QDEL
// The storage of connections between adjacent levels means some bitwise magic is needed.
-/proc/HasAbove(var/z)
+/proc/HasAbove(z)
if(z >= world.maxz || z < 1 || z > length(GLOB.z_levels))
return 0
return GLOB.z_levels[z]
-/proc/HasBelow(var/z)
+/proc/HasBelow(z)
if(z > world.maxz || z < 2 || (z-1) > length(GLOB.z_levels))
return 0
return GLOB.z_levels[z-1]
// Thankfully, no bitwise magic is needed here.
-/proc/GetAbove(var/atom/atom)
+/proc/GetAbove(atom/atom)
var/turf/turf = get_turf(atom)
if(!turf)
return null
return HasAbove(turf.z) ? get_step(turf, UP) : null
-/proc/GetBelow(var/atom/atom)
+/proc/GetBelow(atom/atom)
var/turf/turf = get_turf(atom)
if(!turf)
return null
@@ -42,7 +42,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/map_data)
for(var/level = z, HasAbove(level), level++)
. |= level+1
-/proc/AreConnectedZLevels(var/zA, var/zB)
+/proc/AreConnectedZLevels(zA, zB)
return zA == zB || (zB in GetConnectedZlevels(zA))
/proc/get_zstep(ref, dir)
diff --git a/code/modules/multiz/disabled.dm b/code/modules/multiz/disabled.dm
index 5c99bcb370..06837964ad 100644
--- a/code/modules/multiz/disabled.dm
+++ b/code/modules/multiz/disabled.dm
@@ -1,10 +1,10 @@
-/proc/HasAbove(var/z)
+/proc/HasAbove(z)
return 0
-/proc/HasBelow(var/z)
+/proc/HasBelow(z)
return 0
// These give either the turf or null.
-/proc/GetAbove(var/turf/turf)
+/proc/GetAbove(turf/turf)
return null
-/proc/GetBelow(var/turf/turf)
+/proc/GetBelow(turf/turf)
return null
diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm
index 226441bcb6..c6d7def9af 100644
--- a/code/modules/multiz/ladders.dm
+++ b/code/modules/multiz/ladders.dm
@@ -75,7 +75,7 @@
attack_hand(user)
return
-/obj/structure/ladder/attack_hand(var/mob/M)
+/obj/structure/ladder/attack_hand(mob/M)
if(!M.may_climb_ladders(src))
return
@@ -88,16 +88,16 @@
climbLadder(M, target_ladder)
-/obj/structure/ladder/attack_ghost(var/mob/M)
+/obj/structure/ladder/attack_ghost(mob/M)
var/target_ladder = getTargetLadder(M)
if(target_ladder)
M.forceMove(get_turf(target_ladder))
-/obj/structure/ladder/attack_robot(var/mob/M)
+/obj/structure/ladder/attack_robot(mob/M)
attack_hand(M)
return
-/obj/structure/ladder/proc/getTargetLadder(var/mob/M)
+/obj/structure/ladder/proc/getTargetLadder(mob/M)
if((!target_up && !target_down) || (target_up && !istype(target_up.loc, /turf) || (target_down && !istype(target_down.loc,/turf))))
to_chat(M, span_notice("\The [src] is incomplete and can't be climbed."))
return
@@ -118,7 +118,7 @@
else
return target_down || target_up
-/mob/proc/may_climb_ladders(var/ladder)
+/mob/proc/may_climb_ladders(ladder)
if(!Adjacent(ladder))
to_chat(src, span_warning("You need to be next to \the [ladder] to start climbing."))
return FALSE
@@ -127,10 +127,10 @@
return FALSE
return TRUE
-/mob/observer/dead/may_climb_ladders(var/ladder)
+/mob/observer/dead/may_climb_ladders(ladder)
return TRUE
-/obj/structure/ladder/proc/climbLadder(var/mob/M, var/obj/target_ladder)
+/obj/structure/ladder/proc/climbLadder(mob/M, obj/target_ladder)
var/direction = (target_ladder == target_up ? "up" : "down")
M.visible_message(span_infoplain(span_bold("\The [M]") + " begins climbing [direction] \the [src]!"),
span_info("You begin climbing [direction] \the [src]!"),
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 8295cf7767..812743645c 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -271,7 +271,7 @@
return 42
//If atom stands under open space, it can prevent fall, or not
-/atom/proc/can_prevent_fall(var/atom/movable/mover, var/turf/coming_from)
+/atom/proc/can_prevent_fall(atom/movable/mover, turf/coming_from)
return (!CanPass(mover, coming_from))
////////////////////////////
@@ -420,7 +420,7 @@
return TRUE
// So you'll slam when falling onto a catwalk
-/obj/structure/catwalk/CheckFall(var/atom/movable/falling_atom)
+/obj/structure/catwalk/CheckFall(atom/movable/falling_atom)
return falling_atom.fall_impact(src)
/obj/structure/lattice/CanFallThru(atom/movable/mover as mob|obj, turf/target as turf)
@@ -434,13 +434,13 @@
return FALSE // TODO - Technically should be density = TRUE and flags |= ON_BORDER
// So you'll slam when falling onto a grille
-/obj/structure/lattice/CheckFall(var/atom/movable/falling_atom)
+/obj/structure/lattice/CheckFall(atom/movable/falling_atom)
if(istype(falling_atom) && falling_atom.checkpass(PASSGRILLE))
return FALSE
return falling_atom.fall_impact(src)
// Actually process the falling movement and impacts.
-/atom/movable/proc/handle_fall(var/turf/landing)
+/atom/movable/proc/handle_fall(turf/landing)
var/turf/oldloc = loc
// Now lets move there!
@@ -453,15 +453,15 @@
return
fall_impact(A)
-/atom/movable/proc/special_fall_handle(var/atom/A)
+/atom/movable/proc/special_fall_handle(atom/A)
return FALSE
-/mob/living/carbon/human/special_fall_handle(var/atom/A)
+/mob/living/carbon/human/special_fall_handle(atom/A)
if(species)
return species.fall_impact_special(src, A)
return FALSE
-/atom/movable/proc/find_fall_target(var/turf/oldloc, var/turf/landing)
+/atom/movable/proc/find_fall_target(turf/oldloc, turf/landing)
if(isopenspace(oldloc))
oldloc.visible_message(span_notice("\The [src] falls down through \the [oldloc]!"), span_notice("You hear something falling through the air."))
@@ -478,7 +478,7 @@
if(landing.CheckFall(src))
return landing
-/mob/living/carbon/human/find_fall_target(var/turf/landing)
+/mob/living/carbon/human/find_fall_target(turf/landing)
if(species)
var/atom/A = species.find_fall_target_special(src, landing)
if(A)
@@ -490,36 +490,36 @@
// ## THE FALLING PROCS ###
// Called on everything that falling_atom might hit. Return TRUE if you're handling it so find_fall_target() will stop checking.
-/atom/proc/CheckFall(var/atom/movable/falling_atom)
+/atom/proc/CheckFall(atom/movable/falling_atom)
if(density && !(flags & ON_BORDER))
return TRUE
// If you are hit: how is it handled.
// Return TRUE if the generic fall_impact should be called
// Return FALSE if you handled it yourself or if there's no effect from hitting you
-/atom/proc/check_impact(var/atom/movable/falling_atom)
+/atom/proc/check_impact(atom/movable/falling_atom)
if(density && !(flags & ON_BORDER))
return TRUE
// By default all turfs are gonna let you hit them regardless of density.
-/turf/CheckFall(var/atom/movable/falling_atom)
+/turf/CheckFall(atom/movable/falling_atom)
return TRUE
-/turf/check_impact(var/atom/movable/falling_atom)
+/turf/check_impact(atom/movable/falling_atom)
return TRUE
// Obviously you can't really hit open space.
-/turf/simulated/open/CheckFall(var/atom/movable/falling_atom)
+/turf/simulated/open/CheckFall(atom/movable/falling_atom)
return FALSE
-/turf/simulated/open/check_impact(var/atom/movable/falling_atom)
+/turf/simulated/open/check_impact(atom/movable/falling_atom)
return FALSE
// Or actual space.
-/turf/space/CheckFall(var/atom/movable/falling_atom)
+/turf/space/CheckFall(atom/movable/falling_atom)
return FALSE
-/turf/space/check_impact(var/atom/movable/falling_atom)
+/turf/space/check_impact(atom/movable/falling_atom)
return FALSE
// Can't fall onto ghosts
@@ -537,14 +537,14 @@
// If silent is True, the proc won't play sound or give a message.
// If planetary is True, it's harder to stop the fall damage
-/atom/movable/proc/fall_impact(var/atom/hit_atom, var/damage_min = 0, var/damage_max = 10, var/silent = FALSE, var/planetary = FALSE)
+/atom/movable/proc/fall_impact(atom/hit_atom, damage_min = 0, damage_max = 10, silent = FALSE, planetary = FALSE)
if(!silent)
visible_message("\The [src] falls from above and slams into \the [hit_atom]!", "You hear something slam into \the [hit_atom].")
for(var/atom/movable/A in src.contents)
A.fall_impact(hit_atom, damage_min, damage_max, silent = TRUE)
// Take damage from falling and hitting the ground
-/mob/living/fall_impact(var/atom/hit_atom, var/damage_min = 0, var/damage_max = 5, var/silent = FALSE, var/planetary = FALSE)
+/mob/living/fall_impact(atom/hit_atom, damage_min = 0, damage_max = 5, silent = FALSE, planetary = FALSE)
var/turf/landing = get_turf(hit_atom)
var/safe_fall = FALSE
if(src.softfall || (isanimal(src) && src.mob_size <= MOB_SMALL))
@@ -646,7 +646,7 @@
return parachuting
//Mech Code
-/obj/mecha/handle_fall(var/turf/landing)
+/obj/mecha/handle_fall(turf/landing)
// First things first, break any lattice
var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, loc)
if(lattice)
@@ -657,7 +657,7 @@
// Then call parent to have us actually fall
return ..()
-/obj/mecha/fall_impact(var/atom/hit_atom, var/damage_min = 15, var/damage_max = 30, var/silent = FALSE, var/planetary = FALSE)
+/obj/mecha/fall_impact(atom/hit_atom, damage_min = 15, damage_max = 30, silent = FALSE, planetary = FALSE)
// Anything on the same tile as the landing tile is gonna have a bad day.
for(var/mob/living/L in hit_atom.contents)
L.visible_message(span_danger("\The [src] crushes \the [L] as it lands on them!"))
diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm
index cf1c4d65c1..d2ce3fb6c5 100644
--- a/code/modules/multiz/movement_vr.dm
+++ b/code/modules/multiz/movement_vr.dm
@@ -1,5 +1,5 @@
-/mob/living/handle_fall(var/turf/landing)
+/mob/living/handle_fall(turf/landing)
var/mob/living/drop_mob = locate(/mob/living, landing)
if(locate(/obj/structure/stairs) in landing)
@@ -54,7 +54,7 @@
// Then call parent to have us actually fall
return ..()
-/mob/CheckFall(var/atom/movable/falling_atom)
+/mob/CheckFall(atom/movable/falling_atom)
return falling_atom.fall_impact(src)
/mob/observer/dead/CheckFall()
diff --git a/code/modules/multiz/pipes.dm b/code/modules/multiz/pipes.dm
index 1a1cde573d..a2ce223054 100644
--- a/code/modules/multiz/pipes.dm
+++ b/code/modules/multiz/pipes.dm
@@ -51,7 +51,7 @@
if(SOUTHWEST)
initialize_directions = SOUTH
-/obj/machinery/atmospherics/pipe/zpipe/hide(var/i)
+/obj/machinery/atmospherics/pipe/zpipe/hide(i)
if(istype(loc, /turf/simulated))
invisibility = i ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
update_icon()
diff --git a/code/modules/multiz/portals_vr.dm b/code/modules/multiz/portals_vr.dm
index 8f6c834dd1..9a7a0d07b3 100644
--- a/code/modules/multiz/portals_vr.dm
+++ b/code/modules/multiz/portals_vr.dm
@@ -43,7 +43,7 @@
spawn(0)
src.teleport(user)
-/obj/structure/portal_event/attack_ghost(var/mob/observer/dead/user)
+/obj/structure/portal_event/attack_ghost(mob/observer/dead/user)
if(!target && check_rights_for(user?.client, R_HOLDER))
to_chat(user, span_notice("Selecting 'Portal Here' will create and link a portal at your location, while 'Target Here' will create an object that is only visible to ghosts which will act as the target, again at your location. Each option will give you the ability to change portal types, but for all options except 'Select Type' you only get one shot at it, so be sure to experiment with 'Select Type' first if you're not familiar with them."))
var/response = tgui_alert(user, "You appear to be staff. This portal has no exit point. If you want to make one, move to where you want it to go, and click the appropriate option, see chat for more info, otherwise click 'Cancel'", "Unbound Portal", list("Cancel","Portal Here","Target Here", "Select Type"))
diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm
index c57c0348ed..74b45ecbcd 100644
--- a/code/modules/multiz/stairs.dm
+++ b/code/modules/multiz/stairs.dm
@@ -57,10 +57,10 @@
return TRUE
// Used to actually move stuff up/down stairs. Removed from Crossed for special cases
-/obj/structure/stairs/proc/use_stairs(var/atom/movable/AM, var/atom/oldloc)
+/obj/structure/stairs/proc/use_stairs(atom/movable/AM, atom/oldloc)
return
-/obj/structure/stairs/proc/use_stairs_instant(var/atom/movable/AM)
+/obj/structure/stairs/proc/use_stairs_instant(atom/movable/AM)
return
//////////////////////////////////////////////////////////////////////
@@ -134,14 +134,14 @@
// Out of the dir check, we have no valid neighbors, and thus are not complete.
return FALSE
-/obj/structure/stairs/bottom/Crossed(var/atom/movable/AM, var/atom/oldloc)
+/obj/structure/stairs/bottom/Crossed(atom/movable/AM, atom/oldloc)
if(isliving(AM))
var/mob/living/L = AM
if(L.has_AI())
use_stairs(AM, oldloc)
..()
-/obj/structure/stairs/bottom/use_stairs(var/atom/movable/AM, var/atom/oldloc)
+/obj/structure/stairs/bottom/use_stairs(atom/movable/AM, atom/oldloc)
// If we're coming from the top of the stairs, don't trap us in an infinite staircase
// Or if we fell down the openspace
if((top in oldloc) || oldloc == GetAbove(src))
@@ -196,7 +196,7 @@
SEND_SIGNAL(AM, COMSIG_MOVED_UP_STAIRS, AM, oldloc)
return TRUE
-/obj/structure/stairs/bottom/use_stairs_instant(var/atom/movable/AM)
+/obj/structure/stairs/bottom/use_stairs_instant(atom/movable/AM)
if(isobserver(AM)) // Ghosts have their own methods for going up and down
return
//VOREStation Addition Start
@@ -390,20 +390,20 @@
// Out of the dir check, we have no valid neighbors, and thus are not complete. `.` was set by ..()
return
-/obj/structure/stairs/top/Crossed(var/atom/movable/AM, var/atom/oldloc)
+/obj/structure/stairs/top/Crossed(atom/movable/AM, atom/oldloc)
if(isliving(AM))
var/mob/living/L = AM
if(L.has_AI())
use_stairs(AM, oldloc)
..()
-/obj/structure/stairs/top/Uncrossed(var/atom/movable/AM)
+/obj/structure/stairs/top/Uncrossed(atom/movable/AM)
// Going down stairs from the topstair piece
if(AM.dir == turn(dir, 180) && isturf(AM.loc) && check_integrity())
use_stairs_instant(AM)
return
-/obj/structure/stairs/top/use_stairs(var/atom/movable/AM, var/atom/oldloc)
+/obj/structure/stairs/top/use_stairs(atom/movable/AM, atom/oldloc)
// If we're coming from the bottom of the stairs, don't trap us in an infinite staircase
// Or if we climb up the middle
if((bottom in oldloc) || oldloc == GetBelow(src))
@@ -456,7 +456,7 @@
SEND_SIGNAL(AM, COMSIG_MOVED_DOWN_STAIRS, AM, oldloc)
return TRUE
-/obj/structure/stairs/top/use_stairs_instant(var/atom/movable/AM)
+/obj/structure/stairs/top/use_stairs_instant(atom/movable/AM)
if(isobserver(AM)) // Ghosts have their own methods for going up and down
return
//VOREStation Addition Start
diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm
index 1e09515f85..2e409e8966 100644
--- a/code/modules/multiz/turf.dm
+++ b/code/modules/multiz/turf.dm
@@ -75,7 +75,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
AddElement(/datum/element/turf_z_transparency, FALSE)
update_icon()
-/turf/simulated/open/Entered(var/atom/movable/mover, var/atom/oldloc)
+/turf/simulated/open/Entered(atom/movable/mover, atom/oldloc)
..()
mover.fall()
@@ -84,7 +84,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
A.fall()
// Called when thrown object lands on this turf.
-/turf/simulated/open/hitby(var/atom/movable/source, datum/thrownthing/throwingdatum)
+/turf/simulated/open/hitby(atom/movable/source, datum/thrownthing/throwingdatum)
. = ..()
source.fall()
diff --git a/code/modules/news/newspaper_layout.dm b/code/modules/news/newspaper_layout.dm
index 178dc88841..e4c8aa22a9 100644
--- a/code/modules/news/newspaper_layout.dm
+++ b/code/modules/news/newspaper_layout.dm
@@ -1,4 +1,4 @@
-/proc/get_newspaper_header(newspaper, var/list/subjects, bgcolor)
+/proc/get_newspaper_header(newspaper, list/subjects, bgcolor)
var/dat
diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm
index a005d17590..7adcab936b 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -68,7 +68,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
var/list/planes_visible = list()
//Constructor comes with a free AR HUD
-/obj/item/nif/Initialize(mapload,var/wear,var/list/load_data)
+/obj/item/nif/Initialize(mapload,wear,list/load_data)
. = ..()
//First one to spawn in the game, make a big icon
@@ -117,7 +117,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return ..()
//Being implanted in some mob
-/obj/item/nif/proc/implant(var/mob/living/carbon/human/H)
+/obj/item/nif/proc/implant(mob/living/carbon/human/H)
var/obj/item/organ/brain = H.internal_organs_by_name[O_BRAIN]
if(istype(brain))
should_be_in = brain.parent_organ
@@ -141,7 +141,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return FALSE
//For debug or antag purposes
-/obj/item/nif/proc/quick_implant(var/mob/living/carbon/human/H)
+/obj/item/nif/proc/quick_implant(mob/living/carbon/human/H)
if(istype(H))
var/obj/item/organ/external/parent
//Try to find their brain and put it near that
@@ -160,7 +160,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return FALSE
-/obj/item/nif/proc/quick_install(var/mob/living/carbon/human/H)
+/obj/item/nif/proc/quick_install(mob/living/carbon/human/H)
if(QDELETED(H)) //Or letting them get deleted
return
if(H.mind)
@@ -169,7 +169,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
implant(H)
//Being removed from some mob
-/obj/item/nif/proc/unimplant(var/mob/living/carbon/human/H)
+/obj/item/nif/proc/unimplant(mob/living/carbon/human/H)
var/datum/nifsoft/soulcatcher/SC = imp_check(NIF_SOULCATCHER)
if(SC) //Clean up stored people, this is dirty but the easiest way.
QDEL_LIST_NULL(SC.brainmobs)
@@ -211,7 +211,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
* CHOMPedit Remove end. */
//Wear update/check proc
-/obj/item/nif/proc/wear(var/wear = 0)
+/obj/item/nif/proc/wear(wear = 0)
wear *= (rand(85,115) / 100) //Apparently rand() only takes integers.
durability -= wear
@@ -228,7 +228,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
to_chat(human,span_danger("Your NIF vision overlays disappear and your head suddenly seems very quiet..."))
//Repair update/check proc
-/obj/item/nif/proc/repair(var/repair = 0)
+/obj/item/nif/proc/repair(repair = 0)
durability = min(durability + repair, initial(durability))
if(human)
@@ -396,7 +396,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return FALSE
//Prints 'AR' messages to the user
-/obj/item/nif/proc/notify(var/message,var/alert = 0)
+/obj/item/nif/proc/notify(message,alert = 0)
if(!human || stat == NIF_TEMPFAIL) return
last_notification = message // TGUI Hook
@@ -409,7 +409,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
human << good_sound
//Called to spend nutrition, returns 1 if it was able to
-/obj/item/nif/proc/use_charge(var/use_charge)
+/obj/item/nif/proc/use_charge(use_charge)
if(stat != NIF_WORKING) return FALSE
//You don't want us to take any? Well okay.
@@ -427,7 +427,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
// This operates on a nifsoft *path*, not an instantiation.
// It tells the nifsoft shop if it's installation will succeed, to prevent it
// from charging the user for incompatible software.
-/obj/item/nif/proc/can_install(var/datum/nifsoft/path)
+/obj/item/nif/proc/can_install(datum/nifsoft/path)
if(stat == NIF_TEMPFAIL)
return FALSE
@@ -448,7 +448,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return TRUE
//Install a piece of software
-/obj/item/nif/proc/install(var/datum/nifsoft/new_soft)
+/obj/item/nif/proc/install(datum/nifsoft/new_soft)
if(stat == NIF_TEMPFAIL) return FALSE
if(nifsofts[new_soft.list_pos])
@@ -474,7 +474,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return TRUE
//Uninstall a piece of software
-/obj/item/nif/proc/uninstall(var/datum/nifsoft/old_soft)
+/obj/item/nif/proc/uninstall(datum/nifsoft/old_soft)
var/datum/nifsoft/NS
if(nifsofts)
NS = nifsofts[old_soft.list_pos]
@@ -498,7 +498,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return TRUE
//Activate a nifsoft
-/obj/item/nif/proc/activate(var/datum/nifsoft/soft)
+/obj/item/nif/proc/activate(datum/nifsoft/soft)
if(stat != NIF_WORKING) return FALSE
if(human)
@@ -527,7 +527,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return TRUE
//Deactivate a nifsoft
-/obj/item/nif/proc/deactivate(var/datum/nifsoft/soft)
+/obj/item/nif/proc/deactivate(datum/nifsoft/soft)
if(human)
if(prob(5)) human.visible_message(span_notice("\The [human] [pick(GLOB.nif_look_messages)]."))
human << click_sound
@@ -540,14 +540,14 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return TRUE
//Deactivate several nifsofts
-/obj/item/nif/proc/deactivate_these(var/list/turn_off)
+/obj/item/nif/proc/deactivate_these(list/turn_off)
for(var/N in turn_off)
var/datum/nifsoft/NS = nifsofts[N]
if(NS)
NS.deactivate()
//Add a flag to one of the holders
-/obj/item/nif/proc/set_flag(var/flag,var/hint)
+/obj/item/nif/proc/set_flag(flag,hint)
ASSERT(flag != null && hint)
switch(hint)
@@ -563,7 +563,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
CRASH("Not a valid NIF set_flag hint: [hint]")
//Clear a flag from one of the holders
-/obj/item/nif/proc/clear_flag(var/flag,var/hint)
+/obj/item/nif/proc/clear_flag(flag,hint)
ASSERT(flag != null && hint)
switch(hint)
@@ -579,7 +579,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
CRASH("Not a valid NIF clear_flag hint: [hint]")
//Check for an installed implant
-/obj/item/nif/proc/imp_check(var/soft)
+/obj/item/nif/proc/imp_check(soft)
if(stat != NIF_WORKING) return FALSE
ASSERT(soft)
@@ -591,7 +591,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return entry
//Check for a set flag
-/obj/item/nif/proc/flag_check(var/flag,var/hint)
+/obj/item/nif/proc/flag_check(flag,hint)
if(stat != NIF_WORKING) return FALSE
ASSERT(flag && hint)
@@ -617,12 +617,12 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
return planes_visible
-/obj/item/nif/proc/add_plane(var/planeid = null)
+/obj/item/nif/proc/add_plane(planeid = null)
if(!planeid)
return
planes_visible |= planeid
-/obj/item/nif/proc/del_plane(var/planeid = null)
+/obj/item/nif/proc/del_plane(planeid = null)
if(!planeid)
return
planes_visible -= planeid
diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm
index 38d06497c2..8aa0b2be47 100644
--- a/code/modules/nifsoft/nifsoft.dm
+++ b/code/modules/nifsoft/nifsoft.dm
@@ -47,7 +47,7 @@
var/list/incompatible_with = null // List of NIFSofts that are disabled when this one is enabled
//Constructor accepts the NIF it's being loaded into
-/datum/nifsoft/New(var/obj/item/nif/nif_load)
+/datum/nifsoft/New(obj/item/nif/nif_load)
ASSERT(nif_load)
nif = nif_load
@@ -80,11 +80,11 @@
qdel(src)
//Called every life() tick on a mob on active implants
-/datum/nifsoft/proc/life(var/mob/living/carbon/human/human)
+/datum/nifsoft/proc/life(mob/living/carbon/human/human)
return TRUE
//Called when attempting to activate an implant (could be a 'pulse' activation or toggling it on)
-/datum/nifsoft/proc/activate(var/force = FALSE)
+/datum/nifsoft/proc/activate(force = FALSE)
if(active && !force)
return
var/nif_result = nif.activate(src)
@@ -116,7 +116,7 @@
return nif_result
//Called when attempting to deactivate an implant
-/datum/nifsoft/proc/deactivate(var/force = FALSE)
+/datum/nifsoft/proc/deactivate(force = FALSE)
if(!active && !force)
return
var/nif_result = nif.deactivate(src)
@@ -149,7 +149,7 @@
return
//Called when installed from a disk
-/datum/nifsoft/proc/disk_install(var/mob/living/carbon/human/target,var/mob/living/carbon/human/user)
+/datum/nifsoft/proc/disk_install(mob/living/carbon/human/target,mob/living/carbon/human/user)
return TRUE
//Status text for menu
@@ -166,7 +166,7 @@
wear = 0 //Packages don't cause wear themselves, the software does
//Constructor accepts a NIF and loads all the software
-/datum/nifsoft/package/New(var/obj/item/nif/nif_load)
+/datum/nifsoft/package/New(obj/item/nif/nif_load)
ASSERT(nif_load)
for(var/P in software)
@@ -198,7 +198,7 @@
var/datum/nifsoft/stored_organic = null
var/datum/nifsoft/stored_synthetic = null
-/obj/item/disk/nifsoft/afterattack(var/A, mob/user, flag, params)
+/obj/item/disk/nifsoft/afterattack(A, mob/user, flag, params)
if(!in_range(user, A))
return
@@ -258,7 +258,7 @@
stored_synthetic = /datum/nifsoft/compliance
var/laws
-/obj/item/disk/nifsoft/compliance/afterattack(var/A, mob/user, flag, params)
+/obj/item/disk/nifsoft/compliance/afterattack(A, mob/user, flag, params)
if(!ishuman(A))
return
if(!laws)
diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm
index e84505183e..b7cf522fd8 100644
--- a/code/modules/nifsoft/software/05_health.dm
+++ b/code/modules/nifsoft/software/05_health.dm
@@ -17,7 +17,7 @@
if((. = ..()))
mode = 1
-/datum/nifsoft/medichines_org/deactivate(var/force = FALSE)
+/datum/nifsoft/medichines_org/deactivate(force = FALSE)
if((. = ..()))
a_drain = initial(a_drain)
mode = initial(mode)
@@ -96,7 +96,7 @@
if((. = ..()))
mode = 1
-/datum/nifsoft/medichines_syn/deactivate(var/force = FALSE)
+/datum/nifsoft/medichines_syn/deactivate(force = FALSE)
if((. = ..()))
mode = 0
@@ -174,7 +174,7 @@
if((. = ..()))
nif.notify("Now taking air from reserves.")
-/datum/nifsoft/spare_breath/deactivate(var/force = FALSE)
+/datum/nifsoft/spare_breath/deactivate(force = FALSE)
if((. = ..()))
nif.notify("Now taking air from environment and refilling reserves.")
@@ -225,7 +225,7 @@
deactivate()
return TRUE
-/datum/nifsoft/mindbackup/deactivate(var/force = FALSE)
+/datum/nifsoft/mindbackup/deactivate(force = FALSE)
if((. = ..()))
return TRUE
diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm
index 5affb8595e..e6f7bb6e2b 100644
--- a/code/modules/nifsoft/software/06_screens.dm
+++ b/code/modules/nifsoft/software/06_screens.dm
@@ -20,7 +20,7 @@
arscreen.tgui_interact(nif.human)
return TRUE
-/datum/nifsoft/crewmonitor/deactivate(var/force = FALSE)
+/datum/nifsoft/crewmonitor/deactivate(force = FALSE)
if((. = ..()))
return TRUE
@@ -49,7 +49,7 @@
tgarscreen.tgui_interact(nif.human)
return TRUE
-/datum/nifsoft/alarmmonitor/deactivate(var/force = FALSE)
+/datum/nifsoft/alarmmonitor/deactivate(force = FALSE)
if((. = ..()))
return TRUE
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index 2649bf87ad..abd8bd6625 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -26,7 +26,7 @@
spawn(0)
deactivate()
-/datum/nifsoft/soulcatcher/deactivate(var/force = FALSE)
+/datum/nifsoft/soulcatcher/deactivate(force = FALSE)
if((. = ..()))
return TRUE
@@ -60,7 +60,7 @@
inside_flavor = load
return TRUE
-/datum/nifsoft/soulcatcher/proc/notify_into(var/message)
+/datum/nifsoft/soulcatcher/proc/notify_into(message)
var/sound = nif.good_sound
message = " " + span_bold("Soulcatcher") + " displays, \"" + span_notice(span_nif("[message]")) + "\""
@@ -76,7 +76,7 @@
html = span_nif(span_bold("\[[icon2html(nif.big_icon, CS.client)]NIF\]") + message))
CS << sound
-/datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj, var/whisper)
+/datum/nifsoft/soulcatcher/proc/say_into(message, mob/living/sender, mob/eyeobj, whisper)
var/sender_name = eyeobj ? eyeobj.name : sender.name
//AR Projecting
@@ -109,7 +109,7 @@
sender.log_talk("NSAY (NIF:[nif.human.real_name]): [message]", LOG_SAY, color="#ff00c8")
-/datum/nifsoft/soulcatcher/proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj, var/whisper)
+/datum/nifsoft/soulcatcher/proc/emote_into(message, mob/living/sender, mob/eyeobj, whisper)
var/sender_name = eyeobj ? eyeobj.name : sender.name
//AR Projecting
@@ -137,7 +137,7 @@
sender.log_message("NME (NIF:[nif.human.real_name]): [message]", LOG_EMOTE, color="#ff00c8")
-/datum/nifsoft/soulcatcher/proc/show_settings(var/mob/living/carbon/human/H)
+/datum/nifsoft/soulcatcher/proc/show_settings(mob/living/carbon/human/H)
set waitfor = FALSE
var/settings_list = list(
"Catching You \[[setting_flags & NIF_SC_CATCHING_ME ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_ME,
@@ -178,7 +178,7 @@
var/flag = settings_list[choice]
return toggle_setting(flag)
-/datum/nifsoft/soulcatcher/proc/toggle_setting(var/flag)
+/datum/nifsoft/soulcatcher/proc/toggle_setting(flag)
setting_flags ^= flag
var/notify_message
@@ -225,7 +225,7 @@
return TRUE
//Complex version for catching in-round characters
-/datum/nifsoft/soulcatcher/proc/catch_mob(var/mob/M)
+/datum/nifsoft/soulcatcher/proc/catch_mob(mob/M)
if(!M.mind) return
if(!(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_CAPTURE) && !isobserver(M)) return // Bypass pref check for observer join
@@ -370,13 +370,13 @@
return FALSE
..()
-/mob/living/carbon/brain/caught_soul/face_atom(var/atom/A)
+/mob/living/carbon/brain/caught_soul/face_atom(atom/A)
if(eyeobj)
return eyeobj.face_atom(A)
else
return ..(A)
-/mob/living/carbon/brain/caught_soul/set_dir(var/direction)
+/mob/living/carbon/brain/caught_soul/set_dir(direction)
if(eyeobj)
return eyeobj.set_dir(direction)
else
@@ -390,11 +390,11 @@
if(silent) return FALSE
soulcatcher.say_into(message,src,eyeobj,TRUE)
-/mob/living/carbon/brain/caught_soul/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/carbon/brain/caught_soul/say(message, datum/language/speaking = null, whispering = 0)
if(silent) return FALSE
soulcatcher.say_into(message,src,eyeobj)
-/mob/living/carbon/brain/caught_soul/emote(var/act,var/m_type=1,var/message = null)
+/mob/living/carbon/brain/caught_soul/emote(act,m_type=1,message = null)
if(silent) return FALSE
if (act == "me")
if(silent)
@@ -411,7 +411,7 @@
else
return FALSE
-/mob/living/carbon/brain/caught_soul/custom_emote(var/m_type, var/message)
+/mob/living/carbon/brain/caught_soul/custom_emote(m_type, message)
if(silent) return FALSE
soulcatcher.emote_into(message,src,eyeobj)
@@ -430,7 +430,7 @@
icon_state = "beacon"
var/mob/living/parent_human
-/mob/observer/eye/ar_soul/Initialize(mapload, var/human)
+/mob/observer/eye/ar_soul/Initialize(mapload, human)
. = ..()
var/mob/brainmob = loc
if(!istype(brainmob) || !brainmob.client)
diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm
index 7123a5dda4..6e3117e5a7 100644
--- a/code/modules/nifsoft/software/14_commlink.dm
+++ b/code/modules/nifsoft/software/14_commlink.dm
@@ -41,7 +41,7 @@
var/obj/item/nif/nif
var/datum/nifsoft/commlink/nifsoft
-/obj/item/communicator/commlink/Initialize(mapload, var/soft)
+/obj/item/communicator/commlink/Initialize(mapload, soft)
. = ..()
nif = loc
nifsoft = soft
@@ -53,7 +53,7 @@
nifsoft = null
return ..()
-/obj/item/communicator/commlink/register_device(var/new_name)
+/obj/item/communicator/commlink/register_device(new_name)
owner = new_name
name = "[owner]'s [initial(name)]"
nif.save_data["commlink_name"] = owner
@@ -91,7 +91,7 @@
return
//The silent treatment
-/obj/item/communicator/commlink/request(var/atom/candidate)
+/obj/item/communicator/commlink/request(atom/candidate)
if(candidate in voice_requests)
return
var/who = null
@@ -111,7 +111,7 @@
nif.notify("New commlink call from [who]. (Open)")
//Similar reason
-/obj/item/communicator/commlink/request_im(var/atom/candidate, var/origin_address, var/text)
+/obj/item/communicator/commlink/request_im(atom/candidate, origin_address, text)
var/who = null
if(isobserver(candidate))
var/mob/observer/dead/ghost = candidate
diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm
index 4faf015483..7c05ae6b6e 100644
--- a/code/modules/nifsoft/software/15_misc.dm
+++ b/code/modules/nifsoft/software/15_misc.dm
@@ -23,7 +23,7 @@
H.visible_message(span_warning("Thin snakelike tendrils grow from [H] and connect to \the [apc]."),span_notice("Thin snakelike tendrils grow from you and connect to \the [apc]."))
-/datum/nifsoft/apc_recharge/deactivate(var/force = FALSE)
+/datum/nifsoft/apc_recharge/deactivate(force = FALSE)
if((. = ..()))
apc = null
@@ -99,7 +99,7 @@
access = 999 //Prevents anyone from buying it without an emag.
var/laws = "Be nice to people!"
-/datum/nifsoft/compliance/New(var/newloc,var/newlaws)
+/datum/nifsoft/compliance/New(newloc,newlaws)
laws = newlaws //Sanitize before this (the disk does)
..(newloc)
@@ -140,7 +140,7 @@
spawn(0)
deactivate()
-/datum/nifsoft/sizechange/deactivate(var/force = FALSE)
+/datum/nifsoft/sizechange/deactivate(force = FALSE)
if((. = ..()))
return TRUE
@@ -164,7 +164,7 @@
H.display_alt_appearance("animals", justme)
GLOB.alt_farmanimals += nif.human
-/datum/nifsoft/worldbend/deactivate(var/force = FALSE)
+/datum/nifsoft/worldbend/deactivate(force = FALSE)
if((. = ..()))
var/list/justme = list(nif.human)
for(var/human in GLOB.human_mob_list)
diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index 1d823f39ee..4f537ea7c1 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -19,7 +19,7 @@ BLOOD_VOLUME_SURVIVE = 40
* Also called by inject_blood as fallback with amt = injected_amount
* MUST be followed by calling fixblood() allways.
***/
-/mob/living/carbon/human/proc/make_blood(var/amt = 0)
+/mob/living/carbon/human/proc/make_blood(amt = 0)
if(vessel)
return
@@ -278,11 +278,11 @@ BLOOD_VOLUME_SURVIVE = 40
//Makes a blood drop, leaking amt units of blood from the mob
-/mob/living/carbon/human/proc/drip(var/amt)
+/mob/living/carbon/human/proc/drip(amt)
if(remove_blood(amt))
blood_splatter(src,src)
-/mob/living/carbon/human/proc/remove_blood(var/amt)
+/mob/living/carbon/human/proc/remove_blood(amt)
if(!should_have_organ(O_HEART)) //TODO: Make drips come from the reagents instead.
return 0
@@ -308,7 +308,7 @@ BLOOD_VOLUME_SURVIVE = 40
****************************************************/
//Gets blood from mob to the container, preserving all data in it.
-/mob/living/carbon/proc/take_blood(obj/item/reagent_containers/container, var/amount)
+/mob/living/carbon/proc/take_blood(obj/item/reagent_containers/container, amount)
var/datum/reagent/B = get_blood(container.reagents)
if(!B)
@@ -347,7 +347,7 @@ BLOOD_VOLUME_SURVIVE = 40
return B
//For humans, blood does not appear from blue, it comes from vessels.
-/mob/living/carbon/human/take_blood(obj/item/reagent_containers/container, var/amount)
+/mob/living/carbon/human/take_blood(obj/item/reagent_containers/container, amount)
if(!should_have_organ(O_HEART))
return null
@@ -359,7 +359,7 @@ BLOOD_VOLUME_SURVIVE = 40
remove_blood(amount) // Removes blood if human
//Transfers blood from container ot vessels
-/mob/living/carbon/proc/inject_blood(var/datum/reagent/blood/injected, var/amount)
+/mob/living/carbon/proc/inject_blood(datum/reagent/blood/injected, amount)
if (!injected || !istype(injected))
return
var/list/sniffles = injected.data["viruses"]
@@ -379,7 +379,7 @@ BLOOD_VOLUME_SURVIVE = 40
reagents.update_total()
//Transfers blood from reagents to vessel, respecting blood types compatability.
-/mob/living/carbon/human/inject_blood(var/datum/reagent/blood/injected, var/amount)
+/mob/living/carbon/human/inject_blood(datum/reagent/blood/injected, amount)
if(!should_have_organ(O_HEART))
reagents.add_reagent(REAGENT_ID_BLOOD, amount, injected.data)
@@ -452,7 +452,7 @@ BLOOD_VOLUME_SURVIVE = 40
//AB is a universal receiver.
return 0
-/proc/blood_splatter(var/target,var/datum/reagent/blood/source,var/large)
+/proc/blood_splatter(target,datum/reagent/blood/source,large)
//Vorestation Edit Start - We're not going to splatter at all because we're in something and that's silly.
if(istype(source,/atom/movable))
diff --git a/code/modules/organs/data.dm b/code/modules/organs/data.dm
index 41f6316f30..5a8879bf84 100644
--- a/code/modules/organs/data.dm
+++ b/code/modules/organs/data.dm
@@ -21,7 +21,7 @@
. = ..()
species = null
-/datum/organ_data/proc/setup_from_dna(var/datum/dna/dna)
+/datum/organ_data/proc/setup_from_dna(datum/dna/dna)
SHOULD_NOT_OVERRIDE(TRUE)
// Prosfab uses default dna to get vars, lets respect that still
var/self_clear = FALSE
@@ -44,7 +44,7 @@
if(self_clear)
qdel(dna)
-/datum/organ_data/proc/setup_from_species(var/datum/species/S) // This needs a full rework, but can't be done unless all of transformating species code is refactored
+/datum/organ_data/proc/setup_from_species(datum/species/S) // This needs a full rework, but can't be done unless all of transformating species code is refactored
SHOULD_NOT_OVERRIDE(TRUE)
species = WEAKREF(S)
@@ -62,15 +62,15 @@
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("name",SP.name)
-/datum/organ_data/proc/get_species_race_key(var/owner)
+/datum/organ_data/proc/get_species_race_key(owner)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("race_key",SP.get_race_key(owner))
-/datum/organ_data/proc/get_species_bodytype(var/mob/living/carbon/human/H)
+/datum/organ_data/proc/get_species_bodytype(mob/living/carbon/human/H)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("bodytype",SP.get_bodytype(H))
-/datum/organ_data/proc/get_species_icobase(var/mob/living/carbon/human/H, var/get_deform)
+/datum/organ_data/proc/get_species_icobase(mob/living/carbon/human/H, get_deform)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("icobase",SP.get_icobase(H,get_deform))
@@ -94,11 +94,11 @@
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("mob_size",SP.mob_size)
-/datum/organ_data/proc/get_species_flesh_colour(var/owner)
+/datum/organ_data/proc/get_species_flesh_colour(owner)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("flesh_colour",SP.get_flesh_colour(owner) || "#C80000")
-/datum/organ_data/proc/get_species_blood_colour(var/owner)
+/datum/organ_data/proc/get_species_blood_colour(owner)
SHOULD_NOT_OVERRIDE(TRUE)
SETUP_SPECIES_CHECK("blood_colour",SP.get_blood_colour(owner) || "#C80000")
diff --git a/code/modules/organs/internal/augment.dm b/code/modules/organs/internal/augment.dm
index 1f37b06d83..01b9a4be88 100644
--- a/code/modules/organs/internal/augment.dm
+++ b/code/modules/organs/internal/augment.dm
@@ -48,7 +48,7 @@
radial_state = icon_state
my_radial_icon = image(icon = radial_icon, icon_state = radial_state)
-/obj/item/organ/internal/augment/handle_organ_mod_special(var/removed = FALSE)
+/obj/item/organ/internal/augment/handle_organ_mod_special(removed = FALSE)
if(removed && integrated_object && integrated_object.loc != src)
if(isliving(integrated_object.loc))
var/mob/living/L = integrated_object.loc
@@ -92,7 +92,7 @@
enable_augments(src)
-/mob/living/carbon/human/proc/enable_augments(var/mob/living/user)
+/mob/living/carbon/human/proc/enable_augments(mob/living/user)
var/list/options = list()
var/list/present_augs = list()
@@ -123,7 +123,7 @@
* cling_to_organ is a reference to the organ object itself, so they can easily return to their organ when removed by any means.
*/
-/mob/living/carbon/human/proc/equip_augment_item(var/slot, var/obj/item/equipping = null, var/make_sound = TRUE, var/obj/item/organ/cling_to_organ = null)
+/mob/living/carbon/human/proc/equip_augment_item(slot, obj/item/equipping = null, make_sound = TRUE, obj/item/organ/cling_to_organ = null)
if(!ishuman(src))
return 0
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index 43cef75306..3bd159a501 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -37,7 +37,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
/obj/item/organ/internal/brain/proc/can_assist()
return can_assist
-/obj/item/organ/internal/brain/proc/implant_assist(var/targ_icon_state = null)
+/obj/item/organ/internal/brain/proc/implant_assist(targ_icon_state = null)
name = "[owner.real_name]'s assisted [initial(name)]"
if(targ_icon_state)
icon_state = targ_icon_state
@@ -96,7 +96,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
QDEL_NULL(brainmob)
. = ..()
-/obj/item/organ/internal/brain/proc/transfer_identity(var/mob/living/carbon/H)
+/obj/item/organ/internal/brain/proc/transfer_identity(mob/living/carbon/H)
if(!brainmob)
brainmob = new(src)
@@ -133,7 +133,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
else
. += "This one seems particularly lifeless. Perhaps it will regain some of its luster later..."
-/obj/item/organ/internal/brain/removed(var/mob/living/user)
+/obj/item/organ/internal/brain/removed(mob/living/user)
if(name == initial(name))
name = "\the [owner.real_name]'s [initial(name)]"
@@ -150,7 +150,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
..()
-/obj/item/organ/internal/brain/replaced(var/mob/living/target)
+/obj/item/organ/internal/brain/replaced(mob/living/target)
if(target.key)
target.ghostize()
@@ -210,7 +210,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
var/mob/living/carbon/human/H = loc
color = rgb(min(H.r_skin + 40, 255), min(H.g_skin + 40, 255), min(H.b_skin + 40, 255))
-/obj/item/organ/internal/brain/slime/removed(var/mob/living/user)
+/obj/item/organ/internal/brain/slime/removed(mob/living/user)
if(istype(owner))
owner_flavor_text = owner.flavor_texts.Copy()
..()
@@ -311,12 +311,12 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
required_reagents = list(REAGENT_ID_PHORON = 40)
result_amount = 1
-/datum/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/promethean_brain_revival/can_happen(datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, /obj/item/organ/internal/brain/slime))
return ..()
return FALSE
-/datum/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/promethean_brain_revival/on_reaction(datum/reagents/holder)
var/obj/item/organ/internal/brain/slime/brain = holder.my_atom
if(brain.reviveBody())
brain.visible_message(span_notice("[brain] bubbles, surrounding itself with a rapidly expanding mass of slime!"))
diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm
index e162892660..7d174fdb4d 100644
--- a/code/modules/organs/internal/eyes.dm
+++ b/code/modules/organs/internal/eyes.dm
@@ -53,7 +53,7 @@
// Finally, update the eye icon on the mob.
owner.regenerate_icons()
-/obj/item/organ/internal/eyes/replaced(var/mob/living/carbon/human/target)
+/obj/item/organ/internal/eyes/replaced(mob/living/carbon/human/target)
// Apply our eye colour to the target.
if(istype(target) && eye_colour)
@@ -72,7 +72,7 @@
owner.b_eyes ? owner.b_eyes : 0
)
-/obj/item/organ/internal/eyes/take_damage(amount, var/silent=0)
+/obj/item/organ/internal/eyes/take_damage(amount, silent=0)
var/oldbroken = is_broken()
..()
if(is_broken() && !oldbroken && owner && !owner.stat)
@@ -100,10 +100,10 @@
owner.custom_pain("Your eyes are watering, making it harder to see clearly for a moment.",1)
owner.eye_blurry += 10
-/obj/item/organ/internal/eyes/proc/get_total_protection(var/flash_protection = FLASH_PROTECTION_NONE)
+/obj/item/organ/internal/eyes/proc/get_total_protection(flash_protection = FLASH_PROTECTION_NONE)
return (flash_protection + innate_flash_protection)
-/obj/item/organ/internal/eyes/proc/additional_flash_effects(var/intensity)
+/obj/item/organ/internal/eyes/proc/additional_flash_effects(intensity)
return -1
/obj/item/organ/internal/eyes/emp_act(severity, recursive)
diff --git a/code/modules/organs/internal/horror.dm b/code/modules/organs/internal/horror.dm
index 6e6495b653..69ad89dc8a 100644
--- a/code/modules/organs/internal/horror.dm
+++ b/code/modules/organs/internal/horror.dm
@@ -98,7 +98,7 @@
entry_vent = null
. = ..()
-/obj/item/organ/internal/intestine/horror/handle_organ_mod_special(var/removed = FALSE)
+/obj/item/organ/internal/intestine/horror/handle_organ_mod_special(removed = FALSE)
..()
if(removed)
for(var/obj/machinery/atmospherics/unary/vent_pump/v in view(7,src))
@@ -232,7 +232,7 @@
. = ..()
redspace = GLOB.all_languages[LANGUAGE_REDSPACE]
-/obj/item/organ/internal/voicebox/horror/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
+/obj/item/organ/internal/voicebox/horror/replaced(mob/living/carbon/human/target,obj/item/organ/external/affected)
..()
target.add_language(LANGUAGE_REDSPACE)
target.default_language = redspace
diff --git a/code/modules/organs/internal/voicebox.dm b/code/modules/organs/internal/voicebox.dm
index 70cd8227fa..1015aff832 100644
--- a/code/modules/organs/internal/voicebox.dm
+++ b/code/modules/organs/internal/voicebox.dm
@@ -20,7 +20,7 @@
for(var/L in will_assist_languages)
assists_languages |= GLOB.all_languages[L]
-/obj/item/organ/internal/voicebox/proc/add_assistable_langs(var/language) // Adds a new language (by string/define) to the list of things the voicebox can assist
+/obj/item/organ/internal/voicebox/proc/add_assistable_langs(language) // Adds a new language (by string/define) to the list of things the voicebox can assist
will_assist_languages |= language
amend_assist_langs() // Can't think of a better place to put this, makes the voicebox actually start to assist with the added language
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index 85fef3eea3..05a3e7f472 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -30,7 +30,7 @@
goo.basecolor = "#412464"
goo.update_icon()
-/obj/item/organ/internal/borer/removed(var/mob/living/user)
+/obj/item/organ/internal/borer/removed(mob/living/user)
..()
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index f5c502356e..733e87091a 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -62,7 +62,7 @@
/obj/item/organ/proc/update_health()
return
-/obj/item/organ/Initialize(mapload, var/internal)
+/obj/item/organ/Initialize(mapload, internal)
. = ..()
create_reagents(5)
@@ -128,7 +128,7 @@
else
meat_type = /obj/item/reagent_containers/food/snacks/meat
-/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
+/obj/item/organ/proc/set_dna(datum/dna/new_dna)
if(new_dna)
data.setup_from_dna(new_dna)
forensic_data?.clear_blooddna()
@@ -144,7 +144,7 @@
owner.can_defib = FALSE
owner.death()
-/obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead
+/obj/item/organ/proc/adjust_germ_level(amount) // Unless you're setting germ level directly to 0, use this proc instead
germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX)
/obj/item/organ/process()
@@ -325,7 +325,7 @@
/obj/item/organ/proc/remove_rejuv()
qdel(src)
-/obj/item/organ/proc/rejuvenate(var/ignore_prosthetic_prefs)
+/obj/item/organ/proc/rejuvenate(ignore_prosthetic_prefs)
damage = 0
status = 0
germ_level = 0
@@ -366,7 +366,7 @@
adjust_germ_level(-antibiotics) // You waited this long to get treated, you don't really deserve this organ
//Adds autopsy data for used_weapon.
-/obj/item/organ/proc/add_autopsy_data(var/used_weapon, var/damage)
+/obj/item/organ/proc/add_autopsy_data(used_weapon, damage)
var/datum/autopsy_data/W = autopsy_data[used_weapon]
if(!W)
W = new()
@@ -378,7 +378,7 @@
W.time_inflicted = world.time
//Note: external organs have their own version of this proc
-/obj/item/organ/take_damage(amount, var/silent=0)
+/obj/item/organ/take_damage(amount, silent=0)
if(owner)
if(SEND_SIGNAL(owner, COMSIG_INTERNAL_ORGAN_PRE_DAMAGE_APPLICATION, amount, silent) & COMPONENT_CANCEL_INTERNAL_ORGAN_DAMAGE)
return 0
@@ -436,7 +436,7 @@
if (EMP_HARMLESS)
take_damage(rand(1,3))
-/obj/item/organ/proc/removed(var/mob/living/user)
+/obj/item/organ/proc/removed(mob/living/user)
if(owner)
owner.internal_organs_by_name[organ_tag] = null
owner.internal_organs_by_name -= organ_tag
@@ -471,7 +471,7 @@
owner = null
-/obj/item/organ/proc/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
+/obj/item/organ/proc/replaced(mob/living/carbon/human/target,obj/item/organ/external/affected)
if(!istype(target)) return
@@ -549,7 +549,7 @@
return
return ..()
-/obj/item/organ/proc/can_butcher(var/obj/item/O, var/mob/living/user)
+/obj/item/organ/proc/can_butcher(obj/item/O, mob/living/user)
if(butcherable && meat_type)
if(istype(O, /obj/machinery/gibber)) // The great equalizer.
@@ -565,7 +565,7 @@
return FALSE
-/obj/item/organ/proc/butcher(var/obj/item/O, var/mob/living/user, var/atom/newtarget)
+/obj/item/organ/proc/butcher(obj/item/O, mob/living/user, atom/newtarget)
if(user)
to_chat(user, span_danger("You are preparing to butcher \the [src]!"))
@@ -606,7 +606,7 @@
return 0
return 1
-/obj/item/organ/proc/handle_organ_mod_special(var/removed = FALSE) // Called when created, transplanted, and removed.
+/obj/item/organ/proc/handle_organ_mod_special(removed = FALSE) // Called when created, transplanted, and removed.
if(!istype(owner))
return
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 9ae8b4a5e4..ded8aad31a 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -338,7 +338,7 @@
/obj/item/organ/external/update_health()
damage = min(max_damage, (brute_dam + burn_dam))
-/obj/item/organ/external/Initialize(mapload, var/internal)
+/obj/item/organ/external/Initialize(mapload, internal)
..(mapload, 0)
if(istype(owner))
replaced(owner)
@@ -349,7 +349,7 @@
if(!QDELETED(src))
get_icon()
-/obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
+/obj/item/organ/external/replaced(mob/living/carbon/human/target)
owner = target
forceMove(owner)
if(istype(owner))
@@ -376,7 +376,7 @@
DAMAGE PROCS
****************************************************/
-/obj/item/organ/external/proc/is_damageable(var/additional_damage = 0)
+/obj/item/organ/external/proc/is_damageable(additional_damage = 0)
//Continued damage to vital organs can kill you, and robot organs don't count towards total damage so no need to cap them.
return (vital || (robotic >= ORGAN_ROBOT) || brute_dam + burn_dam + additional_damage < max_damage)
@@ -589,7 +589,7 @@
return result
//Helper proc used by various tools for repairing robot limbs
-/obj/item/organ/external/proc/robo_repair(var/repair_amount, var/damage_type, var/damage_desc, obj/item/tool, mob/living/user)
+/obj/item/organ/external/proc/robo_repair(repair_amount, damage_type, damage_desc, obj/item/tool, mob/living/user)
if((src.robotic < ORGAN_ROBOT))
return 0
@@ -646,7 +646,7 @@
/*
This function completely restores a damaged organ to perfect condition.
*/
-/obj/item/organ/external/rejuvenate(var/ignore_prosthetic_prefs)
+/obj/item/organ/external/rejuvenate(ignore_prosthetic_prefs)
damage_state = "00"
status = 0
brute_dam = 0
@@ -697,7 +697,7 @@ This function completely restores a damaged organ to perfect condition.
I.remove_rejuv()
..()
-/obj/item/organ/external/proc/createwound(var/type = CUT, var/damage)
+/obj/item/organ/external/proc/createwound(type = CUT, damage)
if(damage == 0) return
//moved this before the open_wound check so that having many small wounds for example doesn't somehow protect you from taking internal damage (because of the return)
@@ -1014,7 +1014,7 @@ Note that amputating the affected organ does in fact remove the infection from t
****************************************************/
//Handles dismemberment
-/obj/item/organ/external/proc/droplimb(var/clean, var/disintegrate = DROPLIMB_EDGE, var/ignore_children = null)
+/obj/item/organ/external/proc/droplimb(clean, disintegrate = DROPLIMB_EDGE, ignore_children = null)
if(cannot_amputate || !owner)
return
@@ -1158,7 +1158,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_stump()
return 0
-/obj/item/organ/external/proc/release_restraints(var/mob/living/carbon/human/holder)
+/obj/item/organ/external/proc/release_restraints(mob/living/carbon/human/holder)
if(!holder)
holder = owner
if(!holder)
@@ -1290,7 +1290,7 @@ Note that amputating the affected organ does in fact remove the infection from t
status &= ~ORGAN_BROKEN
return 1
-/obj/item/organ/external/proc/apply_splint(var/atom/movable/splint)
+/obj/item/organ/external/proc/apply_splint(atom/movable/splint)
if(!splinted)
splinted = splint
if(!applied_pressure)
@@ -1308,7 +1308,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return 1
return 0
-/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0)
+/obj/item/organ/external/robotize(company, skip_prosthetics = 0, keep_organs = 0)
if(robotic >= ORGAN_ROBOT)
return
@@ -1390,7 +1390,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_malfunctioning()
return ((robotic >= ORGAN_ROBOT) && (brute_dam + burn_dam) >= min_broken_damage*0.83 && prob(brute_dam + burn_dam)) //VOREStation Edit - Makes robotic limb damage scalable
-/obj/item/organ/external/proc/embed(var/obj/item/W, var/silent = 0)
+/obj/item/organ/external/proc/embed(obj/item/W, silent = 0)
if(!owner || loc != owner)
return
if(SEND_SIGNAL(owner, COMSIG_EMBED_OBJECT) & COMSIG_CANCEL_EMBED) //Normally we'd let this proc continue on, but it's much less time consumptive to just do a godmode check here.
@@ -1407,7 +1407,7 @@ Note that amputating the affected organ does in fact remove the infection from t
H.drop_from_inventory(W)
W.loc = owner
-/obj/item/organ/external/removed(var/mob/living/user, var/ignore_children = 0)
+/obj/item/organ/external/removed(mob/living/user, ignore_children = 0)
if(!owner)
return
var/is_robotic = robotic >= ORGAN_ROBOT
@@ -1468,7 +1468,7 @@ Note that amputating the affected organ does in fact remove the infection from t
victim.refresh_modular_limb_verbs()
victim.update_icons_body()
-/obj/item/organ/external/proc/disfigure(var/type = "brute")
+/obj/item/organ/external/proc/disfigure(type = "brute")
if (disfigured)
return
if(owner)
@@ -1574,7 +1574,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return english_list(flavor_text)
// Returns a list of the clothing (not glasses) that are covering this part
-/obj/item/organ/external/proc/get_covering_clothing(var/target_covering) // target_covering checks for mouth/eye coverage
+/obj/item/organ/external/proc/get_covering_clothing(target_covering) // target_covering checks for mouth/eye coverage
var/list/covering_clothing = list()
if(!target_covering)
@@ -1599,7 +1599,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(!istype(I,/obj/item/implant) && !istype(I,/obj/item/nif)) //VOREStation Add - NIFs
return 1
-/obj/item/organ/external/proc/is_hidden_by_sprite_accessory(var/clothing_only = FALSE) // Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself.
+/obj/item/organ/external/proc/is_hidden_by_sprite_accessory(clothing_only = FALSE) // Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself.
if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
return 1
if(clothing_only && markings.len)
diff --git a/code/modules/organs/organ_external_vr.dm b/code/modules/organs/organ_external_vr.dm
index a49cfca980..5a852922ba 100644
--- a/code/modules/organs/organ_external_vr.dm
+++ b/code/modules/organs/organ_external_vr.dm
@@ -1,5 +1,5 @@
//Sideways override for nanoform limbs (ugh)
-/obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
+/obj/item/organ/external/robotize(company, skip_prosthetics = FALSE, keep_organs = FALSE)
var/original_robotic = robotic
if(original_robotic >= ORGAN_NANOFORM)
var/o_encased = encased
@@ -14,5 +14,5 @@
else
return ..()
-/obj/item/organ/external/digitize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE)
+/obj/item/organ/external/digitize(company, skip_prosthetics = FALSE, keep_organs = FALSE)
robotize(company, skip_prosthetics, keep_organs)
diff --git a/code/modules/organs/organ_icon.dm b/code/modules/organs/organ_icon.dm
index 74415ace01..179f266e6f 100644
--- a/code/modules/organs/organ_icon.dm
+++ b/code/modules/organs/organ_icon.dm
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
add_overlay(child.mob_icon)
add_overlay(organ.mob_icon)
-/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
+/obj/item/organ/external/proc/sync_colour_to_human(mob/living/carbon/human/human)
s_tone = null
s_col = null
h_col = null
@@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
s_col = data.skin_color.Copy()
h_col = data.hair_color.Copy()
-/obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/human)
+/obj/item/organ/external/head/sync_colour_to_human(mob/living/carbon/human/human)
..()
if(owner)
@@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
return res
-/obj/item/organ/external/proc/get_icon(var/skeletal, var/can_apply_transparency = TRUE)
+/obj/item/organ/external/proc/get_icon(skeletal, can_apply_transparency = TRUE)
var/digitigrade = 0
cut_overlays()
@@ -171,7 +171,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
icon = mob_icon
return mob_icon
-/obj/item/organ/external/proc/apply_colouration(var/icon/applying)
+/obj/item/organ/external/proc/apply_colouration(icon/applying)
if(transparent)
applying.MapColors("#4D4D4D","#969696","#1C1C1C", "#000000")
@@ -218,7 +218,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
GLOBAL_LIST_INIT(flesh_hud_colours, list("#02BA08","#9ECF19","#DEDE10","#FFAA00","#FF0000","#AA0000","#660000"))
GLOBAL_LIST_INIT(robot_hud_colours, list("#CFCFCF","#AFAFAF","#8F8F8F","#6F6F6F","#4F4F4F","#2F2F2F","#000000"))
-/obj/item/organ/external/proc/get_damage_hud_image(var/min_dam_state)
+/obj/item/organ/external/proc/get_damage_hud_image(min_dam_state)
// Generate the greyscale base icon and cache it for later.
// icon_cache_key is set by any get_icon() calls that are made.
diff --git a/code/modules/organs/organ_stump.dm b/code/modules/organs/organ_stump.dm
index 79d77b9533..a80131af07 100644
--- a/code/modules/organs/organ_stump.dm
+++ b/code/modules/organs/organ_stump.dm
@@ -3,7 +3,7 @@
icon_name = ""
dislocated = -1
-/obj/item/organ/external/stump/Initialize(mapload, var/internal, var/obj/item/organ/external/limb)
+/obj/item/organ/external/stump/Initialize(mapload, internal, obj/item/organ/external/limb)
if(istype(limb))
organ_tag = limb.organ_tag
body_part = limb.body_part
diff --git a/code/modules/organs/subtypes/diona.dm b/code/modules/organs/subtypes/diona.dm
index 64f9b4f8d4..d444f4c3dc 100644
--- a/code/modules/organs/subtypes/diona.dm
+++ b/code/modules/organs/subtypes/diona.dm
@@ -1,4 +1,4 @@
-/proc/spawn_diona_nymph(var/turf/target)
+/proc/spawn_diona_nymph(turf/target)
if(!istype(target))
return 0
@@ -141,7 +141,7 @@
icon_state = "nymph"
organ_tag = "special" // Turns into a nymph instantly, no transplanting possible.
-/obj/item/organ/internal/diona/removed(var/mob/living/user, var/skip_nymph)
+/obj/item/organ/internal/diona/removed(mob/living/user, skip_nymph)
if(robotic >= ORGAN_ROBOT)
return ..()
var/mob/living/carbon/human/H = owner
@@ -192,7 +192,7 @@
icon = 'icons/mob/alien.dmi'
icon_state = "claw"
-/obj/item/organ/internal/diona/nutrients/removed(var/mob/user)
+/obj/item/organ/internal/diona/nutrients/removed(mob/user)
return ..(user, 1)
/obj/item/organ/internal/diona/node
@@ -225,7 +225,7 @@
/obj/item/organ/internal/brain/cephalon/digitize()
return
-/obj/item/organ/internal/brain/cephalon/removed(var/mob/living/user, var/skip_nymph)
+/obj/item/organ/internal/brain/cephalon/removed(mob/living/user, skip_nymph)
if(robotic >= ORGAN_ROBOT)
return ..()
var/mob/living/carbon/human/H = owner
diff --git a/code/modules/organs/subtypes/machine.dm b/code/modules/organs/subtypes/machine.dm
index c04f97cd6a..066e24802e 100644
--- a/code/modules/organs/subtypes/machine.dm
+++ b/code/modules/organs/subtypes/machine.dm
@@ -48,7 +48,7 @@
stored_mmi = null
return ..()
-/obj/item/organ/internal/mmi_holder/Initialize(mapload, var/internal, var/obj/item/mmi/installed)
+/obj/item/organ/internal/mmi_holder/Initialize(mapload, internal, obj/item/mmi/installed)
. = ..(mapload, internal)
if(!ishuman(loc) || ismannequin(loc))
return
@@ -97,7 +97,7 @@
GLOB.living_mob_list |= owner
owner.visible_message(span_danger("\The [owner] twitches visibly!"))
-/obj/item/organ/internal/mmi_holder/removed(var/mob/living/user)
+/obj/item/organ/internal/mmi_holder/removed(mob/living/user)
if(stored_mmi)
. = stored_mmi //VOREStation Code
diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm
index 06a42a3e30..7a798f63b2 100644
--- a/code/modules/organs/subtypes/nano.dm
+++ b/code/modules/organs/subtypes/nano.dm
@@ -126,12 +126,12 @@
. = ..()
icon_state = "refactory"
-/obj/item/organ/internal/nano/refactory/proc/get_stored_material(var/material)
+/obj/item/organ/internal/nano/refactory/proc/get_stored_material(material)
if(status & ORGAN_DEAD)
return 0
return materials[material] || 0
-/obj/item/organ/internal/nano/refactory/proc/add_stored_material(var/material,var/amt)
+/obj/item/organ/internal/nano/refactory/proc/add_stored_material(material,amt)
if(status & ORGAN_DEAD)
return 0
var/increase = min(amt,max(max_storage-materials[material],0))
@@ -142,7 +142,7 @@
return increase
-/obj/item/organ/internal/nano/refactory/proc/use_stored_material(var/material,var/amt)
+/obj/item/organ/internal/nano/refactory/proc/use_stored_material(material,amt)
if(status & ORGAN_DEAD)
return 0
diff --git a/code/modules/organs/subtypes/slime.dm b/code/modules/organs/subtypes/slime.dm
index 4171543588..bcb7b48937 100644
--- a/code/modules/organs/subtypes/slime.dm
+++ b/code/modules/organs/subtypes/slime.dm
@@ -97,7 +97,7 @@
var/mob/living/carbon/human/H = loc
color = H.species.get_blood_colour(H)
-/obj/item/organ/internal/regennetwork/proc/get_strain_percent(var/cost)
+/obj/item/organ/internal/regennetwork/proc/get_strain_percent(cost)
adjust_strain(cost)
if((status & ORGAN_CUT_AWAY) || (status & ORGAN_BROKEN) || (status & ORGAN_DEAD))
@@ -105,7 +105,7 @@
return round((strain / min_broken_damage) * 10) / 10
-/obj/item/organ/internal/regennetwork/proc/adjust_strain(var/amount)
+/obj/item/organ/internal/regennetwork/proc/adjust_strain(amount)
if(amount < 0 && world.time < (last_strain_increase + strain_regen_cooldown))
return
diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm
index a3d2b738ca..5f7bbdab94 100644
--- a/code/modules/organs/subtypes/standard.dm
+++ b/code/modules/organs/subtypes/standard.dm
@@ -297,7 +297,7 @@
cannot_gib = FALSE
return ..()
-/obj/item/organ/external/head/robotize(var/company, var/skip_prosthetics, var/keep_organs)
+/obj/item/organ/external/head/robotize(company, skip_prosthetics, keep_organs)
. = ..(company, skip_prosthetics, 1)
if(model)
var/datum/robolimb/robohead = GLOB.all_robolimbs[model]
@@ -349,7 +349,7 @@
span_notice("You make \the [I] kiss \the [src]!."))
return ..()
-/obj/item/organ/external/head/get_icon(var/skeletal, var/can_apply_transparency = TRUE)
+/obj/item/organ/external/head/get_icon(skeletal, can_apply_transparency = TRUE)
..()
//The overlays are not drawn on the mob, they are used for if the head is removed and becomes an item
diff --git a/code/modules/organs/subtypes/xenos.dm b/code/modules/organs/subtypes/xenos.dm
index 8e8c4e3fb7..1230a3c204 100644
--- a/code/modules/organs/subtypes/xenos.dm
+++ b/code/modules/organs/subtypes/xenos.dm
@@ -49,7 +49,7 @@
adjust_plasma(1)
-/obj/item/organ/internal/xenos/plasmavessel/proc/adjust_plasma(var/amount = 0)
+/obj/item/organ/internal/xenos/plasmavessel/proc/adjust_plasma(amount = 0)
stored_plasma = CLAMP(stored_plasma + amount, 0, max_plasma)
/obj/item/organ/internal/xenos/plasmavessel/grey
@@ -109,11 +109,11 @@
icon_state = "xenode"
organ_tag = O_HIVE
-/obj/item/organ/internal/xenos/hivenode/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
+/obj/item/organ/internal/xenos/hivenode/replaced(mob/living/carbon/human/target,obj/item/organ/external/affected)
..()
target.add_language(LANGUAGE_HIVEMIND) //You need this to speak the language, so...
-/obj/item/organ/internal/xenos/hivenode/removed(var/mob/living/user)
+/obj/item/organ/internal/xenos/hivenode/removed(mob/living/user)
if(ishuman(user))
var/mob/living/carbon/human/human = user
human.remove_language(LANGUAGE_HIVEMIND)
diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm
index 1cd6b41eff..1215bc605d 100644
--- a/code/modules/organs/wound.dm
+++ b/code/modules/organs/wound.dm
@@ -53,7 +53,7 @@
var/tmp/list/desc_list = list()
var/tmp/list/damage_list = list()
-/datum/wound/New(var/damage)
+/datum/wound/New(damage)
created = world.time
@@ -71,7 +71,7 @@
bleed_timer += damage
// returns 1 if there's a next stage, 0 otherwise
-/datum/wound/proc/init_stage(var/initial_damage)
+/datum/wound/proc/init_stage(initial_damage)
current_stage = stages.len
while(src.current_stage > 1 && src.damage_list[current_stage-1] <= initial_damage / src.amount)
@@ -100,7 +100,7 @@
return salved
// Checks whether other other can be merged into src.
-/datum/wound/proc/can_merge(var/datum/wound/other)
+/datum/wound/proc/can_merge(datum/wound/other)
if (other.type != src.type) return 0
if (other.current_stage != src.current_stage) return 0
if (other.damage_type != src.damage_type) return 0
@@ -112,7 +112,7 @@
//if (other.germ_level != src.germ_level) return 0
return 1
-/datum/wound/proc/merge_wound(var/datum/wound/other)
+/datum/wound/proc/merge_wound(datum/wound/other)
src.damage += other.damage
src.amount += other.amount
src.bleed_timer += other.bleed_timer
@@ -223,7 +223,7 @@
//the damage amount for the stage with the same name as the wound.
//e.g. /datum/wound/cut/deep should only be applied for 15 damage and up,
//because in it's stages list, "deep cut" = 15.
-/proc/get_wound_type(var/type = CUT, var/damage)
+/proc/get_wound_type(type = CUT, damage)
switch(type)
if(CUT)
switch(damage)
@@ -373,7 +373,7 @@
/** EXTERNAL ORGAN LOSS **/
/datum/wound/lost_limb
-/datum/wound/lost_limb/New(var/obj/item/organ/external/lost_limb, var/losstype, var/clean)
+/datum/wound/lost_limb/New(obj/item/organ/external/lost_limb, losstype, clean)
var/damage_amt = lost_limb.max_damage
if(clean) damage_amt *= 0.25
@@ -407,5 +407,5 @@
..(damage_amt)
-/datum/wound/lost_limb/can_merge(var/datum/wound/other)
+/datum/wound/lost_limb/can_merge(datum/wound/other)
return 0 //cannot be merged
diff --git a/code/modules/overmap/OM_sound.dm b/code/modules/overmap/OM_sound.dm
index f034bc07fa..1a9d0415eb 100644
--- a/code/modules/overmap/OM_sound.dm
+++ b/code/modules/overmap/OM_sound.dm
@@ -1,11 +1,11 @@
-/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)
if(potential_mob.z in enterer.map_z)
SEND_SOUND(potential_mob, 'sound/ambience/approaching_planet.ogg')
-/obj/effect/overmap/visitable/planet/Crossed(var/obj/effect/overmap/visitable/ship/enterer) //CHOMPedit, lazy copy-paste
+/obj/effect/overmap/visitable/planet/Crossed(obj/effect/overmap/visitable/ship/enterer) //CHOMPedit, lazy copy-paste
. = ..()
if(istype(enterer))
for(var/mob/potential_mob as anything in GLOB.player_list)
diff --git a/code/modules/overmap/bluespace_rift_vr.dm b/code/modules/overmap/bluespace_rift_vr.dm
index 1a2d078470..bf44a15551 100644
--- a/code/modules/overmap/bluespace_rift_vr.dm
+++ b/code/modules/overmap/bluespace_rift_vr.dm
@@ -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")
diff --git a/code/modules/overmap/champagne.dm b/code/modules/overmap/champagne.dm
index d16636755c..4346dd987b 100644
--- a/code/modules/overmap/champagne.dm
+++ b/code/modules/overmap/champagne.dm
@@ -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!
diff --git a/code/modules/overmap/events/event_handler.dm b/code/modules/overmap/events/event_handler.dm
index 08d6c7c216..663720cf40 100644
--- a/code/modules/overmap/events/event_handler.dm
+++ b/code/modules/overmap/events/event_handler.dm
@@ -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))
diff --git a/code/modules/overmap/helpers.dm b/code/modules/overmap/helpers.dm
index bf4e7396ab..65969c7c47 100644
--- a/code/modules/overmap/helpers.dm
+++ b/code/modules/overmap/helpers.dm
@@ -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
diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm
index ea718004c6..da44900b71 100644
--- a/code/modules/overmap/overmap_object.dm
+++ b/code/modules/overmap/overmap_object.dm
@@ -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)
diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm
index e05930021a..60b9840dab 100644
--- a/code/modules/overmap/overmap_shuttle.dm
+++ b/code/modules/overmap/overmap_shuttle.dm
@@ -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
diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm
index 33ef8f5daa..08b2e3a4e5 100644
--- a/code/modules/overmap/sectors.dm
+++ b/code/modules/overmap/sectors.dm
@@ -120,7 +120,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) //
@@ -231,7 +231,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)
@@ -268,7 +268,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.
diff --git a/code/modules/overmap/ships/computers/computer_shims.dm b/code/modules/overmap/ships/computers/computer_shims.dm
index 449f3bd4be..78533a8f54 100644
--- a/code/modules/overmap/ships/computers/computer_shims.dm
+++ b/code/modules/overmap/ships/computers/computer_shims.dm
@@ -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
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index 85c172fbac..a6a52fa3c9 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -80,7 +80,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
diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm
index b40c8f0797..6df3f6717d 100644
--- a/code/modules/overmap/ships/computers/sensors.dm
+++ b/code/modules/overmap/ships/computers/sensors.dm
@@ -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())
..()
diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm
index faa0a7da20..a57250e583 100644
--- a/code/modules/overmap/ships/computers/ship.dm
+++ b/code/modules/overmap/ships/computers/ship.dm
@@ -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
diff --git a/code/modules/overmap/ships/computers/ship_vr.dm b/code/modules/overmap/ships/computers/ship_vr.dm
index b317eb3c1e..efaaffdca7 100644
--- a/code/modules/overmap/ships/computers/ship_vr.dm
+++ b/code/modules/overmap/ships/computers/ship_vr.dm
@@ -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()
diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm
index 8f46266d3d..9ff3175e77 100644
--- a/code/modules/overmap/ships/computers/shuttle.dm
+++ b/code/modules/overmap/ships/computers/shuttle.dm
@@ -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
diff --git a/code/modules/overmap/ships/engines/engine.dm b/code/modules/overmap/ships/engines/engine.dm
index f5817a18e9..b7ffcd30fe 100644
--- a/code/modules/overmap/ships/engines/engine.dm
+++ b/code/modules/overmap/ships/engines/engine.dm
@@ -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()
diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm
index 7aa4d5a10b..d2e28a65c5 100644
--- a/code/modules/overmap/ships/engines/gas_thruster.dm
+++ b/code/modules/overmap/ships/engines/gas_thruster.dm
@@ -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"
diff --git a/code/modules/overmap/ships/engines/ion_thruster.dm b/code/modules/overmap/ships/engines/ion_thruster.dm
index 470914d996..843fa7b6d6 100644
--- a/code/modules/overmap/ships/engines/ion_thruster.dm
+++ b/code/modules/overmap/ships/engines/ion_thruster.dm
@@ -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()
diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm
index 820ef00602..bf86e219d6 100644
--- a/code/modules/overmap/ships/landable.dm
+++ b/code/modules/overmap/ships/landable.dm
@@ -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
..()
diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm
index 65fbad27d2..220b0334bc 100644
--- a/code/modules/overmap/spacetravel.dm
+++ b/code/modules/overmap/spacetravel.dm
@@ -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
diff --git a/code/modules/overmap/turfs.dm b/code/modules/overmap/turfs.dm
index 498bf8bfd4..1333eecd11 100644
--- a/code/modules/overmap/turfs.dm
+++ b/code/modules/overmap/turfs.dm
@@ -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)
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index af92623090..6fa1824551 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -319,7 +319,7 @@ Extracted to its own procedure for easier logic handling with paper bundles.
return ..()
-/obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination)
+/obj/machinery/photocopier/faxmachine/proc/sendfax(destination)
if(stat & (BROKEN|NOPOWER))
return
@@ -336,7 +336,7 @@ Extracted to its own procedure for easier logic handling with paper bundles.
else
visible_message("[src] beeps, \"Error transmitting message.\"")
-/obj/machinery/photocopier/faxmachine/proc/receivefax(var/obj/item/incoming)
+/obj/machinery/photocopier/faxmachine/proc/receivefax(obj/item/incoming)
if(stat & (BROKEN|NOPOWER))
return 0
@@ -362,7 +362,7 @@ Extracted to its own procedure for easier logic handling with paper bundles.
use_power(active_power_usage)
return 1
-/obj/machinery/photocopier/faxmachine/proc/send_admin_fax(var/mob/sender, var/destination)
+/obj/machinery/photocopier/faxmachine/proc/send_admin_fax(mob/sender, destination)
if(stat & (BROKEN|NOPOWER))
return
@@ -417,7 +417,7 @@ Extracted to its own procedure for easier logic handling with paper bundles.
. += "PAGE [i] - [P.name]
"
. += P.info
-/obj/machinery/photocopier/faxmachine/proc/message_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100")
+/obj/machinery/photocopier/faxmachine/proc/message_admins(mob/sender, faxname, obj/item/sent, reply_type, font_colour="#006100")
var/msg = "[faxname]: [get_options_bar(sender, 2,1,1)]"
msg += "(REPLY)"
msg = span_bold(msg) + ": "
@@ -493,7 +493,7 @@ Extracted to its own procedure for easier logic handling with paper bundles.
/**
* Call the chat webhook to transmit a notification of an admin fax to the admin chat.
*/
-/obj/machinery/photocopier/faxmachine/proc/message_chat_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/faxid, font_colour="#006100")
+/obj/machinery/photocopier/faxmachine/proc/message_chat_admins(mob/sender, faxname, obj/item/sent, faxid, font_colour="#006100")
if (CONFIG_GET(string/chat_webhook_url))
spawn(0)
var/query_string = "type=fax"
@@ -511,7 +511,7 @@ Extracted to its own procedure for easier logic handling with paper bundles.
/**
* Call the chat webhook to transmit a notification of a job request
*/
-/obj/machinery/photocopier/faxmachine/proc/message_chat_rolerequest(var/font_colour="#006100", var/role_to_ping, var/reason, var/jobname)
+/obj/machinery/photocopier/faxmachine/proc/message_chat_rolerequest(font_colour="#006100", role_to_ping, reason, jobname)
if(CONFIG_GET(string/chat_webhook_url))
spawn(0)
var/query_string = "type=rolerequest"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 841907bba5..8b26279414 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -97,7 +97,7 @@
return
-/obj/item/paper/Initialize(mapload, var/text, var/title)
+/obj/item/paper/Initialize(mapload, text, title)
. = ..()
if(istext(title))
@@ -138,7 +138,7 @@
return
icon_state = "paper"
-/obj/item/paper/proc/update_space(var/new_text)
+/obj/item/paper/proc/update_space(new_text)
if(!new_text)
return
@@ -151,7 +151,7 @@
else
. += span_notice("You have to go closer if you want to read it.")
-/obj/item/paper/proc/show_content(var/mob/user, var/forceshow=0)
+/obj/item/paper/proc/show_content(mob/user, forceshow=0)
if(!(forceshow || (ishuman(user) || isobserver(user) || issilicon(user) || (istype(user) && user.universal_understand))))
user << browse("[name][stars(info)][stamps]", "window=[name]")
onclose(user, "[name]")
@@ -203,7 +203,7 @@
spam_flag = 0
return
-/obj/item/paper/attack_ai(var/mob/living/silicon/ai/user)
+/obj/item/paper/attack_ai(mob/living/silicon/ai/user)
var/dist
if(istype(user) && user.camera) //is AI
dist = get_dist(src, user.camera)
@@ -251,7 +251,7 @@
update_space(info)
updateinfolinks()
-/obj/item/paper/proc/addtofield(var/id, var/text, var/links = 0)
+/obj/item/paper/proc/addtofield(id, text, links = 0)
var/locid = 0
var/laststart = 1
var/textindex = 1
@@ -305,12 +305,12 @@
updateinfolinks()
update_icon()
-/obj/item/paper/proc/get_signature(var/obj/item/pen/P, mob/user as mob)
+/obj/item/paper/proc/get_signature(obj/item/pen/P, mob/user as mob)
if(P && istype(P, /obj/item/pen))
return P.get_signature(user)
return (user && user.real_name) ? user.real_name : "Anonymous"
-/obj/item/paper/proc/parsepencode(var/t, var/obj/item/pen/P, mob/user as mob, var/iscrayon = 0)
+/obj/item/paper/proc/parsepencode(t, obj/item/pen/P, mob/user as mob, iscrayon = 0)
// t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
t = replacetext(t, "\[center\]", "")
@@ -507,7 +507,7 @@
update_icon()
-/obj/item/paper/get_worn_icon_state(var/slot_name)
+/obj/item/paper/get_worn_icon_state(slot_name)
if(slot_name == slot_head_str)
return "paper" //Gross, but required for now.
return ..()
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 0492fdeb57..04a8e2d652 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -58,7 +58,7 @@
add_fingerprint(user)
return
-/obj/item/paper_bundle/proc/insert_sheet_at(mob/user, var/index, obj/item/sheet)
+/obj/item/paper_bundle/proc/insert_sheet_at(mob/user, index, obj/item/sheet)
if(istype(sheet, /obj/item/paper))
to_chat(user, span_notice("You add [(sheet.name == "paper") ? "the paper" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]."))
else if(istype(sheet, /obj/item/photo))
diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm
index afa6e20d00..8b7c668f08 100644
--- a/code/modules/paperwork/paper_sticky.dm
+++ b/code/modules/paperwork/paper_sticky.dm
@@ -23,7 +23,7 @@
if(written_text)
icon_state = "[icon_state]_writing"
-/obj/item/sticky_pad/attackby(var/obj/item/thing, var/mob/user)
+/obj/item/sticky_pad/attackby(obj/item/thing, mob/user)
if(istype(thing, /obj/item/pen))
if(jobban_isbanned(user, JOB_GRAFFITI))
@@ -47,12 +47,12 @@
return
..()
-/obj/item/sticky_pad/examine(var/mob/user)
+/obj/item/sticky_pad/examine(mob/user)
. = ..()
if(.)
to_chat(user, span_notice("It has [papers] sticky note\s left."))
-/obj/item/sticky_pad/attack_hand(var/mob/user)
+/obj/item/sticky_pad/attack_hand(mob/user)
var/obj/item/paper/paper = new paper_type(get_turf(src))
paper.set_content(written_text, "sticky note")
paper.last_modified_ckey = written_by
@@ -121,7 +121,7 @@
if(!istype(loc, /turf))
reset_persistence_tracking()
-/obj/item/paper/sticky/afterattack(var/A, var/mob/user, var/flag, var/params)
+/obj/item/paper/sticky/afterattack(A, mob/user, flag, params)
if(!in_range(user, A) || istype(A, /obj/machinery/door) || icon_state == "scrap")
return
diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm
index 182b27fa98..01fabe1c60 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -31,7 +31,7 @@
update_icon()
AddElement(/datum/element/climbable)
-/obj/machinery/papershredder/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/papershredder/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/storage))
empty_bin(user, W)
@@ -88,7 +88,7 @@
empty_bin(usr)
-/obj/machinery/papershredder/proc/empty_bin(var/mob/living/user, var/obj/item/storage/empty_into)
+/obj/machinery/papershredder/proc/empty_bin(mob/living/user, obj/item/storage/empty_into)
// Sanity.
if(empty_into && !istype(empty_into))
@@ -156,13 +156,13 @@
pixel_y = rand(-5,5)
if(prob(65)) color = pick("#BABABA","#7F7F7F")
-/obj/item/shreddedp/attackby(var/obj/item/W as obj, var/mob/user)
+/obj/item/shreddedp/attackby(obj/item/W as obj, mob/user)
if(istype(W, /obj/item/flame/lighter))
burnpaper(W, user)
else
..()
-/obj/item/shreddedp/proc/burnpaper(var/obj/item/flame/lighter/P, var/mob/user)
+/obj/item/shreddedp/proc/burnpaper(obj/item/flame/lighter/P, mob/user)
if(user.restrained())
return
if(!P.lit)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index c5b2e6a6ed..dbdd536bf5 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -298,10 +298,10 @@
*/
signature = tgui_input_text(user, "Enter new signature. Leave blank for 'Anonymous'", "New Signature", signature, MAX_MESSAGE_LEN)
-/obj/item/pen/proc/get_signature(var/mob/user)
+/obj/item/pen/proc/get_signature(mob/user)
return (user && user.real_name) ? user.real_name : "Anonymous"
-/obj/item/pen/chameleon/get_signature(var/mob/user)
+/obj/item/pen/chameleon/get_signature(mob/user)
return signature ? signature : "Anonymous"
/obj/item/pen/chameleon/verb/set_colour()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 13531b5b8f..c52a6e5f18 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -97,7 +97,7 @@
toner -= 5
. = TRUE
-/obj/machinery/photocopier/proc/copy_operation(var/mob/user)
+/obj/machinery/photocopier/proc/copy_operation(mob/user)
if(copying)
return FALSE
copying = TRUE
@@ -193,7 +193,7 @@
toner = 0
return
-/obj/machinery/photocopier/proc/copy(var/obj/item/paper/copy, var/need_toner=1)
+/obj/machinery/photocopier/proc/copy(obj/item/paper/copy, need_toner=1)
var/obj/item/paper/c = new /obj/item/paper (loc)
if(toner > 10) //lots of toner, make it dark
c.info = ""
@@ -234,7 +234,7 @@
return c
-/obj/machinery/photocopier/proc/photocopy(var/obj/item/photo/photocopy, var/need_toner=1)
+/obj/machinery/photocopier/proc/photocopy(obj/item/photo/photocopy, need_toner=1)
var/obj/item/photo/p = photocopy.copy()
p.loc = src.loc
@@ -348,7 +348,7 @@
// VOREStation Edit Stop
//If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner
-/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/paper_bundle/bundle, var/need_toner=1)
+/obj/machinery/photocopier/proc/bundlecopy(obj/item/paper_bundle/bundle, need_toner=1)
var/obj/item/paper_bundle/p = new /obj/item/paper_bundle (src)
for(var/obj/item/W in bundle.pages)
if(toner <= 0 && need_toner)
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 0c9a7d9cbc..6a0376b3d3 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -318,7 +318,7 @@ GLOBAL_VAR_INIT(photo_count, 0)
if(!user.get_inactive_hand())
user.put_in_inactive_hand(p)
-/obj/item/photo/proc/copy(var/copy_id = 0)
+/obj/item/photo/proc/copy(copy_id = 0)
var/obj/item/photo/p = new/obj/item/photo()
p.name = name
diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm
index ac43bbde06..b192b9a077 100644
--- a/code/modules/paperwork/silicon_photography.dm
+++ b/code/modules/paperwork/silicon_photography.dm
@@ -19,7 +19,7 @@
QDEL_LIST(aipictures)
. = ..()
-/obj/item/camera/siliconcam/proc/injectaialbum(obj/item/photo/p, var/sufix = "") //stores image information to a list similar to that of the datacore
+/obj/item/camera/siliconcam/proc/injectaialbum(obj/item/photo/p, sufix = "") //stores image information to a list similar to that of the datacore
p.loc = src
photos_taken++
p.name = "Image [photos_taken][sufix]"
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index b7dbdf42ee..bee3014c55 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -277,7 +277,7 @@ GLOBAL_LIST_INIT(civilian_cartridges, list(
if(istype(D))
D.remote_door_id = initial_remote_door_id
-/obj/item/cartridge/proc/post_status(var/command, var/data1, var/data2)
+/obj/item/cartridge/proc/post_status(command, data1, data2)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency) return
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index a3853fba8a..49b673411a 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -30,7 +30,7 @@
post_status(params["statdisp"])
return TRUE
-/datum/data/pda/app/status_display/proc/post_status(var/command, var/data1, var/data2)
+/datum/data/pda/app/status_display/proc/post_status(command, data1, data2)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency)
return
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index 11cd2d179f..080eb339be 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -186,7 +186,7 @@
to_chat(user, span_notice("You must be holding paper for the pda to print to!"))
-/datum/data/pda/app/notekeeper/proc/changetonote(var/noteindex)
+/datum/data/pda/app/notekeeper/proc/changetonote(noteindex)
// save note to current slot, then load another slot
storednotes[currentnote] = note
storedtitles[currentnote] = notetitle
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index ed47ec8384..79f2305683 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -123,7 +123,7 @@
active_conversation = href_list["target"]
-/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/pda/P)
+/datum/data/pda/app/messenger/proc/create_message(mob/living/U, obj/item/pda/P)
var/t = tgui_input_text(U, "Please enter message", name, null, MAX_MESSAGE_LEN)
if(!t)
return
diff --git a/code/modules/pda/nerdle.dm b/code/modules/pda/nerdle.dm
index a6cc79d373..9333978b29 100644
--- a/code/modules/pda/nerdle.dm
+++ b/code/modules/pda/nerdle.dm
@@ -24,7 +24,7 @@
. = ..()
target_word = SSnerdle.target_word
-/datum/data/pda/app/nerdle/proc/try_guess(var/guess)
+/datum/data/pda/app/nerdle/proc/try_guess(guess)
if(completed)
return FALSE
@@ -54,7 +54,7 @@
/datum/data/pda/app/nerdle/proc/report_guesses()
SSnerdle.report_winner_or_loser(LAZYLEN(guesses),failure)
-/datum/data/pda/app/nerdle/proc/serialize_guess(var/guess)
+/datum/data/pda/app/nerdle/proc/serialize_guess(guess)
// We assume that there's 5 letters here, both for the guess and the target word.
// If we're getting runtimes and someone forwarded "butt" to here I'm going to smite them down.
var/list/out[5]
diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm
index 736b0f178c..e8c9db2c50 100644
--- a/code/modules/pda/pda.dm
+++ b/code/modules/pda/pda.dm
@@ -221,7 +221,7 @@
for(var/datum/data/pda/P as anything in programs)
P.pda = src
-/obj/item/pda/proc/detonate_act(var/obj/item/pda/P)
+/obj/item/pda/proc/detonate_act(obj/item/pda/P)
//TODO: sometimes these attacks show up on the message server
var/i = rand(1,100)
var/j = rand(0,1) //Possibility of losing the PDA after the detonation
diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm
index 637181179f..4ab79b0be7 100644
--- a/code/modules/pda/radio.dm
+++ b/code/modules/pda/radio.dm
@@ -33,7 +33,7 @@
hostpda = null
return ..()
-/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter)
+/obj/item/radio/integrated/proc/post_signal(freq, key, value, key2, value2, key3, value3, s_filter)
//to_world("Post: [freq]: [key]=[value], [key2]=[value2]")
var/datum/radio_frequency/frequency = SSradio.return_frequency(freq)
diff --git a/code/modules/persistence/datum/persistence_datum.dm b/code/modules/persistence/datum/persistence_datum.dm
index ddbe532186..a8d4253c09 100644
--- a/code/modules/persistence/datum/persistence_datum.dm
+++ b/code/modules/persistence/datum/persistence_datum.dm
@@ -28,14 +28,14 @@
tokens -= token
ProcessAndApplyTokens(tokens)
-/datum/persistent/proc/GetValidTurf(var/turf/T, var/list/token)
+/datum/persistent/proc/GetValidTurf(turf/T, list/token)
if(T && CheckTurfContents(T, token))
return T
-/datum/persistent/proc/CheckTurfContents(var/turf/T, var/list/token)
+/datum/persistent/proc/CheckTurfContents(turf/T, list/token)
return TRUE
-/datum/persistent/proc/CheckTokenSanity(var/list/token)
+/datum/persistent/proc/CheckTokenSanity(list/token)
return ( \
!isnull(token["x"]) && \
!isnull(token["y"]) && \
@@ -45,10 +45,10 @@
)
// Restores saved data to world
-/datum/persistent/proc/CreateEntryInstance(var/turf/creating, var/list/token)
+/datum/persistent/proc/CreateEntryInstance(turf/creating, list/token)
return
-/datum/persistent/proc/ProcessAndApplyTokens(var/list/tokens)
+/datum/persistent/proc/ProcessAndApplyTokens(list/tokens)
// If it's old enough we start to trim down any textual information and scramble strings.
for(var/list/token in tokens)
@@ -76,7 +76,7 @@
if(.)
CreateEntryInstance(., token)
-/datum/persistent/proc/IsValidEntry(var/atom/entry)
+/datum/persistent/proc/IsValidEntry(atom/entry)
if(!istype(entry))
return FALSE
if(GetEntryAge(entry) >= entries_expire_at)
@@ -89,10 +89,10 @@
return FALSE
return TRUE
-/datum/persistent/proc/GetEntryAge(var/atom/entry)
+/datum/persistent/proc/GetEntryAge(atom/entry)
return 0
-/datum/persistent/proc/CompileEntry(var/atom/entry)
+/datum/persistent/proc/CompileEntry(atom/entry)
var/turf/T = get_turf(entry)
return list(
"x" = T.x,
@@ -114,10 +114,10 @@
if(to_store.len)
to_file(file(filename), json_encode(to_store))
-/datum/persistent/proc/RemoveValue(var/atom/value)
+/datum/persistent/proc/RemoveValue(atom/value)
qdel(value)
-/datum/persistent/proc/GetAdminSummary(var/mob/user, var/can_modify)
+/datum/persistent/proc/GetAdminSummary(mob/user, can_modify)
var/list/my_tracks = SSpersistence.tracking_values[type]
if(!my_tracks?.len)
return
@@ -133,13 +133,13 @@
. += "
| "
-/datum/persistent/proc/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user)
+/datum/persistent/proc/GetAdminDataStringFor(thing, can_modify, mob/user)
if(can_modify)
. = "[thing] | Destroy | "
else
. = "[thing] | "
-/datum/persistent/Topic(var/href, var/href_list)
+/datum/persistent/Topic(href, href_list)
. = ..()
if(!.)
if(href_list["remove_entry"])
diff --git a/code/modules/persistence/effects/filth.dm b/code/modules/persistence/effects/filth.dm
index 2a7ea87a41..a2908d77fa 100644
--- a/code/modules/persistence/effects/filth.dm
+++ b/code/modules/persistence/effects/filth.dm
@@ -4,7 +4,7 @@
var/saves_dirt = TRUE //VOREStation edit
has_admin_data = TRUE
-/datum/persistent/filth/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user)
+/datum/persistent/filth/GetAdminDataStringFor(thing, can_modify, mob/user)
if(istype(thing, /obj/effect/decal/cleanable/crayon))
var/obj/effect/decal/cleanable/crayon/CRAY = thing
if(can_modify)
@@ -12,17 +12,17 @@
return "[thing] | "
return null
-/datum/persistent/filth/IsValidEntry(var/atom/entry)
+/datum/persistent/filth/IsValidEntry(atom/entry)
. = ..() && entry.invisibility == 0
-/datum/persistent/filth/CheckTokenSanity(var/list/token)
+/datum/persistent/filth/CheckTokenSanity(list/token)
// byond's json implementation is "questionable", and uses types as keys and values without quotes sometimes even though they aren't valid json
token["path"] = istext(token["path"]) ? text2path(token["path"]) : token["path"]
token["pixel_x"] = istext(token["pixel_x"]) ? text2num(token["pixel_x"]) : token["pixel_x"]
token["pixel_y"] = istext(token["pixel_y"]) ? text2num(token["pixel_y"]) : token["pixel_y"]
return ..() && ispath(token["path"]) && (!saves_dirt || isnum(token["dirt"])) && isnum(token["pixel_x"]) && isnum(token["pixel_y"])
-/datum/persistent/filth/CheckTurfContents(var/turf/T, var/list/token)
+/datum/persistent/filth/CheckTurfContents(turf/T, list/token)
var/_path = token["path"]
// return (locate(_path) in T) ? FALSE : TRUE
if(!ispath(_path, /obj/effect/decal/cleanable/crayon))
@@ -36,7 +36,7 @@
return FALSE
return TRUE
-/datum/persistent/filth/CreateEntryInstance(var/turf/creating, var/list/token)
+/datum/persistent/filth/CreateEntryInstance(turf/creating, list/token)
var/_path = token["path"]
if (isspace(creating) || iswall(creating) ||isopenspace(creating))
return
@@ -57,21 +57,21 @@
if(token["pixel_y"])
inst.pixel_y = token["pixel_y"]
-/datum/persistent/filth/GetEntryAge(var/atom/entry)
+/datum/persistent/filth/GetEntryAge(atom/entry)
var/obj/effect/decal/cleanable/filth = entry
return filth.age
-/datum/persistent/filth/proc/GetEntryDirt(var/atom/entry)
+/datum/persistent/filth/proc/GetEntryDirt(atom/entry)
var/turf/simulated/T = get_turf(entry)
if (istype(T))
return T.dirt
return 0
-/datum/persistent/filth/proc/GetEntryPath(var/atom/entry)
+/datum/persistent/filth/proc/GetEntryPath(atom/entry)
var/obj/effect/decal/cleanable/filth = entry
return filth.generic_filth ? /obj/effect/decal/cleanable/filth : filth.type
-/datum/persistent/filth/CompileEntry(var/atom/entry)
+/datum/persistent/filth/CompileEntry(atom/entry)
. = ..()
LAZYADDASSOC(., "path", "[GetEntryPath(entry)]")
if (saves_dirt)
diff --git a/code/modules/persistence/effects/graffiti.dm b/code/modules/persistence/effects/graffiti.dm
index 0f543c82e9..9a2f215e3f 100644
--- a/code/modules/persistence/effects/graffiti.dm
+++ b/code/modules/persistence/effects/graffiti.dm
@@ -3,17 +3,17 @@
entries_expire_at = 4 // This previously was at 50 rounds??? Over 10 days.
has_admin_data = TRUE
-/datum/persistent/graffiti/CheckTokenSanity(var/list/token)
+/datum/persistent/graffiti/CheckTokenSanity(list/token)
token["pixel_x"] = istext(token["pixel_x"]) ? text2num(token["pixel_x"]) : token["pixel_x"]
token["pixel_y"] = istext(token["pixel_y"]) ? text2num(token["pixel_y"]) : token["pixel_y"]
return ..() && isnum(token["pixel_x"]) && isnum(token["pixel_y"])
-/datum/persistent/graffiti/GetValidTurf(var/turf/T, var/list/token)
+/datum/persistent/graffiti/GetValidTurf(turf/T, list/token)
var/turf/checking_turf = ..()
if(istype(checking_turf) && checking_turf.can_engrave())
return checking_turf
-/datum/persistent/graffiti/CheckTurfContents(var/turf/T, var/list/token)
+/datum/persistent/graffiti/CheckTurfContents(turf/T, list/token)
var/too_much_graffiti = 0
for(var/obj/effect/decal/writing/W in .)
too_much_graffiti++
@@ -21,7 +21,7 @@
return FALSE
return TRUE
-/datum/persistent/graffiti/CreateEntryInstance(var/turf/creating, var/list/token)
+/datum/persistent/graffiti/CreateEntryInstance(turf/creating, list/token)
var/obj/effect/decal/writing/inst = new /obj/effect/decal/writing(creating, token["age"]+1, token["message"], token["author"])
if(token["icon_state"])
inst.icon_state = token["icon_state"]
@@ -30,17 +30,17 @@
if(token["pixel_y"])
inst.pixel_y = token["pixel_y"]
-/datum/persistent/graffiti/IsValidEntry(var/atom/entry)
+/datum/persistent/graffiti/IsValidEntry(atom/entry)
. = ..()
if(.)
var/turf/T = entry.loc
. = T.can_engrave()
-/datum/persistent/graffiti/GetEntryAge(var/atom/entry)
+/datum/persistent/graffiti/GetEntryAge(atom/entry)
var/obj/effect/decal/writing/save_graffiti = entry
return save_graffiti.graffiti_age
-/datum/persistent/graffiti/CompileEntry(var/atom/entry, var/write_file)
+/datum/persistent/graffiti/CompileEntry(atom/entry, write_file)
. = ..()
var/obj/effect/decal/writing/save_graffiti = entry
LAZYADDASSOC(., "author", "[save_graffiti.author ? save_graffiti.author : "unknown"]")
@@ -49,7 +49,7 @@
LAZYADDASSOC(., "pixel_x", "[save_graffiti.pixel_x]")
LAZYADDASSOC(., "pixel_y", "[save_graffiti.pixel_y]")
-/datum/persistent/graffiti/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user)
+/datum/persistent/graffiti/GetAdminDataStringFor(thing, can_modify, mob/user)
var/obj/effect/decal/writing/save_graffiti = thing
if(can_modify)
. = "[save_graffiti.message] | [save_graffiti.author] | Destroy | "
diff --git a/code/modules/persistence/effects/paper.dm b/code/modules/persistence/effects/paper.dm
index 78bd1a987a..61939ffe85 100644
--- a/code/modules/persistence/effects/paper.dm
+++ b/code/modules/persistence/effects/paper.dm
@@ -5,12 +5,12 @@
var/paper_type = /obj/item/paper
var/requires_noticeboard = TRUE
-/datum/persistent/paper/CheckTurfContents(var/turf/T, var/list/token)
+/datum/persistent/paper/CheckTurfContents(turf/T, list/token)
if(requires_noticeboard && !(locate(/obj/structure/noticeboard) in T))
new /obj/structure/noticeboard(T)
. = ..()
-/datum/persistent/paper/CreateEntryInstance(var/turf/creating, var/list/token)
+/datum/persistent/paper/CreateEntryInstance(turf/creating, list/token)
var/obj/structure/noticeboard/board = locate() in creating
if(requires_noticeboard && LAZYLEN(board.notices) >= board.max_notices)
return
@@ -27,25 +27,25 @@
SSpersistence.track_value(paper, type)
return paper
-/datum/persistent/paper/GetEntryAge(var/atom/entry)
+/datum/persistent/paper/GetEntryAge(atom/entry)
var/obj/item/paper/paper = entry
return paper.age
-/datum/persistent/paper/CompileEntry(var/atom/entry, var/write_file)
+/datum/persistent/paper/CompileEntry(atom/entry, write_file)
. = ..()
var/obj/item/paper/paper = entry
LAZYADDASSOC(., "author", "[paper.last_modified_ckey ? paper.last_modified_ckey : "unknown"]")
LAZYADDASSOC(., "message", "[paper.info]")
LAZYADDASSOC(., "name", "[paper.name]")
-/datum/persistent/paper/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user)
+/datum/persistent/paper/GetAdminDataStringFor(thing, can_modify, mob/user)
var/obj/item/paper/paper = thing
if(can_modify)
. = "[paper.info] | [paper.name] | [paper.last_modified_ckey] | Destroy | "
else
. = "[paper.info] | [paper.name] | [paper.last_modified_ckey] | "
-/datum/persistent/paper/RemoveValue(var/atom/value)
+/datum/persistent/paper/RemoveValue(atom/value)
var/obj/structure/noticeboard/board = value.loc
if(istype(board))
board.remove_paper(value)
diff --git a/code/modules/persistence/effects/paper_sticky.dm b/code/modules/persistence/effects/paper_sticky.dm
index 054b21d032..601ca4c868 100644
--- a/code/modules/persistence/effects/paper_sticky.dm
+++ b/code/modules/persistence/effects/paper_sticky.dm
@@ -3,7 +3,7 @@
paper_type = /obj/item/paper/sticky
requires_noticeboard = FALSE
-/datum/persistent/paper/sticky/CreateEntryInstance(var/turf/creating, var/list/token)
+/datum/persistent/paper/sticky/CreateEntryInstance(turf/creating, list/token)
var/atom/paper = ..()
if(paper)
//VOREStation add - sometimes they fall off
@@ -17,7 +17,7 @@
paper.color = token["color"]
return paper
-/datum/persistent/paper/sticky/CompileEntry(var/atom/entry, var/write_file)
+/datum/persistent/paper/sticky/CompileEntry(atom/entry, write_file)
. = ..()
var/obj/item/paper/sticky/paper = entry
LAZYADDASSOC(., "offset_x", paper.pixel_x)
diff --git a/code/modules/persistence/effects/trash.dm b/code/modules/persistence/effects/trash.dm
index 434a139735..d5ed03d7b9 100644
--- a/code/modules/persistence/effects/trash.dm
+++ b/code/modules/persistence/effects/trash.dm
@@ -3,7 +3,7 @@
saves_dirt = FALSE
has_admin_data = FALSE
-/datum/persistent/filth/trash/CheckTurfContents(var/turf/T, var/list/tokens)
+/datum/persistent/filth/trash/CheckTurfContents(turf/T, list/tokens)
var/too_much_trash = 0
for(var/obj/item/trash/trash in T)
if(istype(T, /obj/item/trash/spitwad) || istype(T, /obj/item/trash/spitgum))
@@ -13,9 +13,9 @@
return FALSE
return TRUE
-/datum/persistent/filth/trash/GetEntryAge(var/atom/entry)
+/datum/persistent/filth/trash/GetEntryAge(atom/entry)
var/obj/item/trash/trash = entry
return trash.age
-/datum/persistent/filth/trash/GetEntryPath(var/atom/entry)
+/datum/persistent/filth/trash/GetEntryPath(atom/entry)
return entry.type
diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm
index 9e869b908b..1ac7927164 100644
--- a/code/modules/persistence/graffiti.dm
+++ b/code/modules/persistence/graffiti.dm
@@ -15,7 +15,7 @@
var/graffiti_age = 0
var/author = "unknown"
-/obj/effect/decal/writing/Initialize(mapload, var/_age, var/_message, var/_author)
+/obj/effect/decal/writing/Initialize(mapload, _age, _message, _author)
. = ..()
if(!isnull(_age))
graffiti_age = _age
@@ -42,7 +42,7 @@
. = ..()
. += "\n It reads \"[message]\"."
-/obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user)
+/obj/effect/decal/writing/attackby(obj/item/thing, mob/user)
if(thing.has_tool_quality(TOOL_WELDER))
var/obj/item/weldingtool/welder = thing.get_welder()
if(welder.isOn() && welder.remove_fuel(0,user) && do_after(user, 5, target = src) && !QDELETED(src))
diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm
index cd7ffd256d..7f0b220a79 100644
--- a/code/modules/persistence/noticeboard.dm
+++ b/code/modules/persistence/noticeboard.dm
@@ -30,14 +30,14 @@
update_icon()
-/obj/structure/noticeboard/proc/add_paper(var/atom/movable/paper, var/skip_icon_update)
+/obj/structure/noticeboard/proc/add_paper(atom/movable/paper, skip_icon_update)
if(istype(paper))
LAZYDISTINCTADD(notices, paper)
paper.forceMove(src)
if(!skip_icon_update)
update_icon()
-/obj/structure/noticeboard/proc/remove_paper(var/atom/movable/paper, var/skip_icon_update)
+/obj/structure/noticeboard/proc/remove_paper(atom/movable/paper, skip_icon_update)
if(istype(paper) && paper.loc == src)
paper.dropInto(loc)
LAZYREMOVE(notices, paper)
@@ -103,10 +103,10 @@
return
return ..()
-/obj/structure/noticeboard/attack_ai(var/mob/user)
+/obj/structure/noticeboard/attack_ai(mob/user)
examine(user)
-/obj/structure/noticeboard/attack_hand(var/mob/user)
+/obj/structure/noticeboard/attack_hand(mob/user)
examine(user)
/obj/structure/noticeboard/examine(mob/user)
diff --git a/code/modules/persistence/paintings.dm b/code/modules/persistence/paintings.dm
index b11c8ce566..41623341f1 100644
--- a/code/modules/persistence/paintings.dm
+++ b/code/modules/persistence/paintings.dm
@@ -21,7 +21,7 @@
for(var/obj/structure/sign/painting/P in SSpersistence.painting_frames)
P.load_persistent()
-/datum/persistent/paintings/CheckTokenSanity(var/list/token)
+/datum/persistent/paintings/CheckTokenSanity(list/token)
var/png_filename = "data/paintings/[token["persistence_id"]]/[token["md5"]].png"
if(!fexists(png_filename))
return FALSE
diff --git a/code/modules/persistence/serialize.dm b/code/modules/persistence/serialize.dm
index dbd0ceb1a7..49617afcb2 100644
--- a/code/modules/persistence/serialize.dm
+++ b/code/modules/persistence/serialize.dm
@@ -18,7 +18,7 @@
* Also, this should only be called by `list_to_object` in persistence.dm - at least
* with current plans - that way it can actually initialize the type from the list
*/
-/datum/proc/deserialize(var/list/data)
+/datum/proc/deserialize(list/data)
return
/atom
@@ -50,7 +50,7 @@
return data
-/atom/deserialize(var/list/data)
+/atom/deserialize(list/data)
for(var/thing in vars_to_save())
if(thing in data)
vars[thing] = data[thing]
@@ -70,13 +70,13 @@ If you're clever, you can do neat things with SDQL and this, though be careful -
some objects, like humans, are dependent that certain extra things are defined
in their list
*/
-/proc/object_to_json(var/atom/movable/thing)
+/proc/object_to_json(atom/movable/thing)
return json_encode(thing.serialize())
-/proc/json_to_object(var/json_data, var/loc)
+/proc/json_to_object(json_data, loc)
return list_to_object(json_decode(json_data), loc)
-/proc/list_to_object(var/list/data, var/loc)
+/proc/list_to_object(list/data, loc)
if(!islist(data))
throw EXCEPTION("You didn't give me a list, bucko")
if(!("type" in data))
diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm
index 62c749d4bd..09ff0ec33c 100644
--- a/code/modules/persistence/storage/smartfridge.dm
+++ b/code/modules/persistence/storage/smartfridge.dm
@@ -1,4 +1,4 @@
-/datum/persistent/storage/smartfridge/get_storage_list(var/obj/machinery/smartfridge/entry)
+/datum/persistent/storage/smartfridge/get_storage_list(obj/machinery/smartfridge/entry)
if(!istype(entry))
return ..()
@@ -6,7 +6,7 @@
for(var/datum/stored_item/I in entry.item_records)
.[I.item_path] = I.get_amount()
-/datum/persistent/storage/smartfridge/CreateEntryInstance(var/turf/creating, var/list/token)
+/datum/persistent/storage/smartfridge/CreateEntryInstance(turf/creating, list/token)
var/obj/machinery/smartfridge/S = find_specific_instance(creating)
var/list/L = generate_items(token["items"])
for(var/atom/A in L)
@@ -53,7 +53,7 @@
"default" = 10
)
-/datum/persistent/storage/smartfridge/sheet_storage/generate_items(var/list/L)
+/datum/persistent/storage/smartfridge/sheet_storage/generate_items(list/L)
. = list()
for(var/obj/item/stack/material/S as anything in L)
var/real_path = istext(S) ? text2path(S) : S
@@ -95,7 +95,7 @@
name = "fruit storage lossy"
go_missing_chance = 10 // 10% loss chance between rounds
-/datum/persistent/storage/smartfridge/produce/generate_items(var/list/L) // Mostly same as storage/generate_items() but without converting string to path
+/datum/persistent/storage/smartfridge/produce/generate_items(list/L) // Mostly same as storage/generate_items() but without converting string to path
. = list()
for(var/fruit_type in L)
for(var/i in 1 to L[fruit_type])
@@ -105,10 +105,10 @@
if(!QDELETED(A))
. += A
-/datum/persistent/storage/smartfridge/produce/create_item(var/seedtype)
+/datum/persistent/storage/smartfridge/produce/create_item(seedtype)
return new /obj/item/reagent_containers/food/snacks/grown(null, seedtype) // Smartfridge will be stock()ed with it, loc is unimportant
-/datum/persistent/storage/smartfridge/produce/get_storage_list(var/obj/machinery/smartfridge/produce/entry)
+/datum/persistent/storage/smartfridge/produce/get_storage_list(obj/machinery/smartfridge/produce/entry)
if(!istype(entry))
return ..()
diff --git a/code/modules/persistence/storage/storage.dm b/code/modules/persistence/storage/storage.dm
index de976cbd98..9a1924ff5f 100644
--- a/code/modules/persistence/storage/storage.dm
+++ b/code/modules/persistence/storage/storage.dm
@@ -20,10 +20,10 @@
if(name)
filename = "data/persistent/storage/[lowertext(using_map.name)]-[lowertext(name)].json"
-/datum/persistent/storage/IsValidEntry(var/atom/entry)
+/datum/persistent/storage/IsValidEntry(atom/entry)
return ..() && istype(entry, target_type)
-/datum/persistent/storage/CompileEntry(var/atom/entry)
+/datum/persistent/storage/CompileEntry(atom/entry)
. = ..()
var/stored = max_storage
var/list/item_list = get_storage_list(entry)
@@ -49,16 +49,16 @@
// [type1] = [stored_quantity],
// [type2] = [stored_quantity]
// )
-/datum/persistent/storage/proc/get_storage_list(var/atom/entry)
+/datum/persistent/storage/proc/get_storage_list(atom/entry)
return list() // Subtypes define list structure
-/datum/persistent/storage/proc/find_specific_instance(var/turf/T)
+/datum/persistent/storage/proc/find_specific_instance(turf/T)
return locate(target_type) in T
-/datum/persistent/storage/CheckTurfContents(var/turf/T, var/list/token)
+/datum/persistent/storage/CheckTurfContents(turf/T, list/token)
return istype(find_specific_instance(T), target_type)
-/datum/persistent/storage/proc/generate_items(var/list/L)
+/datum/persistent/storage/proc/generate_items(list/L)
. = list()
for(var/path in L)
// byond's json implementation is "questionable", and uses types as keys and values without quotes sometimes even though they aren't valid json
@@ -70,10 +70,10 @@
if(!QDELETED(A))
. += A
-/datum/persistent/storage/proc/create_item(var/path)
+/datum/persistent/storage/proc/create_item(path)
return new path()
-/datum/persistent/storage/GetAdminDataStringFor(var/thing, var/can_modify, var/mob/user)
+/datum/persistent/storage/GetAdminDataStringFor(thing, can_modify, mob/user)
var/atom/T = thing
if(!istype(T))
return ""
diff --git a/code/modules/planet/planet.dm b/code/modules/planet/planet.dm
index ab4316ffc4..a286d65f9a 100644
--- a/code/modules/planet/planet.dm
+++ b/code/modules/planet/planet.dm
@@ -62,7 +62,7 @@
if(weather_holder)
weather_holder.process()
-/datum/planet/proc/update_sun_deferred(var/new_brightness, var/new_color)
+/datum/planet/proc/update_sun_deferred(new_brightness, new_color)
sun["brightness"] = CLAMP01(new_brightness)
sun["color"] = new_color
needs_work |= PLANET_PROCESS_SUN
diff --git a/code/modules/planet/sun.dm b/code/modules/planet/sun.dm
index cccd1d904d..760fbde14f 100644
--- a/code/modules/planet/sun.dm
+++ b/code/modules/planet/sun.dm
@@ -5,7 +5,7 @@
var/our_color = "#FFFFFF"
var/our_brightness = 1.0
-/datum/sun_holder/New(var/source)
+/datum/sun_holder/New(source)
sun = new(null)
our_planet = source
@@ -108,7 +108,7 @@
var/atom/movable/sun_visuals_overlap/SVO = spreads[key]
SVO.alpha = new_alpha
-/atom/movable/sun_visuals/proc/apply_to_turf(var/turf/T)
+/atom/movable/sun_visuals/proc/apply_to_turf(turf/T)
T.vis_contents += src
T.dynamic_lumcount += 0.5
T.set_luminosity(1, TRUE)
@@ -157,7 +157,7 @@
if(LAZYLEN(localspreads))
turfs_providing_spreads[T] = localspreads
-/atom/movable/sun_visuals/proc/remove_from_turf(var/turf/T)
+/atom/movable/sun_visuals/proc/remove_from_turf(turf/T)
T.vis_contents -= src
T.dynamic_lumcount -= 0.5
T.set_luminosity(0, TRUE)
diff --git a/code/modules/planet/weather.dm b/code/modules/planet/weather.dm
index da98e249a7..e2c0b9bfc3 100644
--- a/code/modules/planet/weather.dm
+++ b/code/modules/planet/weather.dm
@@ -17,7 +17,7 @@
var/firework_override = FALSE
-/datum/weather_holder/New(var/source)
+/datum/weather_holder/New(source)
..()
our_planet = source
for(var/A in allowed_weather_types)
@@ -41,7 +41,7 @@
T.vis_contents -= visuals
T.vis_contents -= special_visuals
-/datum/weather_holder/proc/change_weather(var/new_weather)
+/datum/weather_holder/proc/change_weather(new_weather)
var/old_light_modifier = null
var/datum/weather/old_weather = null
if(current_weather)
@@ -86,7 +86,7 @@
// Used to determine what the weather will be soon, in a semi-random fashion.
// The forecast is made by calling this repeatively, from the bottom (highest index) of the forecast list.
-/datum/weather_holder/proc/get_next_weather(var/datum/weather/W)
+/datum/weather_holder/proc/get_next_weather(datum/weather/W)
if(!current_weather) // At roundstart, choose a suitable initial weather.
return pickweight(roundstart_weather_chances)
return pickweight(W.transition_chances)
diff --git a/code/modules/player_tips_vr/player_tips_list_vr.dm b/code/modules/player_tips_vr/player_tips_list_vr.dm
index f8e956f9f5..9654397287 100644
--- a/code/modules/player_tips_vr/player_tips_list_vr.dm
+++ b/code/modules/player_tips_vr/player_tips_list_vr.dm
@@ -5,7 +5,7 @@ prob(50) makes it half as likely to appear and so forth.
When editing the list, please try and keep similar probabilities near each other. High on top, low on bottom */
//argument determines if to pick a random tip or use a forced choice.
-/datum/player_tips/proc/pick_tip(var/isSpecific)
+/datum/player_tips/proc/pick_tip(isSpecific)
var/choice = null
if(!(isSpecific == "none" || isSpecific == "general" || isSpecific == "gameplay" || isSpecific == "roleplay" || isSpecific == "lore" ))
choice = "none" //Making sure that wrong arguments still give tips.
diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm
index 3180b1d304..8a50b4370d 100644
--- a/code/modules/power/antimatter/computer.dm
+++ b/code/modules/power/antimatter/computer.dm
@@ -54,10 +54,10 @@
src.updateUsrDialog(usr)
-/obj/machinery/computer/am_engine/attack_ai(var/mob/user as mob)
+/obj/machinery/computer/am_engine/attack_ai(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/computer/am_engine/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/am_engine/attack_hand(mob/user as mob)
if(..())
return
user.machine = src
diff --git a/code/modules/power/antimatter/containment_jar.dm b/code/modules/power/antimatter/containment_jar.dm
index fda5775a77..90dd6a9a1c 100644
--- a/code/modules/power/antimatter/containment_jar.dm
+++ b/code/modules/power/antimatter/containment_jar.dm
@@ -34,7 +34,7 @@
//check_stability()
return
-/obj/item/am_containment/proc/usefuel(var/wanted)
+/obj/item/am_containment/proc/usefuel(wanted)
if(fuel < wanted)
wanted = fuel
fuel -= wanted
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 810a4894cd..815de201b2 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -112,7 +112,7 @@
return
-/obj/machinery/power/am_control_unit/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/power/am_control_unit/bullet_act(obj/item/projectile/Proj)
if(Proj.check_armour != "bullet")
stability -= Proj.force
return 0
@@ -178,7 +178,7 @@
return
-/obj/machinery/power/am_control_unit/proc/add_shielding(var/obj/machinery/am_shielding/AMS, var/AMS_linking = 0)
+/obj/machinery/power/am_control_unit/proc/add_shielding(obj/machinery/am_shielding/AMS, AMS_linking = 0)
if(!istype(AMS)) return 0
if(!anchored) return 0
if(!AMS_linking && !AMS.link_control(src)) return 0
@@ -187,7 +187,7 @@
return 1
-/obj/machinery/power/am_control_unit/proc/remove_shielding(var/obj/machinery/am_shielding/AMS)
+/obj/machinery/power/am_control_unit/proc/remove_shielding(obj/machinery/am_shielding/AMS)
if(!istype(AMS)) return 0
linked_shielding.Remove(AMS)
update_shield_icons = 2
diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm
index 40c51d1fa1..f336a19c00 100644
--- a/code/modules/power/antimatter/fuel.dm
+++ b/code/modules/power/antimatter/fuel.dm
@@ -41,7 +41,7 @@
qdel(src)
F:annihilation(F.fuel)
-/obj/item/fuel/antiH/proc/annihilation(var/mass)
+/obj/item/fuel/antiH/proc/annihilation(mass)
var/strength = convert2energy(mass)
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index b85cabc25b..666928fe74 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -1,5 +1,5 @@
//like orange but only checks north/south/east/west for one step
-/proc/cardinalrange(var/center)
+/proc/cardinalrange(center)
var/list/things = list()
for(var/direction in GLOB.cardinal)
var/turf/T = get_step(center, direction)
@@ -104,7 +104,7 @@
return
-/obj/machinery/am_shielding/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/am_shielding/bullet_act(obj/item/projectile/Proj)
if(Proj.check_armour != "bullet")
stability -= Proj.force/2
return 0
@@ -134,7 +134,7 @@
//Call this to link a detected shilding unit to the controller
-/obj/machinery/am_shielding/proc/link_control(var/obj/machinery/power/am_control_unit/AMC)
+/obj/machinery/am_shielding/proc/link_control(obj/machinery/power/am_control_unit/AMC)
if(!istype(AMC)) return 0
if(control_unit && control_unit != AMC) return 0//Already have one
control_unit = AMC
@@ -168,7 +168,7 @@
return
-/obj/machinery/am_shielding/proc/check_stability(var/injecting_fuel = 0)
+/obj/machinery/am_shielding/proc/check_stability(injecting_fuel = 0)
if(stability > 0) return
if(injecting_fuel && control_unit)
control_unit.exploding = 1
@@ -177,7 +177,7 @@
return
-/obj/machinery/am_shielding/proc/recalc_efficiency(var/new_efficiency)//tbh still not 100% sure how I want to deal with efficiency so this is likely temp
+/obj/machinery/am_shielding/proc/recalc_efficiency(new_efficiency)//tbh still not 100% sure how I want to deal with efficiency so this is likely temp
if(!control_unit || !processing) return
if(stability < 50)
new_efficiency /= 2
@@ -199,7 +199,7 @@
throw_range = 2
matter = list(MAT_STEEL = 100)
-/obj/item/am_shielding_container/attackby(var/obj/item/I, var/mob/user)
+/obj/item/am_shielding_container/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/multitool) && istype(src.loc,/turf))
new/obj/machinery/am_shielding(src.loc)
qdel(src)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 4224a7cdb5..cde850be2d 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -159,7 +159,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(terminal)
terminal.connect_to_network()
-/obj/machinery/power/apc/drain_power(var/drain_check, var/surge, var/amount = 0)
+/obj/machinery/power/apc/drain_power(drain_check, surge, amount = 0)
if(drain_check)
return 1
@@ -249,7 +249,7 @@ GLOBAL_LIST_EMPTY(apcs)
terminal.connect_to_network() // Refresh the network the terminal is connected to.
return
-/obj/machinery/power/apc/proc/energy_fail(var/duration)
+/obj/machinery/power/apc/proc/energy_fail(duration)
failure_timer = max(failure_timer, round(duration))
/obj/machinery/power/apc/proc/make_terminal()
@@ -701,7 +701,7 @@ GLOBAL_LIST_EMPTY(apcs)
..()
togglelock(user)
-/obj/machinery/power/apc/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/power/apc/emag_act(remaining_charges, mob/user)
if(!(emagged || hacker)) // trying to unlock with an emag card
if(opened)
to_chat(user, "You must close the cover to do that.")
@@ -867,7 +867,7 @@ GLOBAL_LIST_EMPTY(apcs)
// to_world("[area.power_equip]")
area.power_change()
-/obj/machinery/power/apc/proc/can_use(mob/user, var/loud = 0) //used by attack_hand() and Topic()
+/obj/machinery/power/apc/proc/can_use(mob/user, loud = 0) //used by attack_hand() and Topic()
if(!user.client)
return 0
if(isobserver(user) && is_admin(user)) //This is to allow nanoUI interaction by ghost admins.
@@ -1003,7 +1003,7 @@ GLOBAL_LIST_EMPTY(apcs)
return (chargemode && charging == 1 && operating)
-/obj/machinery/power/apc/draw_power(var/amount)
+/obj/machinery/power/apc/draw_power(amount)
if(terminal && terminal.powernet)
return terminal.powernet.draw_power(amount)
return 0
@@ -1170,7 +1170,7 @@ GLOBAL_LIST_EMPTY(apcs)
// val 0=off, 1=off(auto) 2=on 3=on(auto)
// on 0=off, 1=on, 2=autooff
// defines a state machine, returns the new state
-/obj/machinery/power/apc/proc/autoset(var/cur_state, var/on)
+/obj/machinery/power/apc/proc/autoset(cur_state, on)
switch(cur_state)
//if(POWERCHAN_OFF); //autoset will never turn on a channel set to off
if(POWERCHAN_OFF_AUTO)
@@ -1233,7 +1233,7 @@ GLOBAL_LIST_EMPTY(apcs)
cell.ex_act(3)
return
-/obj/machinery/power/apc/disconnect_terminal(var/obj/machinery/power/terminal/term)
+/obj/machinery/power/apc/disconnect_terminal(obj/machinery/power/terminal/term)
if(terminal)
terminal.master = null
terminal = null
@@ -1249,7 +1249,7 @@ GLOBAL_LIST_EMPTY(apcs)
// overload the lights in this APC area
-/obj/machinery/power/apc/proc/overload_lighting(var/chance = 100)
+/obj/machinery/power/apc/proc/overload_lighting(chance = 100)
if(/* !get_connection() || */ !operating || shorted || grid_check)
return
if( cell && cell.charge>=20)
@@ -1270,7 +1270,7 @@ GLOBAL_LIST_EMPTY(apcs)
return 0
// Malfunction: Transfers APC under AI's control
-/obj/machinery/power/apc/proc/ai_hack(var/mob/living/silicon/ai/A = null)
+/obj/machinery/power/apc/proc/ai_hack(mob/living/silicon/ai/A = null)
if(!A || !A.hacked_apcs || hacker || aidisabled || A.stat == DEAD)
return 0
hacker = A
@@ -1306,7 +1306,7 @@ GLOBAL_LIST_EMPTY(apcs)
update_icon()
update()
-/obj/machinery/power/apc/overload(var/obj/machinery/power/source)
+/obj/machinery/power/apc/overload(obj/machinery/power/source)
if(is_critical)
return
@@ -1344,7 +1344,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(src && grid_check == TRUE)
grid_check = FALSE
-/obj/machinery/power/apc/proc/set_nightshift(on, var/automated)
+/obj/machinery/power/apc/proc/set_nightshift(on, automated)
set waitfor = FALSE
if(automated && istype(area, /area/shuttle))
return
diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index 9f23b0de3a..fe99492fcc 100644
--- a/code/modules/power/batteryrack.dm
+++ b/code/modules/power/batteryrack.dm
@@ -87,7 +87,7 @@
// Sets input/output depending on our "mode" var.
-/obj/machinery/power/smes/batteryrack/proc/update_io(var/newmode)
+/obj/machinery/power/smes/batteryrack/proc/update_io(newmode)
mode = newmode
switch(mode)
if(PSU_OFFLINE)
@@ -104,7 +104,7 @@
output_attempt = 1
// Store charge in the power cells, instead of using the charge var. Amount is in joules.
-/obj/machinery/power/smes/batteryrack/add_charge(var/amount)
+/obj/machinery/power/smes/batteryrack/add_charge(amount)
amount *= CELLRATE // Convert to CELLRATE first.
if(equalise)
// Now try to get least charged cell and use the power from it.
@@ -122,7 +122,7 @@
return
-/obj/machinery/power/smes/batteryrack/remove_charge(var/amount)
+/obj/machinery/power/smes/batteryrack/remove_charge(amount)
amount *= CELLRATE // Convert to CELLRATE first.
if(equalise)
// Now try to get most charged cell and use the power from it.
@@ -155,7 +155,7 @@
CL = C
return CL
-/obj/machinery/power/smes/batteryrack/proc/insert_cell(var/obj/item/cell/C, var/mob/user)
+/obj/machinery/power/smes/batteryrack/proc/insert_cell(obj/item/cell/C, mob/user)
if(!istype(C))
return 0
@@ -213,7 +213,7 @@
internal_cells -= C
return ..()
-/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/power/smes/batteryrack/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/cell)) // ID Card, try to insert it.
if(insert_cell(W, user))
to_chat(user, span_filter_notice("You insert \the [W] into \the [src]."))
@@ -232,7 +232,7 @@
/obj/machinery/power/smes/batteryrack/outputting()
return
-/obj/machinery/power/smes/batteryrack/attack_hand(var/mob/user)
+/obj/machinery/power/smes/batteryrack/attack_hand(mob/user)
tgui_interact(user)
/obj/machinery/power/smes/batteryrack/tgui_interact(mob/user, datum/tgui/ui)
diff --git a/code/modules/power/batteryrack_vr.dm b/code/modules/power/batteryrack_vr.dm
index 348090a02c..7473e53f0f 100644
--- a/code/modules/power/batteryrack_vr.dm
+++ b/code/modules/power/batteryrack_vr.dm
@@ -10,7 +10,7 @@
var/obj/item/cell/newcell = new cell_type(src.loc)
insert_cell(newcell)
-/obj/item/module/power_control/attackby(var/obj/item/I, var/mob/user)
+/obj/item/module/power_control/attackby(obj/item/I, mob/user)
if(I.has_tool_quality(TOOL_MULTITOOL))
to_chat(user, span_notice("You begin tweaking the power control circuits to support a power cell rack."))
if(do_after(user, 5 SECONDS * I.toolspeed, target = src))
diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm
index 566f0baa67..dd760aaf61 100644
--- a/code/modules/power/breaker_box.dm
+++ b/code/modules/power/breaker_box.dm
@@ -94,7 +94,7 @@
update_locked = 0
busy = 0
-/obj/machinery/power/breakerbox/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/power/breakerbox/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/multitool))
var/newtag = tgui_input_text(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system", "", MAX_NAME_LEN)
if(newtag)
@@ -110,7 +110,7 @@
if(default_part_replacement(user, W))
return
-/obj/machinery/power/breakerbox/proc/set_state(var/state)
+/obj/machinery/power/breakerbox/proc/set_state(state)
on = state
if(on)
icon_state = icon_state_on
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index dada2101f5..a703185d30 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
color = COLOR_RED
var/obj/machinery/power/breakerbox/breaker_box
-/obj/structure/cable/drain_power(var/drain_check, var/surge, var/amount = 0)
+/obj/structure/cable/drain_power(drain_check, surge, amount = 0)
if(drain_check)
return 1
@@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
///////////////////////////////////
//If underfloor, hide the cable
-/obj/structure/cable/hide(var/i)
+/obj/structure/cable/hide(i)
if(istype(loc, /turf))
invisibility = i ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
update_icon()
@@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
src.add_fingerprint(user)
// shock the user with probability prb
-/obj/structure/cable/proc/shock(mob/user, prb, var/siemens_coeff = 1.0)
+/obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1.0)
if(!prob(prb))
return 0
if (electrocute_mob(user, powernet, src, siemens_coeff))
@@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
qdel(src)
return
-/obj/structure/cable/proc/cableColor(var/colorC)
+/obj/structure/cable/proc/cableColor(colorC)
var/color_n = "#DD0000"
if(colorC)
color_n = colorC
@@ -281,7 +281,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
//handles merging diagonally matching cables
//for info : direction^3 is flipping horizontally, direction^12 is flipping vertically
-/obj/structure/cable/proc/mergeDiagonalsNetworks(var/direction)
+/obj/structure/cable/proc/mergeDiagonalsNetworks(direction)
if(SSmachines.powernet_is_defered()) return;
//search for and merge diagonally matching cables from the first direction component (north/south)
@@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
C.powernet.add_cable(src) //else, we simply connect to the matching cable powernet
// merge with the powernets of power objects in the given direction
-/obj/structure/cable/proc/mergeConnectedNetworks(var/direction)
+/obj/structure/cable/proc/mergeConnectedNetworks(direction)
if(SSmachines.powernet_is_defered()) return;
var/fdir = direction ? GLOB.reverse_dir[direction] : 0 //flip the direction, to match with the source position on its turf
@@ -403,7 +403,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
//////////////////////////////////////////////
//if powernetless_only = 1, will only get connections without powernet
-/obj/structure/cable/proc/get_connections(var/powernetless_only = 0)
+/obj/structure/cable/proc/get_connections(powernetless_only = 0)
. = list() // this will be a list of all connected power objects
var/turf/T
@@ -527,7 +527,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
tool_qualities = list(TOOL_CABLE_COIL)
singular_name = "cable"
-/obj/item/stack/cable_coil/Initialize(mapload, length = MAXCOIL, var/param_color = null)
+/obj/item/stack/cable_coil/Initialize(mapload, length = MAXCOIL, param_color = null)
. = ..()
amount = length
if (param_color) // It should be red by default, so only recolor it if parameter was specified.
@@ -587,7 +587,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
icon_state = "coil"
name = initial(name)
-/obj/item/stack/cable_coil/proc/set_cable_color(var/selected_color, var/user)
+/obj/item/stack/cable_coil/proc/set_cable_color(selected_color, user)
if(!selected_color)
return
@@ -951,7 +951,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
stacktype = null
toolspeed = 0.25
-/obj/item/stack/cable_coil/alien/Initialize(mapload, length = MAXCOIL, var/param_color = null) //There has to be a better way to do this.
+/obj/item/stack/cable_coil/alien/Initialize(mapload, length = MAXCOIL, param_color = null) //There has to be a better way to do this.
. = ..()
if(embed_chance == -1) //From /obj/item, don't want to do what the normal cable_coil does
if(sharp)
@@ -963,7 +963,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
/obj/item/stack/cable_coil/alien/update_icon()
icon_state = initial(icon_state)
-/obj/item/stack/cable_coil/alien/can_use(var/used)
+/obj/item/stack/cable_coil/alien/can_use(used)
return 1
/obj/item/stack/cable_coil/alien/use() //It's endless
diff --git a/code/modules/power/cable_ender.dm b/code/modules/power/cable_ender.dm
index 27bad8accc..d935931e32 100644
--- a/code/modules/power/cable_ender.dm
+++ b/code/modules/power/cable_ender.dm
@@ -14,7 +14,7 @@
unacidable = TRUE
var/id = null
-/obj/structure/cable/ender/get_connections(var/powernetless_only = 0)
+/obj/structure/cable/ender/get_connections(powernetless_only = 0)
. = ..() // Do the normal stuff
if(id)
for(var/obj/structure/cable/ender/target in GLOB.cable_list)
diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm
index f5df287513..3389c5f42a 100644
--- a/code/modules/power/cable_heavyduty.dm
+++ b/code/modules/power/cable_heavyduty.dm
@@ -58,5 +58,5 @@
return
. = ..()
-/obj/structure/cable/heavyduty/cableColor(var/colorC)
+/obj/structure/cable/heavyduty/cableColor(colorC)
return
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 96302cef01..a18091a1ac 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -64,7 +64,7 @@
else
return PROCESS_KILL
-/obj/item/cell/drain_power(var/drain_check, var/surge, var/power = 0)
+/obj/item/cell/drain_power(drain_check, surge, power = 0)
if(drain_check)
return 1
@@ -106,7 +106,7 @@
return (charge == maxcharge)
// checks if the power cell is able to provide the specified amount of charge
-/obj/item/cell/proc/check_charge(var/amount)
+/obj/item/cell/proc/check_charge(amount)
return (charge >= amount)
// Returns how much charge is missing from the cell, useful to make sure not overdraw from the grid when recharging.
@@ -114,7 +114,7 @@
return max(maxcharge - charge, 0)
// use power from a cell, returns the amount actually used
-/obj/item/cell/proc/use(var/amount)
+/obj/item/cell/proc/use(amount)
if(rigged && amount > 0)
explode()
return 0
@@ -126,14 +126,14 @@
// Checks if the specified amount can be provided. If it can, it removes the amount
// from the cell and returns 1. Otherwise does nothing and returns 0.
-/obj/item/cell/proc/checked_use(var/amount)
+/obj/item/cell/proc/checked_use(amount)
if(!check_charge(amount))
return 0
use(amount)
return 1
// recharge the cell
-/obj/item/cell/proc/give(var/amount)
+/obj/item/cell/proc/give(amount)
if(rigged && amount > 0)
explode()
return 0
diff --git a/code/modules/power/cells/power_cells.dm b/code/modules/power/cells/power_cells.dm
index 5f3ca6fa14..01e7ec1803 100644
--- a/code/modules/power/cells/power_cells.dm
+++ b/code/modules/power/cells/power_cells.dm
@@ -241,7 +241,7 @@
. = ..()
-/obj/item/fbp_backup_cell/proc/use(var/mob/living/user, var/mob/living/target)
+/obj/item/fbp_backup_cell/proc/use(mob/living/user, mob/living/target)
if(used)
return
used = TRUE
diff --git a/code/modules/power/debug_items.dm b/code/modules/power/debug_items.dm
index 371b239ded..a136427113 100644
--- a/code/modules/power/debug_items.dm
+++ b/code/modules/power/debug_items.dm
@@ -10,7 +10,7 @@
if(show_extended_information)
. += show_info(user)
-/obj/machinery/power/debug_items/proc/show_info(var/mob/user)
+/obj/machinery/power/debug_items/proc/show_info(mob/user)
var/list/extra_info = list()
if(!powernet)
extra_info += span_filter_notice("This device is not connected to a powernet")
@@ -34,7 +34,7 @@
/obj/machinery/power/debug_items/infinite_generator/process()
add_avail(power_generation_rate)
-/obj/machinery/power/debug_items/infinite_generator/show_info(var/mob/user)
+/obj/machinery/power/debug_items/infinite_generator/show_info(mob/user)
. = ..()
. += span_filter_notice("Generator is providing [num2text(power_generation_rate, 20)] W")
@@ -49,7 +49,7 @@
/obj/machinery/power/debug_items/infinite_cable_powersink/process()
last_used = draw_power(power_usage_rate)
-/obj/machinery/power/debug_items/infinite_cable_powersink/show_info(var/mob/user)
+/obj/machinery/power/debug_items/infinite_cable_powersink/show_info(mob/user)
. = ..()
. += span_filter_notice("Power sink is demanding [num2text(power_usage_rate, 20)] W")
. += span_filter_notice("[num2text(last_used, 20)] W was actually used last tick")
@@ -61,7 +61,7 @@
use_power = USE_POWER_ACTIVE
active_power_usage = 0
-/obj/machinery/power/debug_items/infinite_apc_powersink/show_info(var/mob/user)
+/obj/machinery/power/debug_items/infinite_apc_powersink/show_info(mob/user)
. = ..()
. += span_filter_notice("Dummy load is using [num2text(active_power_usage, 20)] W")
. += span_filter_notice("Powered: [powered() ? "YES" : "NO"]")
diff --git a/code/modules/power/fusion/core/_core.dm b/code/modules/power/fusion/core/_core.dm
index 62c6762f92..f56c336e5d 100644
--- a/code/modules/power/fusion/core/_core.dm
+++ b/code/modules/power/fusion/core/_core.dm
@@ -96,7 +96,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
update_use_power(USE_POWER_ACTIVE)
. = 1
-/obj/machinery/power/fusion_core/proc/Shutdown(var/force_rupture)
+/obj/machinery/power/fusion_core/proc/Shutdown(force_rupture)
if(owned_field)
icon_state = "core0"
if(force_rupture || owned_field.plasma_temperature > 1000)
@@ -107,16 +107,16 @@ GLOBAL_LIST_EMPTY(fusion_cores)
owned_field = null
update_use_power(USE_POWER_IDLE)
-/obj/machinery/power/fusion_core/proc/AddParticles(var/name, var/quantity = 1)
+/obj/machinery/power/fusion_core/proc/AddParticles(name, quantity = 1)
if(owned_field)
owned_field.AddParticles(name, quantity)
. = 1
-/obj/machinery/power/fusion_core/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/power/fusion_core/bullet_act(obj/item/projectile/Proj)
if(owned_field)
. = owned_field.bullet_act(Proj)
-/obj/machinery/power/fusion_core/proc/set_strength(var/value)
+/obj/machinery/power/fusion_core/proc/set_strength(value)
value = CLAMP(value, MIN_FIELD_STR, MAX_FIELD_STR)
if(field_strength != value)
@@ -125,14 +125,14 @@ GLOBAL_LIST_EMPTY(fusion_cores)
if(owned_field)
owned_field.ChangeFieldStrength(value)
-/obj/machinery/power/fusion_core/attack_hand(var/mob/user)
+/obj/machinery/power/fusion_core/attack_hand(mob/user)
if(!Adjacent(user)) // As funny as it was for the AI to hug-kill the tokamak field from a distance...
return
visible_message(span_infoplain(span_bold("\The [user]") + " hugs \the [src] to make it feel better!"))
if(owned_field)
Shutdown()
-/obj/machinery/power/fusion_core/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/power/fusion_core/attackby(obj/item/W, mob/user)
if(owned_field)
to_chat(user,span_warning("Shut \the [src] off first!"))
@@ -156,7 +156,7 @@ GLOBAL_LIST_EMPTY(fusion_cores)
return ..()
-/obj/machinery/power/fusion_core/proc/jumpstart(var/field_temperature)
+/obj/machinery/power/fusion_core/proc/jumpstart(field_temperature)
field_strength = 501 // Generally a good size.
Startup()
if(!owned_field)
diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm
index dc9b699cbe..a9a42dd10d 100644
--- a/code/modules/power/fusion/core/core_control.dm
+++ b/code/modules/power/fusion/core/core_control.dm
@@ -21,7 +21,7 @@
QDEL_NULL(monitor)
. = ..()
-/obj/machinery/computer/fusion_core_control/attackby(var/obj/item/thing, var/mob/user)
+/obj/machinery/computer/fusion_core_control/attackby(obj/item/thing, mob/user)
..()
if(istype(thing, /obj/item/multitool))
var/new_ident = sanitize_text(tgui_input_text(user, "Enter a new ident tag.", "Core Control", monitor.core_tag))
@@ -32,7 +32,7 @@
/obj/machinery/computer/fusion_core_control/attack_ai(mob/user)
attack_hand(user)
-/obj/machinery/computer/fusion_core_control/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/fusion_core_control/attack_hand(mob/user as mob)
..()
if(stat & (BROKEN|NOPOWER))
return
@@ -40,5 +40,5 @@
monitor.tgui_interact(user)
//Returns 1 if the machine can be interacted with via this console.
-/obj/machinery/computer/fusion_core_control/proc/check_core_status(var/obj/machinery/power/fusion_core/C)
+/obj/machinery/computer/fusion_core_control/proc/check_core_status(obj/machinery/power/fusion_core/C)
return istype(C) ? C.check_core_status() : FALSE
diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm
index 558af0a245..f06665c0c0 100644
--- a/code/modules/power/fusion/core/core_field.dm
+++ b/code/modules/power/fusion/core/core_field.dm
@@ -47,7 +47,7 @@
var/last_range
var/last_power
-/obj/effect/fusion_em_field/Initialize(mapload, var/obj/machinery/power/fusion_core/new_owned_core)
+/obj/effect/fusion_em_field/Initialize(mapload, obj/machinery/power/fusion_core/new_owned_core)
. = ..()
set_light(light_min_range,light_min_power)
@@ -266,7 +266,7 @@
else if(critical >= 25)
visible_message(span_danger("\The [src] rumbles and quivers slightly, vibrating the deck."))
*/
-/obj/effect/fusion_em_field/proc/ChangeFieldStrength(var/new_strength)
+/obj/effect/fusion_em_field/proc/ChangeFieldStrength(new_strength)
var/calc_size = 1
if(new_strength <= 50)
calc_size = 1
@@ -279,7 +279,7 @@
field_strength = new_strength
change_size(calc_size)
-/obj/effect/fusion_em_field/proc/AddEnergy(var/a_energy, var/a_plasma_temperature)
+/obj/effect/fusion_em_field/proc/AddEnergy(a_energy, a_plasma_temperature)
energy += a_energy
plasma_temperature += a_plasma_temperature
if(a_energy && percent_unstable > 0)
@@ -290,14 +290,14 @@
energy -= 100
plasma_temperature += 1
-/obj/effect/fusion_em_field/proc/AddParticles(var/name, var/quantity = 1)
+/obj/effect/fusion_em_field/proc/AddParticles(name, quantity = 1)
if(name in dormant_reactant_quantities)
dormant_reactant_quantities[name] += quantity
else if(name != "proton" && name != "electron" && name != "neutron")
dormant_reactant_quantities.Add(name)
dormant_reactant_quantities[name] = quantity
-/obj/effect/fusion_em_field/proc/RadiateAll(var/ratio_lost = 1)
+/obj/effect/fusion_em_field/proc/RadiateAll(ratio_lost = 1)
// Create our plasma field and dump it into our environment.
var/turf/T = get_turf(src)
@@ -363,7 +363,7 @@
tick_instability += rand(15,30)
AM.emp_act(empsev)
-/obj/effect/fusion_em_field/proc/change_size(var/newsize = 1)
+/obj/effect/fusion_em_field/proc/change_size(newsize = 1)
var/changed = 0
switch(newsize)
if(1)
@@ -524,7 +524,7 @@
owned_core = null
. = ..()
-/obj/effect/fusion_em_field/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/fusion_em_field/bullet_act(obj/item/projectile/Proj)
AddEnergy(Proj.damage)
update_icon()
return 0
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
index 9caf5cb4bb..43b2d7f1cc 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
@@ -40,7 +40,7 @@
return ..()
-/obj/item/fuel_assembly/Initialize(mapload, var/_material, var/_colour)
+/obj/item/fuel_assembly/Initialize(mapload, _material, _colour)
. = ..()
fuel_type = _material
fuel_colour = _colour
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm
index 77e48866cb..184b7c2446 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly_ch.dm
@@ -40,7 +40,7 @@
explosion(src.loc, 1, 2, 4, 6)
qdel(src)
-/obj/item/fuel_assembly/blitz/unshielded/attackby(var/obj/item/I, mob/user as mob)
+/obj/item/fuel_assembly/blitz/unshielded/attackby(obj/item/I, mob/user as mob)
..()
var/obj/item/stack/material/lead/M = I
if(istype(M))
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
index 487f5c5b95..fd92a005b6 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
@@ -14,12 +14,12 @@
default_apply_parts()
verbs -= /obj/machinery/fusion_fuel_compressor/verb/eject_sheet //CHOMPAdd
-/obj/machinery/fusion_fuel_compressor/MouseDrop_T(var/atom/movable/target, var/mob/user)
+/obj/machinery/fusion_fuel_compressor/MouseDrop_T(atom/movable/target, mob/user)
if(user.incapacitated() || !user.Adjacent(src))
return
return do_special_fuel_compression(target, user)
-/obj/machinery/fusion_fuel_compressor/proc/do_special_fuel_compression(var/obj/item/thing, var/mob/user)
+/obj/machinery/fusion_fuel_compressor/proc/do_special_fuel_compression(obj/item/thing, mob/user)
if(istype(thing) && thing.reagents && thing.reagents.total_volume && thing.is_open_container())
if(thing.reagents.reagent_list.len > 1)
to_chat(user, span_warning("The contents of \the [thing] are impure and cannot be used as fuel."))
@@ -41,7 +41,7 @@
return 1
return 0
-/obj/machinery/fusion_fuel_compressor/attackby(var/obj/item/thing, var/mob/user)
+/obj/machinery/fusion_fuel_compressor/attackby(obj/item/thing, mob/user)
if(default_deconstruction_screwdriver(user, thing))
return
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_control.dm b/code/modules/power/fusion/fuel_assembly/fuel_control.dm
index 63ae7983fc..350a1ac5ab 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_control.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_control.dm
@@ -19,17 +19,17 @@
QDEL_NULL(monitor)
. = ..()
-/obj/machinery/computer/fusion_fuel_control/attack_ai(var/mob/user)
+/obj/machinery/computer/fusion_fuel_control/attack_ai(mob/user)
attack_hand(user)
-/obj/machinery/computer/fusion_fuel_control/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/fusion_fuel_control/attack_hand(mob/user as mob)
..()
if(stat & (BROKEN|NOPOWER))
return
monitor.tgui_interact(user)
-/obj/machinery/computer/fusion_fuel_control/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/computer/fusion_fuel_control/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/multitool))
var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "Fuel Control", monitor.fuel_tag, MAX_NAME_LEN)
diff --git a/code/modules/power/fusion/fusion_particle_catcher.dm b/code/modules/power/fusion/fusion_particle_catcher.dm
index 5289622941..83d8146e82 100644
--- a/code/modules/power/fusion/fusion_particle_catcher.dm
+++ b/code/modules/power/fusion/fusion_particle_catcher.dm
@@ -13,12 +13,12 @@
parent.particle_catchers -= src
parent = null
-/obj/effect/fusion_particle_catcher/proc/SetSize(var/newsize)
+/obj/effect/fusion_particle_catcher/proc/SetSize(newsize)
name = "collector [newsize]"
mysize = newsize
UpdateSize()
-/obj/effect/fusion_particle_catcher/proc/AddParticles(var/name, var/quantity = 1)
+/obj/effect/fusion_particle_catcher/proc/AddParticles(name, quantity = 1)
if(parent && parent.size >= mysize)
parent.AddParticles(name, quantity)
return 1
@@ -32,7 +32,7 @@
density = FALSE
name = "collector [mysize] OFF"
-/obj/effect/fusion_particle_catcher/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/fusion_particle_catcher/bullet_act(obj/item/projectile/Proj)
parent.AddEnergy(Proj.damage)
update_icon()
return 0
diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm
index 71606068f5..0da23918fa 100644
--- a/code/modules/power/fusion/fusion_reactions.dm
+++ b/code/modules/power/fusion/fusion_reactions.dm
@@ -11,10 +11,10 @@ GLOBAL_LIST(fusion_reactions)
var/list/products = list()
var/minimum_reaction_temperature = 100
-/datum/decl/fusion_reaction/proc/handle_reaction_special(var/obj/effect/fusion_em_field/holder)
+/datum/decl/fusion_reaction/proc/handle_reaction_special(obj/effect/fusion_em_field/holder)
return 0
-/proc/get_fusion_reaction(var/p_react, var/s_react, var/m_energy)
+/proc/get_fusion_reaction(p_react, s_react, m_energy)
if(!GLOB.fusion_reactions)
GLOB.fusion_reactions = list()
for(var/rtype in subtypesof(/datum/decl/fusion_reaction))
@@ -110,7 +110,7 @@ GLOBAL_LIST(fusion_reactions)
radiation = 20
instability = 20
-/datum/decl/fusion_reaction/phoron_supermatter/handle_reaction_special(var/obj/effect/fusion_em_field/holder)
+/datum/decl/fusion_reaction/phoron_supermatter/handle_reaction_special(obj/effect/fusion_em_field/holder)
wormhole_event()
diff --git a/code/modules/power/fusion/gyrotron/gyrotron.dm b/code/modules/power/fusion/gyrotron/gyrotron.dm
index 1e2784ecfe..4843ca089d 100644
--- a/code/modules/power/fusion/gyrotron/gyrotron.dm
+++ b/code/modules/power/fusion/gyrotron/gyrotron.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(gyrotrons)
GLOB.gyrotrons -= src
return ..()
-/obj/machinery/power/emitter/gyrotron/proc/set_beam_power(var/new_power)
+/obj/machinery/power/emitter/gyrotron/proc/set_beam_power(new_power)
mega_energy = new_power
update_active_power_usage(mega_energy * initial(active_power_usage))
@@ -51,7 +51,7 @@ GLOBAL_LIST_EMPTY(gyrotrons)
else
icon_state = "emitter-off"
-/obj/machinery/power/emitter/gyrotron/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/power/emitter/gyrotron/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/multitool))
var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "Gyrotron", id_tag, MAX_NAME_LEN)
if(new_ident && user.Adjacent(src))
diff --git a/code/modules/power/fusion/gyrotron/gyrotron_control.dm b/code/modules/power/fusion/gyrotron/gyrotron_control.dm
index 369c12c5ea..4a17e772c2 100644
--- a/code/modules/power/fusion/gyrotron/gyrotron_control.dm
+++ b/code/modules/power/fusion/gyrotron/gyrotron_control.dm
@@ -21,17 +21,17 @@
QDEL_NULL(monitor)
. = ..()
-/obj/machinery/computer/gyrotron_control/attack_ai(var/mob/user)
+/obj/machinery/computer/gyrotron_control/attack_ai(mob/user)
attack_hand(user)
-/obj/machinery/computer/gyrotron_control/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/gyrotron_control/attack_hand(mob/user as mob)
..()
if(stat & (BROKEN|NOPOWER))
return
monitor.tgui_interact(user)
-/obj/machinery/computer/gyrotron_control/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/computer/gyrotron_control/attackby(obj/item/W, mob/user)
..()
if(istype(W, /obj/item/multitool))
var/new_ident = tgui_input_text(user, "Enter a new ident tag.", "Gyrotron Control", monitor.gyro_tag, MAX_NAME_LEN)
diff --git a/code/modules/power/fusion/magpower.dm b/code/modules/power/fusion/magpower.dm
index c36ad77e87..5f5629bbd4 100644
--- a/code/modules/power/fusion/magpower.dm
+++ b/code/modules/power/fusion/magpower.dm
@@ -14,7 +14,7 @@
var/id_tag //needed for !!rasins!!
circuit = /obj/item/circuitboard/hydromagnetic_trap
-/obj/machinery/power/hydromagnetic_trap/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/power/hydromagnetic_trap/attackby(obj/item/W, mob/user)
if(default_unfasten_wrench(user, W))
return
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index fd75636ae5..2f505a5fc6 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -240,7 +240,7 @@ GLOBAL_LIST_EMPTY(all_turbines)
update_icon()
-/obj/machinery/power/generator/power_spike(var/announce_prob = 30)
+/obj/machinery/power/generator/power_spike(announce_prob = 30)
if(!(effective_gen >= max_power / 2 && powernet)) // Don't make a spike if we're not making a whole lot of power.
return
diff --git a/code/modules/power/gravitygenerator_vr.dm b/code/modules/power/gravitygenerator_vr.dm
index d451477df4..2ab96027eb 100644
--- a/code/modules/power/gravitygenerator_vr.dm
+++ b/code/modules/power/gravitygenerator_vr.dm
@@ -383,7 +383,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
strength = charge_count * 2
)
-/obj/machinery/gravity_generator/main/proc/update_gravity(var/on)
+/obj/machinery/gravity_generator/main/proc/update_gravity(on)
for(var/area/A in src.areas)
A.gravitychange(on)
diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm
index f820957fd2..6bf4f17e4a 100644
--- a/code/modules/power/grid_checker.dm
+++ b/code/modules/power/grid_checker.dm
@@ -60,7 +60,7 @@
return tgui_interact(user)
-/obj/machinery/power/grid_checker/proc/power_failure(var/announce = TRUE)
+/obj/machinery/power/grid_checker/proc/power_failure(announce = TRUE)
if(announce)
GLOB.command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, \
the station's power will be shut off for an indeterminate duration while the powernet monitor restarts automatically, or \
@@ -86,7 +86,7 @@
if(power_failing) // Check to see if engineering didn't beat us to it.
end_power_failure(TRUE)
-/obj/machinery/power/grid_checker/proc/end_power_failure(var/announce = TRUE)
+/obj/machinery/power/grid_checker/proc/end_power_failure(announce = TRUE)
if(announce)
GLOB.command_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.",
"Power Systems Nominal",
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 73cbd3c03a..ee236b2a2d 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -9,7 +9,7 @@
#define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick
GLOBAL_LIST_EMPTY(light_type_cache)
-/proc/get_light_type_instance(var/light_type)
+/proc/get_light_type_instance(light_type)
. = GLOB.light_type_cache[light_type]
if(!.)
. = new light_type
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
var/cell_connectors = TRUE
-/obj/machinery/light_construct/Initialize(mapload, var/newdir, var/building = 0, var/datum/frame/frame_types/frame_type, var/obj/machinery/light/fixture = null)
+/obj/machinery/light_construct/Initialize(mapload, newdir, building = 0, datum/frame/frame_types/frame_type, obj/machinery/light/fixture = null)
. = ..()
if(fixture)
fixture_type = fixture.type
@@ -452,7 +452,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
// CHOMPStation Edit End
// update lighting
-/obj/machinery/light/proc/update(var/trigger = 1)
+/obj/machinery/light/proc/update(trigger = 1)
update_icon()
if(!on)
needsound = TRUE // Play sound next time we turn on
@@ -501,7 +501,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
update_light()
update_active_power_usage((light_range * light_power) * LIGHTING_POWER_FACTOR)
-/obj/machinery/light/proc/nightshift_mode(var/state)
+/obj/machinery/light/proc/nightshift_mode(state)
if(!nightshift_allowed)
return
@@ -509,7 +509,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
nightshift_enabled = state
update(FALSE)
-/obj/machinery/light/attack_generic(var/mob/user, var/damage)
+/obj/machinery/light/attack_generic(mob/user, damage)
if(!damage)
return
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
@@ -522,7 +522,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
broken()
return 1
-/obj/machinery/light/take_damage(var/damage)
+/obj/machinery/light/take_damage(damage)
if(!damage)
return
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
@@ -537,7 +537,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
// attempt to set the light's on/off status
// will not switch on if broken/burned/empty
-/obj/machinery/light/proc/seton(var/s)
+/obj/machinery/light/proc/seton(s)
on = (s && status == LIGHT_OK)
update()
@@ -738,7 +738,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
set_light(brightness_range * bulb_emergency_brightness_mul, max(bulb_emergency_pow_min, bulb_emergency_pow_mul * (cell.charge / cell.maxcharge)), bulb_emergency_colour)
return TRUE
-/obj/machinery/light/proc/flicker(var/amount = rand(10, 20), var/flicker_color)
+/obj/machinery/light/proc/flicker(amount = rand(10, 20), flicker_color)
if(flickering) return
if(on && status == LIGHT_OK)
flickering = 1
@@ -869,7 +869,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
// break the light and make sparks if was on
-/obj/machinery/light/proc/broken(var/skip_sound_and_sparks = FALSE)
+/obj/machinery/light/proc/broken(skip_sound_and_sparks = FALSE)
if(status == LIGHT_EMPTY)
return
@@ -1120,7 +1120,7 @@ GLOBAL_LIST_EMPTY(light_type_cache)
// attack bulb/tube with object
// if a syringe, can inject phoron to make it explode
-/obj/item/light/attackby(var/obj/item/I, var/mob/user)
+/obj/item/light/attackby(obj/item/I, mob/user)
..()
if(isrobot(user))
I = user.get_active_hand()
diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm
index 3eaaf76807..616588ccf1 100644
--- a/code/modules/power/lighting_vr.dm
+++ b/code/modules/power/lighting_vr.dm
@@ -150,7 +150,7 @@
overlay_above_everything = TRUE
color = "#3e5064"
-/obj/machinery/light/small/fairylights/broken(var/skip_sound_and_sparks = FALSE)
+/obj/machinery/light/small/fairylights/broken(skip_sound_and_sparks = FALSE)
return
/obj/machinery/light/small/fairylights/flicker
diff --git a/code/modules/power/lightswitch_vr.dm b/code/modules/power/lightswitch_vr.dm
index 9995b6e457..3683ca9977 100644
--- a/code/modules/power/lightswitch_vr.dm
+++ b/code/modules/power/lightswitch_vr.dm
@@ -58,7 +58,7 @@
var/x_offset = 26
var/y_offset = 26
-/obj/structure/construction/Initialize(mapload, var/ndir, var/building = FALSE)
+/obj/structure/construction/Initialize(mapload, ndir, building = FALSE)
. = ..()
if(ndir)
set_dir(ndir)
diff --git a/code/modules/power/pacman2.dm b/code/modules/power/pacman2.dm
index ce01853623..fbbdb6c84a 100644
--- a/code/modules/power/pacman2.dm
+++ b/code/modules/power/pacman2.dm
@@ -157,7 +157,7 @@
usr << browse(null, "window=port_gen")
usr.machine = null
-/obj/machinery/power/port_gen/pacman2/emag_act(var/remaining_uses, var/mob/user)
+/obj/machinery/power/port_gen/pacman2/emag_act(remaining_uses, mob/user)
emagged = 1
emp_act(EMP_HEAVY)
return 1
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index bf06418eea..72e7546300 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -262,7 +262,7 @@
sheet_left = 0
..()
-/obj/machinery/power/port_gen/pacman/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/power/port_gen/pacman/emag_act(remaining_charges, mob/user)
if (active && prob(25))
explode() //if they're foolish enough to emag while it's running
@@ -270,7 +270,7 @@
emagged = 1
return 1
-/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/power/port_gen/pacman/attackby(obj/item/O, mob/user)
if(istype(O, sheet_path))
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.get_amount())
diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm
index 6a9f3813db..71e2b28296 100644
--- a/code/modules/power/port_gen_vr.dm
+++ b/code/modules/power/port_gen_vr.dm
@@ -241,7 +241,7 @@
log_and_message_admins("[ADMIN_LOOKUPFLW(Proj.firer)] triggered an Abductor Core explosion at [x],[y],[z] via projectile.", Proj.firer)
asplod()
-/obj/machinery/power/rtg/abductor/attack_hand(var/mob/living/user)
+/obj/machinery/power/rtg/abductor/attack_hand(mob/living/user)
if(!istype(user) || (. = ..()))
return
@@ -378,7 +378,7 @@
/obj/machinery/power/rtg/reg/Destroy()
. = ..()
-/obj/machinery/power/rtg/reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE)
+/obj/machinery/power/rtg/reg/user_buckle_mob(mob/living/M, mob/user, forced = FALSE, silent = TRUE)
. = ..()
M.pixel_y = 8
M.visible_message(span_notice("\The [M], hops up onto \the [src] and begins running!"))
@@ -419,7 +419,7 @@
power_gen = 0
update_icon()
-/obj/machinery/power/rtg/reg/proc/runner_process(var/mob/living/runner)
+/obj/machinery/power/rtg/reg/proc/runner_process(mob/living/runner)
if(runner.stat != CONSCIOUS)
unbuckle_mob(runner)
runner.visible_message(span_warning("\The [runner], topples off of \the [src]!"))
@@ -529,7 +529,7 @@
else
sheet_left -= needed_sheets
-/obj/machinery/power/port_gen/large_altevian/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/power/port_gen/large_altevian/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, sheet_path))
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.get_amount())
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 0c9575115a..693ee50b46 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -24,7 +24,7 @@
//////////////////////////////
// common helper procs for all power machines
-/obj/machinery/power/drain_power(var/drain_check, var/surge, var/amount = 0)
+/obj/machinery/power/drain_power(drain_check, surge, amount = 0)
if(drain_check)
return 1
@@ -32,13 +32,13 @@
powernet.trigger_warning()
return powernet.draw_power(amount)
-/obj/machinery/power/proc/add_avail(var/amount)
+/obj/machinery/power/proc/add_avail(amount)
if(powernet)
powernet.newavail += amount
return TRUE
return FALSE
-/obj/machinery/power/proc/draw_power(var/amount)
+/obj/machinery/power/proc/draw_power(amount)
if(powernet)
return powernet.draw_power(amount)
return 0
@@ -61,7 +61,7 @@
else
return 0
-/obj/machinery/power/proc/disconnect_terminal(var/obj/machinery/power/terminal/term) // machines without a terminal will just return, no harm no fowl.
+/obj/machinery/power/proc/disconnect_terminal(obj/machinery/power/terminal/term) // machines without a terminal will just return, no harm no fowl.
return
// connect the machine to a powernet if a node cable is present on the turf
@@ -109,7 +109,7 @@
return
// Power machinery should also connect/disconnect from the network.
-/obj/machinery/power/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 20)
+/obj/machinery/power/default_unfasten_wrench(mob/user, obj/item/W, time = 20)
if((. = ..()))
if(anchored)
connect_to_network()
@@ -117,7 +117,7 @@
disconnect_from_network()
// Used for power spikes by the engine, has specific effects on different machines.
-/obj/machinery/power/proc/overload(var/obj/machinery/power/source)
+/obj/machinery/power/proc/overload(obj/machinery/power/source)
return
// Used by the grid checker upon receiving a power spike.
@@ -185,7 +185,7 @@
// returns a list of all power-related objects (nodes, cable, junctions) in turf,
// excluding source, that match the direction d
// if unmarked==1, only return those with no powernet
-/proc/power_list(var/turf/T, var/source, var/d, var/unmarked=0, var/cable_only = 0)
+/proc/power_list(turf/T, source, d, unmarked=0, cable_only = 0)
. = list()
var/reverse = d ? GLOB.reverse_dir[d] : 0
@@ -209,7 +209,7 @@
return .
//remove the old powernet and replace it with a new one throughout the network.
-/proc/propagate_network(var/obj/O, var/datum/powernet/PN)
+/proc/propagate_network(obj/O, datum/powernet/PN)
//to_world_log("propagating new network")
var/list/worklist = list()
var/list/found_machines = list()
@@ -242,7 +242,7 @@
//Merge two powernets, the bigger (in cable length term) absorbing the other
-/proc/merge_powernets(var/datum/powernet/net1, var/datum/powernet/net2)
+/proc/merge_powernets(datum/powernet/net1, datum/powernet/net2)
if(!net1 || !net2) //if one of the powernet doesn't exist, return
return
@@ -272,7 +272,7 @@
//power_source is a source of electricity, can be powercell, area, apc, cable, powernet or null
//source is an object caused electrocuting (airlock, grille, etc)
//No animations will be performed by this proc.
-/proc/electrocute_mob(mob/living/M as mob, var/power_source, var/obj/source, var/siemens_coeff = 1.0)
+/proc/electrocute_mob(mob/living/M as mob, power_source, obj/source, siemens_coeff = 1.0)
if(istype(M.loc,/obj/mecha)) return 0 //feckin mechs are dumb
if(issilicon(M)) return 0 //No more robot shocks from machinery
var/area/source_area
diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm
index b16aa12549..a53faf4ef3 100644
--- a/code/modules/power/powernet.dm
+++ b/code/modules/power/powernet.dm
@@ -39,7 +39,7 @@
/datum/powernet/proc/last_surplus()
return max(avail - load, 0)
-/datum/powernet/proc/draw_power(var/amount)
+/datum/powernet/proc/draw_power(amount)
var/draw = between(0, amount, avail - load)
load += draw
return draw
@@ -50,7 +50,7 @@
//remove a cable from the current powernet
//if the powernet is then empty, delete it
//Warning : this proc DON'T check if the cable exists
-/datum/powernet/proc/remove_cable(var/obj/structure/cable/C)
+/datum/powernet/proc/remove_cable(obj/structure/cable/C)
cables -= C
C.powernet = null
if(is_empty())//the powernet is now empty...
@@ -58,7 +58,7 @@
//add a cable to the current powernet
//Warning : this proc DON'T check if the cable exists
-/datum/powernet/proc/add_cable(var/obj/structure/cable/C)
+/datum/powernet/proc/add_cable(obj/structure/cable/C)
if(C.powernet)// if C already has a powernet...
if(C.powernet == src)
return
@@ -70,7 +70,7 @@
//remove a power machine from the current powernet
//if the powernet is then empty, delete it
//Warning : this proc DON'T check if the machine exists
-/datum/powernet/proc/remove_machine(var/obj/machinery/power/M)
+/datum/powernet/proc/remove_machine(obj/machinery/power/M)
nodes -=M
M.powernet = null
if(is_empty())//the powernet is now empty...
@@ -79,7 +79,7 @@
//add a power machine to the current powernet
//Warning : this proc DON'T check if the machine exists
-/datum/powernet/proc/add_machine(var/obj/machinery/power/M)
+/datum/powernet/proc/add_machine(obj/machinery/power/M)
if(M.powernet)// if M already has a powernet...
if(M.powernet == src)
return
@@ -89,7 +89,7 @@
nodes[M] = M
// Triggers warning for certain amount of ticks
-/datum/powernet/proc/trigger_warning(var/duration_ticks = 20)
+/datum/powernet/proc/trigger_warning(duration_ticks = 20)
problem = max(duration_ticks, problem)
@@ -147,7 +147,7 @@
newavail = 0
smes_newavail = 0
-/datum/powernet/proc/get_percent_load(var/smes_only = 0)
+/datum/powernet/proc/get_percent_load(smes_only = 0)
if(smes_only)
var/smes_used = load - (avail - smes_avail) // SMESs are always last to provide power
if(!smes_used || smes_used < 0 || !smes_avail) // SMES power isn't available or being used at all, SMES load is therefore 0%
diff --git a/code/modules/power/sensors/powernet_sensor.dm b/code/modules/power/sensors/powernet_sensor.dm
index a469b248c2..b84c470724 100644
--- a/code/modules/power/sensors/powernet_sensor.dm
+++ b/code/modules/power/sensors/powernet_sensor.dm
@@ -125,7 +125,7 @@
// Proc: reading_to_text()
// Parameters: 1 (amount - Power in Watts to be converted to W, kW or MW)
// Description: Helper proc that converts reading in Watts to kW or MW (returns string version of amount parameter)
-/obj/machinery/power/sensor/proc/reading_to_text(var/amount = 0)
+/obj/machinery/power/sensor/proc/reading_to_text(amount = 0)
var/units = ""
// 10kW and less - Watts
if(amount < 10000)
diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm
index f8bc9728ec..defbc56773 100644
--- a/code/modules/power/sensors/sensor_monitoring.dm
+++ b/code/modules/power/sensors/sensor_monitoring.dm
@@ -53,7 +53,7 @@
return proximity_flag
// Uses dark magic to operate the NanoUI of this computer.
-/obj/machinery/computer/power_monitor/tgui_interact(mob/user, var/datum/tgui/ui = null)
+/obj/machinery/computer/power_monitor/tgui_interact(mob/user, datum/tgui/ui = null)
power_monitor.tgui_interact(user, ui)
// Verifies if any warnings were registered by connected sensors.
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 52fec7b098..81c1a1a13a 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -131,7 +131,7 @@
// Continuing here, SM giving us ~170 rads per pulse, a phoron canister full of 30 mols, and * 20 we get:
// 102000W per collector...So 10 collectors will give us ~1MW.
-/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
+/obj/machinery/power/rad_collector/proc/receive_pulse(pulse_strength)
if(P && active)
var/power_produced = 0
power_produced = P.air_contents.gas[GAS_PHORON]*pulse_strength*20
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 938c2091f9..511e607d65 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -93,7 +93,7 @@
VARSET_IN(src, hasShocked, FALSE, 2 SECONDS)
-/obj/machinery/containment_field/proc/set_master(var/master1,var/master2)
+/obj/machinery/containment_field/proc/set_master(master1,master2)
if(!master1 || !master2)
return 0
FG1 = master1
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 6d6a5471cd..c88483df8a 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -243,14 +243,14 @@
..()
return
-/obj/machinery/power/emitter/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/power/emitter/emag_act(remaining_charges, mob/user)
if(!emagged)
locked = 0
emagged = 1
user.visible_message("[user.name] emags [src].",span_warning("You short out the lock."))
return 1
-/obj/machinery/power/emitter/bullet_act(var/obj/item/projectile/P)
+/obj/machinery/power/emitter/bullet_act(obj/item/projectile/P)
if(!P || !P.damage || P.get_structure_damage() <= 0 )
return
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index af46ba3547..7ecf1313ed 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -170,7 +170,7 @@
..()
return
-/obj/machinery/field_generator/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/field_generator/bullet_act(obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam))
power += Proj.damage * EMITTER_DAMAGE_POWER_TRANSFER
update_icon()
@@ -232,7 +232,7 @@
return 0
//Tries to draw the needed power from our own power reserve, or connected generators if we can. Returns the amount of power we were able to get.
-/obj/machinery/field_generator/proc/draw_power(var/draw = 0, var/list/flood_list = list())
+/obj/machinery/field_generator/proc/draw_power(draw = 0, list/flood_list = list())
flood_list += src
if(src.power >= draw)//We have enough power
@@ -267,7 +267,7 @@
src.active = 2
-/obj/machinery/field_generator/proc/setup_field(var/NSEW)
+/obj/machinery/field_generator/proc/setup_field(NSEW)
var/turf/T = src.loc
var/obj/machinery/field_generator/G
var/steps = 0
diff --git a/code/modules/power/singularity/investigate.dm b/code/modules/power/singularity/investigate.dm
index c0c62616ed..dbf4f18b0a 100644
--- a/code/modules/power/singularity/investigate.dm
+++ b/code/modules/power/singularity/investigate.dm
@@ -1,4 +1,4 @@
-/area/engineering/power_alert(var/alarming)
+/area/engineering/power_alert(alarming)
if (alarming)
investigate_log("has a power alarm!","singulo")
..()
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index c188d2be46..162e54fd7d 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -73,14 +73,14 @@
/obj/effect/accelerated_particle/singularity_act()
return
-/obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M)
+/obj/effect/accelerated_particle/proc/toxmob(mob/living/M)
var/radiation = (energy*2)
M.apply_effect((radiation*3),IRRADIATE,0)
M.updatehealth()
//to_chat(M, span_warning("You feel odd."))
-/obj/effect/accelerated_particle/proc/move(var/lag)
+/obj/effect/accelerated_particle/proc/move(lag)
if(target)
if(movetotarget)
if(!step_towards(src,target))
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 711a212d84..da6ede7a4f 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -156,7 +156,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return 0
-/obj/structure/particle_accelerator/proc/report_ready(var/obj/O)
+/obj/structure/particle_accelerator/proc/report_ready(obj/O)
if(O && (O == master))
if(construction_state >= 3)
return 1
@@ -169,7 +169,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return 0
-/obj/structure/particle_accelerator/proc/connect_master(var/obj/O)
+/obj/structure/particle_accelerator/proc/connect_master(obj/O)
if(O && istype(O,/obj/machinery/particle_accelerator/control_box))
if(O.dir == src.dir)
master = O
@@ -177,7 +177,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return 0
-/obj/structure/particle_accelerator/proc/process_tool_hit(var/obj/item/O, var/mob/user)
+/obj/structure/particle_accelerator/proc/process_tool_hit(obj/item/O, mob/user)
if(!(O) || !(user))
return 0
if(!ismob(user) || !isobj(O))
@@ -293,7 +293,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
/obj/machinery/particle_accelerator/proc/update_state()
return 0
-/obj/machinery/particle_accelerator/proc/process_tool_hit(var/obj/item/O, var/mob/user)
+/obj/machinery/particle_accelerator/proc/process_tool_hit(obj/item/O, mob/user)
if(!(O) || !(user))
return 0
if(!ismob(user) || !isobj(O))
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 36a47b60b5..d46e4cd6f5 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -81,7 +81,7 @@
part.strength = strength
part.update_icon()
-/obj/machinery/particle_accelerator/control_box/proc/add_strength(mob/user, var/s)
+/obj/machinery/particle_accelerator/control_box/proc/add_strength(mob/user, s)
if(assembled)
strength++
if(strength > strength_upper_limit)
@@ -92,7 +92,7 @@
investigate_log("increased to " + span_red("[strength]") + " by [user.key]","singulo")
strength_change()
-/obj/machinery/particle_accelerator/control_box/proc/remove_strength(mob/user, var/s)
+/obj/machinery/particle_accelerator/control_box/proc/remove_strength(mob/user, s)
if(assembled)
strength--
if(strength < 0)
@@ -169,7 +169,7 @@
-/obj/machinery/particle_accelerator/control_box/proc/check_part(var/turf/T, var/type)
+/obj/machinery/particle_accelerator/control_box/proc/check_part(turf/T, type)
if(!(T)||!(type))
return 0
diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
index 354ef21753..dd8f02daec 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm
@@ -21,13 +21,13 @@
reference = "emitter_right"
-/obj/structure/particle_accelerator/particle_emitter/proc/set_delay(var/delay)
+/obj/structure/particle_accelerator/particle_emitter/proc/set_delay(delay)
if(delay && delay >= 0)
fire_delay = delay
return 1
return 0
-/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(var/strength = 0)
+/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(strength = 0)
if((last_shot + fire_delay) <= world.time)
last_shot = world.time
var/obj/effect/accelerated_particle/A = null
diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
index 08f2ce8435..70057aca62 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm
@@ -46,7 +46,7 @@
for(var/obj/item/I in contents)
. += span_notice("\the [I]")
-/obj/machinery/particle_smasher/atmosanalyze(var/mob/user)
+/obj/machinery/particle_smasher/atmosanalyze(mob/user)
return list(span_notice("\The [src] reads an energy level of [energy]."))
/obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob)
@@ -139,7 +139,7 @@
else
set_light(0, 0, "#FFFFFF")
-/obj/machinery/particle_smasher/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/particle_smasher/bullet_act(obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam))
if(Proj.damage >= 50)
TryCraft()
@@ -239,7 +239,7 @@
break
update_icon()
-/obj/machinery/particle_smasher/proc/DoCraft(var/datum/particle_smasher_recipe/recipe)
+/obj/machinery/particle_smasher/proc/DoCraft(datum/particle_smasher_recipe/recipe)
if(!successful_craft || !recipe)
return
@@ -306,7 +306,7 @@
var/item_consume_chance = 100 // The probability for the items (not materials) used in the recipe to be consume.
var/wiki_flag = NONE
-/datum/particle_smasher_recipe/proc/check_items(var/obj/container as obj)
+/datum/particle_smasher_recipe/proc/check_items(obj/container as obj)
. = 1
if (items && items.len)
var/list/checklist = list()
@@ -329,7 +329,7 @@
. = -1
return .
-/datum/particle_smasher_recipe/proc/check_reagents(var/datum/reagents/avail_reagents)
+/datum/particle_smasher_recipe/proc/check_reagents(datum/reagents/avail_reagents)
. = 1
for (var/r_r in reagents)
var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index ee80286e5d..422befcd2d 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -31,7 +31,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
var/chained = 0//Adminbus chain-grab
-/obj/singularity/Initialize(mapload, var/starting_energy = 50)
+/obj/singularity/Initialize(mapload, starting_energy = 50)
//CARN: admin-alert for chuckle-fuckery.
admin_investigate_setup()
. = ..()
@@ -108,7 +108,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
else
dissipate_track++
-/obj/singularity/proc/expand(var/force_size = 0, var/growing = 1)
+/obj/singularity/proc/expand(force_size = 0, growing = 1)
if(current_size == STAGE_SUPER)//if this is happening, this is an error
message_admins("expand() was called on a super singulo. This should not happen. Contact a coder immediately!")
return
@@ -278,7 +278,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
src.energy += A.singularity_act(src, current_size)
return
-/obj/singularity/proc/move(var/force_move = 0)
+/obj/singularity/proc/move(force_move = 0)
if(!move_self)
return 0
@@ -305,7 +305,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
last_failed_movement = movement_dir
return 0
-/obj/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0)
+/obj/singularity/proc/check_turfs_in(direction = 0, step = 0)
if(!direction)
return 0
var/steps = 0
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index f434957dc1..d28e8e8b2d 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(smeses)
var/noisy = FALSE
// CHOMPAdd End
-/obj/machinery/power/smes/drain_power(var/drain_check, var/surge, var/amount = 0)
+/obj/machinery/power/smes/drain_power(drain_check, surge, amount = 0)
if(drain_check)
return 1
@@ -146,13 +146,13 @@ GLOBAL_LIST_EMPTY(smeses)
return FALSE
return TRUE
-/obj/machinery/power/smes/add_avail(var/amount)
+/obj/machinery/power/smes/add_avail(amount)
if(..(amount))
powernet.smes_newavail += amount
return 1
return 0
-/obj/machinery/power/smes/disconnect_terminal(var/obj/machinery/power/terminal/term)
+/obj/machinery/power/smes/disconnect_terminal(obj/machinery/power/terminal/term)
terminals -= term
term.master = null
@@ -179,7 +179,7 @@ GLOBAL_LIST_EMPTY(smeses)
/obj/machinery/power/smes/proc/chargedisplay()
return round(5.5*charge/(capacity ? capacity : 5e6))
-/obj/machinery/power/smes/proc/input_power(var/percentage, var/obj/machinery/power/terminal/term)
+/obj/machinery/power/smes/proc/input_power(percentage, obj/machinery/power/terminal/term)
var/to_input = target_load * (percentage/100)
to_input = between(0, to_input, target_load)
if(percentage == 100)
@@ -193,10 +193,10 @@ GLOBAL_LIST_EMPTY(smeses)
input_available += inputted
// Mostly in place due to child types that may store power in other way (PSUs)
-/obj/machinery/power/smes/proc/add_charge(var/amount)
+/obj/machinery/power/smes/proc/add_charge(amount)
charge += amount*SMESRATE
-/obj/machinery/power/smes/proc/remove_charge(var/amount)
+/obj/machinery/power/smes/proc/remove_charge(amount)
charge -= amount*SMESRATE
/obj/machinery/power/smes/process()
@@ -253,7 +253,7 @@ GLOBAL_LIST_EMPTY(smeses)
// called after all power processes are finished
// restores charge level to smes if there was excess this ptick
-/obj/machinery/power/smes/proc/restore(var/percent_load)
+/obj/machinery/power/smes/proc/restore(percent_load)
if(stat & BROKEN)
return
@@ -312,14 +312,14 @@ GLOBAL_LIST_EMPTY(smeses)
return 0
return 1
-/obj/machinery/power/smes/proc/check_terminal_exists(var/turf/location, var/mob/user, var/direction)
+/obj/machinery/power/smes/proc/check_terminal_exists(turf/location, mob/user, direction)
for(var/obj/machinery/power/terminal/term in location)
if(term.dir == direction)
to_chat(user, span_filter_notice(span_notice("There is already a terminal here.")))
return 1
return 0
-/obj/machinery/power/smes/draw_power(var/amount)
+/obj/machinery/power/smes/draw_power(amount)
var/drained = 0
for(var/obj/machinery/power/terminal/term in terminals)
if(!term.powernet)
@@ -339,7 +339,7 @@ GLOBAL_LIST_EMPTY(smeses)
tgui_interact(user)
-/obj/machinery/power/smes/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/power/smes/attackby(obj/item/W as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, W))
return FALSE
@@ -516,17 +516,17 @@ GLOBAL_LIST_EMPTY(smeses)
set_output(target)
-/obj/machinery/power/smes/proc/inputting(var/do_input)
+/obj/machinery/power/smes/proc/inputting(do_input)
input_attempt = do_input
if(!input_attempt)
inputting = 0
-/obj/machinery/power/smes/proc/outputting(var/do_output)
+/obj/machinery/power/smes/proc/outputting(do_output)
output_attempt = do_output
if(!output_attempt)
outputting = 0
-/obj/machinery/power/smes/take_damage(var/amount)
+/obj/machinery/power/smes/take_damage(amount)
amount = max(0, round(amount))
damage += amount
if(damage > maxdamage)
@@ -554,15 +554,15 @@ GLOBAL_LIST_EMPTY(smeses)
charge = 0
update_icon()
-/obj/machinery/power/smes/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/power/smes/bullet_act(obj/item/projectile/Proj)
take_damage(Proj.get_structure_damage())
-/obj/machinery/power/smes/ex_act(var/severity)
+/obj/machinery/power/smes/ex_act(severity)
// Two strong explosions will destroy a SMES.
// Given the SMES creates another explosion on it's destruction it sounds fairly reasonable.
take_damage(250 / severity)
-/obj/machinery/power/smes/examine(var/mob/user)
+/obj/machinery/power/smes/examine(mob/user)
. = ..()
. += span_filter_notice("The service hatch is [panel_open ? "open" : "closed"].")
if(!damage)
@@ -596,14 +596,14 @@ GLOBAL_LIST_EMPTY(smeses)
// Proc: set_input()
// Parameters: 1 (new_input - New input value in Watts)
// Description: Sets input setting on this SMES. Trims it if limits are exceeded.
-/obj/machinery/power/smes/proc/set_input(var/new_input = 0)
+/obj/machinery/power/smes/proc/set_input(new_input = 0)
input_level = between(0, new_input, input_level_max)
update_icon()
// Proc: set_output()
// Parameters: 1 (new_output - New output value in Watts)
// Description: Sets output setting on this SMES. Trims it if limits are exceeded.
-/obj/machinery/power/smes/proc/set_output(var/new_output = 0)
+/obj/machinery/power/smes/proc/set_output(new_output = 0)
output_level = between(0, new_output, output_level_max)
update_icon()
@@ -614,7 +614,7 @@ GLOBAL_LIST_EMPTY(smeses)
var/recharge_rate = 10000
var/overlay_icon = 'icons/obj/power_vr.dmi'
-/obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/power/smes/buildable/hybrid/attackby(obj/item/W as obj, mob/user as mob)
if(W.has_tool_quality(TOOL_SCREWDRIVER) || W.has_tool_quality(TOOL_WIRECUTTER))
to_chat(user,span_warning("\The [src] full of weird alien technology that's best not messed with."))
return 0
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index 70e41397c8..b17c734993 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -190,7 +190,7 @@
// Proc: total_system_failure()
// Parameters: 2 (intensity - how strong the failure is, user - person which caused the failure)
// Description: Checks the sensors for alerts. If change (alerts cleared or detected) occurs, calls for icon update.
-/obj/machinery/power/smes/buildable/proc/total_system_failure(var/intensity = 0, var/mob/user)
+/obj/machinery/power/smes/buildable/proc/total_system_failure(intensity = 0, mob/user)
// SMESs store very large amount of power. If someone screws up (ie: Disables safeties and attempts to modify the SMES) very bad things happen.
// Bad things are based on charge percentage.
// Possible effects:
@@ -301,7 +301,7 @@
// Proc: apcs_overload()
// Parameters: 2 (failure_chance - chance to actually break the APC, overload_chance - Chance of breaking lights)
// Description: Damages output powernet by power surge. Destroys few APCs and lights, depending on parameters.
-/obj/machinery/power/smes/buildable/proc/apcs_overload(var/failure_chance, var/overload_chance)
+/obj/machinery/power/smes/buildable/proc/apcs_overload(failure_chance, overload_chance)
if (!powernet)
return
@@ -326,7 +326,7 @@
// Proc: attackby()
// Parameters: 2 (W - object that was used on this machine, user - person which used the object)
// Description: Handles tool interaction. Allows deconstruction/upgrading/fixing.
-/obj/machinery/power/smes/buildable/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/power/smes/buildable/attackby(obj/item/W, mob/user)
// No more disassembling of overloaded SMESs. You broke it, now enjoy the consequences.
if (failing)
to_chat(user, span_warning("The [src]'s indicator lights are flashing wildly. It seems to be overloaded! Touching it now is probably not a good idea."))
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index c6ed1956e9..6b208e9ae4 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(solars_list)
. = ..()
//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST
-/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC)
+/obj/machinery/power/solar/proc/set_control(obj/machinery/power/solar_control/SC)
ASSERT(!control)
if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
@@ -226,11 +226,11 @@ GLOBAL_LIST_EMPTY(solars_list)
anchored = FALSE
var/tracker = 0
-/obj/item/solar_assembly/attack_hand(var/mob/user)
+/obj/item/solar_assembly/attack_hand(mob/user)
if(!anchored || !isturf(loc)) // You can't pick it up
..()
-/obj/item/solar_assembly/attackby(var/obj/item/W, var/mob/user)
+/obj/item/solar_assembly/attackby(obj/item/W, mob/user)
if (!isturf(loc))
return 0
if(!anchored)
@@ -333,13 +333,13 @@ GLOBAL_LIST_EMPTY(solars_list)
connected_tracker.set_angle(SSsolars.get_solar_angle(get_turf(src)))
set_panels(cdir)
-/obj/machinery/power/solar_control/proc/add_panel(var/obj/machinery/power/solar/P)
+/obj/machinery/power/solar_control/proc/add_panel(obj/machinery/power/solar/P)
var/sgen = P.get_power_supplied()
connected_power -= connected_panels[P] // Just in case it was already in there
connected_panels[P] = sgen
connected_power += sgen
-/obj/machinery/power/solar_control/proc/remove_panel(var/obj/machinery/power/solar/P)
+/obj/machinery/power/solar_control/proc/remove_panel(obj/machinery/power/solar/P)
connected_power -= connected_panels[P]
connected_panels.Remove(P)
SSsolars.panel_run[REF(src)] -= P // clear hardref in subsystem
@@ -530,7 +530,7 @@ GLOBAL_LIST_EMPTY(solars_list)
return TRUE
/// rotates all connected panels to the passed angle, very expensive as it does them all at once in a single frame. This is what SSsolars does, but much more rude about it.
-/obj/machinery/power/solar_control/proc/set_panels(var/cdir)
+/obj/machinery/power/solar_control/proc/set_panels(cdir)
var/sum = 0
for(var/obj/machinery/power/solar/S in connected_panels)
sum += S.update_power_generation(src)
diff --git a/code/modules/power/supermatter/setup_supermatter.dm b/code/modules/power/supermatter/setup_supermatter.dm
index 0af345a7d3..0da29df2b6 100644
--- a/code/modules/power/supermatter/setup_supermatter.dm
+++ b/code/modules/power/supermatter/setup_supermatter.dm
@@ -110,7 +110,7 @@
GLOBAL_LIST_BOILERPLATE(all_engine_setup_markers, /obj/effect/engine_setup)
-/obj/effect/engine_setup/proc/activate(var/last = 0)
+/obj/effect/engine_setup/proc/activate(last = 0)
return 1
@@ -173,7 +173,7 @@ GLOBAL_LIST_BOILERPLATE(all_engine_setup_markers, /obj/effect/engine_setup)
name = "Supermatter Core Marker"
var/energy_setting = 0
-/obj/effect/engine_setup/core/activate(var/last = 0)
+/obj/effect/engine_setup/core/activate(last = 0)
if(!last)
return SETUP_DELAYED
..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 9ce800c696..64a6d97d78 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -258,7 +258,7 @@
new /obj/item/broken_sm(TS)
//Changes color and luminosity of the light to these values if they were not already set
-/obj/machinery/power/supermatter/proc/shift_light(var/lum, var/clr)
+/obj/machinery/power/supermatter/proc/shift_light(lum, clr)
if(lum != light_range || clr != light_color)
set_light(lum, l_color = clr)
@@ -521,7 +521,7 @@
explode() // Chompers Edit End
-/obj/machinery/power/supermatter/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/power/supermatter/bullet_act(obj/item/projectile/Proj)
var/turf/L = loc
if(!istype(L)) // We don't run process() when we are in space
return 0 // This stops people from being able to really power up the supermatter
@@ -609,7 +609,7 @@
Consume(AM)
-/obj/machinery/power/supermatter/proc/Consume(var/mob/living/user)
+/obj/machinery/power/supermatter/proc/Consume(mob/living/user)
if(istype(user))
user.dust()
power += 200
@@ -633,7 +633,7 @@
strength = 200
)
-/proc/supermatter_pull(var/atom/target, var/pull_range = 255, var/pull_power = STAGE_FIVE)
+/proc/supermatter_pull(atom/target, pull_range = 255, pull_power = STAGE_FIVE)
for(var/atom/A in range(pull_range, target))
A.singularity_pull(target, pull_power)
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index 1fae13ef38..a0a64aefb0 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -25,13 +25,13 @@
master = null
return ..()
-/obj/machinery/power/terminal/hide(var/i)
+/obj/machinery/power/terminal/hide(i)
invisibility = i ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
icon_state = i ? "term-f" : "term"
/obj/machinery/power/terminal/hides_under_flooring()
return 1
-/obj/machinery/power/terminal/overload(var/obj/machinery/power/source)
+/obj/machinery/power/terminal/overload(obj/machinery/power/source)
if(master)
master.overload(source)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index f8638d632b..adacd8f669 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -48,7 +48,7 @@
..()
-/obj/singularity/energy_ball/process(var/wait = 20)
+/obj/singularity/energy_ball/process(wait = 20)
set waitfor = FALSE
if(!orbiting)
if (handle_energy())
@@ -71,7 +71,7 @@
if(orbiting_balls.len)
. += "The amount of orbiting mini-balls is [orbiting_balls.len]."
-/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
+/obj/singularity/energy_ball/proc/move_the_basket_ball(move_amount)
//we face the last thing we zapped, so this lets us favor that direction a bit
var/move_bias = dir
for(var/i in 0 to move_amount)
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index dbdce45969..b207dbb82e 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -29,7 +29,7 @@
. = ..()
//set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST
-/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC)
+/obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC)
if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST))
return 0
control = SC
@@ -42,7 +42,7 @@
control = null
//updates the tracker icon and the facing angle for the control computer
-/obj/machinery/power/tracker/proc/set_angle(var/angle)
+/obj/machinery/power/tracker/proc/set_angle(angle)
sun_angle = angle
//set icon dir to show sun illumination
@@ -51,7 +51,7 @@
if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet
control.cdir = angle
-/obj/machinery/power/tracker/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/power/tracker/attackby(obj/item/W, mob/user)
if(W.has_tool_quality(TOOL_CROWBAR))
playsound(src, 'sound/machines/click.ogg', 50, 1)
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index c30462381a..0d289a338a 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -130,7 +130,7 @@
return
return ..()
-/obj/machinery/compressor/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 20)
+/obj/machinery/compressor/default_unfasten_wrench(mob/user, obj/item/W, time = 20)
if((. = ..()))
turbine = null
if(anchored)
@@ -228,7 +228,7 @@
return
return ..()
-/obj/machinery/power/turbine/default_unfasten_wrench(var/mob/user, var/obj/item/W, var/time = 20)
+/obj/machinery/power/turbine/default_unfasten_wrench(mob/user, obj/item/W, time = 20)
if((. = ..()))
compressor = null
if(anchored)
@@ -273,7 +273,7 @@
if(lastgen > 100)
add_overlay(image('icons/obj/pipes.dmi', "turb-o", FLY_LAYER))
-/obj/machinery/power/turbine/attack_hand(var/mob/user as mob)
+/obj/machinery/power/turbine/attack_hand(mob/user as mob)
if((. = ..()))
return
tgui_interact(user)
@@ -338,7 +338,7 @@
id = new_ident
return
-/obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/turbine_computer/attack_hand(mob/user as mob)
if((. = ..()))
return
tgui_interact(user)
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index ef1548ebb4..426eef1f8d 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -227,7 +227,7 @@
GLOBAL_LIST_EMPTY(magazine_icondata_keys)
GLOBAL_LIST_EMPTY(magazine_icondata_states)
-/proc/initialize_magazine_icondata(var/obj/item/ammo_magazine/M)
+/proc/initialize_magazine_icondata(obj/item/ammo_magazine/M)
var/typestr = M.type
if(!(typestr in GLOB.magazine_icondata_keys) || !(typestr in GLOB.magazine_icondata_states))
magazine_icondata_cache_add(M)
@@ -235,7 +235,7 @@ GLOBAL_LIST_EMPTY(magazine_icondata_states)
M.icon_keys = GLOB.magazine_icondata_keys[typestr]
M.ammo_states = GLOB.magazine_icondata_states[typestr]
-/proc/magazine_icondata_cache_add(var/obj/item/ammo_magazine/M)
+/proc/magazine_icondata_cache_add(obj/item/ammo_magazine/M)
var/list/icon_keys = list()
var/list/ammo_states = list()
var/list/states = icon_states_fast(M.icon)
diff --git a/code/modules/projectiles/ammunition/smartmag.dm b/code/modules/projectiles/ammunition/smartmag.dm
index 80633ddad4..58e23b542f 100644
--- a/code/modules/projectiles/ammunition/smartmag.dm
+++ b/code/modules/projectiles/ammunition/smartmag.dm
@@ -64,7 +64,7 @@
icon_state = "smartmag-empty"
// Emagging lets you remove bullets from your bullet-making magazine
-/obj/item/ammo_magazine/smart/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/ammo_magazine/smart/emag_act(remaining_charges, mob/user)
if(!emagged)
to_chat(user, span_notice("You overload \the [src]'s security measures causing widespread destabilisation. It is likely you could empty \the [src] now."))
emagged = TRUE
@@ -72,7 +72,7 @@
return TRUE
return FALSE
-/obj/item/ammo_magazine/smart/attackby(var/obj/item/I as obj, mob/user)
+/obj/item/ammo_magazine/smart/attackby(obj/item/I as obj, mob/user)
if(istype(I, /obj/item/cell/device))
if(attached_cell)
to_chat(user, span_notice("\The [src] already has a [attached_cell.name] attached."))
@@ -131,7 +131,7 @@
return attached_cell && attached_cell.checked_use(production_cost)
// Sets how much energy is drained to make each bullet
-/obj/item/ammo_magazine/smart/proc/set_production_cost(var/obj/item/ammo_casing/A)
+/obj/item/ammo_magazine/smart/proc/set_production_cost(obj/item/ammo_casing/A)
var/list/matters = GLOB.ammo_repository.get_materials_from_object(A)
var/tempcost
for(var/key in matters)
diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm
index 7c6bb22692..76b6af215d 100644
--- a/code/modules/projectiles/broken.dm
+++ b/code/modules/projectiles/broken.dm
@@ -44,7 +44,7 @@
res_name = initial(res.name)
to_chat(user, span_notice("- x [material_needs[res]] [res_name]"))
-/obj/item/broken_gun/proc/setup_gun(var/obj/item/gun/path)
+/obj/item/broken_gun/proc/setup_gun(obj/item/gun/path)
if(ispath(path))
name = "[pick("busted", "broken", "shattered", "scrapped")] [initial(path.name)]"
icon = initial(path.icon)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index e8258af35c..03677321f5 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -176,7 +176,7 @@
//Checks whether a given mob can use the gun
//Any checks that shouldn't result in handle_click_empty() being called if they fail should go here.
//Otherwise, if you want handle_click_empty() to be called, check in consume_next_projectile() and return null there.
-/obj/item/gun/proc/special_check(var/mob/user)
+/obj/item/gun/proc/special_check(mob/user)
if(!isliving(user))
return FALSE
@@ -288,7 +288,7 @@
else
return ..() //Pistolwhippin'
-/obj/item/gun/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/dnalockingchip))
if(dna_lock)
to_chat(user, span_notice("\The [src] already has a [attached_lock]."))
@@ -319,7 +319,7 @@
to_chat(user, span_warning("\The [src] is not accepting modifications at this time."))
..()
-/obj/item/gun/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/gun/emag_act(remaining_charges, mob/user)
if(dna_lock && attached_lock.controller_lock)
to_chat(user, span_notice("You short circuit the internal locking mechanisms of \the [src]!"))
attached_lock.controller_dna = null
@@ -386,7 +386,7 @@
next_fire_time = world.time + shoot_time
handle_gunfire(target, user, clickparams, pointblank, reflex, 1, FALSE)
-/obj/item/gun/proc/handle_gunfire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0, var/ticker, var/recursive = FALSE)
+/obj/item/gun/proc/handle_gunfire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0, ticker, recursive = FALSE)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(ticker > burst)
@@ -484,7 +484,7 @@
// This is horrible. I tried to keep the old way it had because if I try to use the fancy procs above like handle_post_fire, it expects a user.
// Which this doesn't have. It's ugly but whatever. This is used in literally one place (sawn off shotguns) and should honestly just be axed.
-/obj/item/gun/proc/handle_userless_gunfire(atom/target, var/ticker, var/recursive = FALSE)
+/obj/item/gun/proc/handle_userless_gunfire(atom/target, ticker, recursive = FALSE)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(ticker > burst)
@@ -541,7 +541,7 @@
return null
//used by aiming code
-/obj/item/gun/proc/can_hit(atom/target as mob, var/mob/living/user as mob)
+/obj/item/gun/proc/can_hit(atom/target as mob, mob/living/user as mob)
if(!special_check(user))
return 2
//just assume we can shoot through glass and stuff. No big deal, the player can just choose to not target someone
@@ -580,7 +580,7 @@
add_attack_logs(user, target, "Fired gun '[src.name]' ([reflex ? "REFLEX" : "MANUAL"])")
//called after successfully firing
-/obj/item/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0)
+/obj/item/gun/proc/handle_post_fire(mob/user, atom/target, pointblank=0, reflex=0)
if(fire_anim)
flick(fire_anim, src)
@@ -637,7 +637,7 @@
P.agony *= damage_mult
P.damage *= damage_mult
-/obj/item/gun/proc/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded)
+/obj/item/gun/proc/process_accuracy(obj/projectile, mob/living/user, atom/target, burst, held_twohanded)
var/obj/item/projectile/P = projectile
if(!istype(P))
return //default behaviour only applies to true projectiles
@@ -679,7 +679,7 @@
P.accuracy -= 35
//does the actual launching of the projectile
-/obj/item/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null)
+/obj/item/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, target_zone, params=null)
var/obj/item/projectile/P = projectile
if(!istype(P))
return FALSE //default behaviour only applies to true projectiles
@@ -699,7 +699,7 @@
return launched
-/obj/item/gun/proc/play_fire_sound(var/mob/user, var/obj/item/projectile/P)
+/obj/item/gun/proc/play_fire_sound(mob/user, obj/item/projectile/P)
var/shot_sound = fire_sound
if(!shot_sound && istype(P) && P.fire_sound) // If the gun didn't have a fire_sound, but the projectile exists, and has a sound...
diff --git a/code/modules/projectiles/guns/automatic_fire.dm b/code/modules/projectiles/guns/automatic_fire.dm
index 324d4fc069..c6446e221a 100644
--- a/code/modules/projectiles/guns/automatic_fire.dm
+++ b/code/modules/projectiles/guns/automatic_fire.dm
@@ -14,7 +14,7 @@
var/active = 0//Just tells us that it was clicked on so we should start shooting
var/delay_del = 0//Delays the del if we retarget without shooting
-/atom/movable/screen/auto_target/Initialize(mapload, var/obj/item/gun/G)
+/atom/movable/screen/auto_target/Initialize(mapload, obj/item/gun/G)
. = ..()
gun = G
var/image/I = image('icons/effects/Targeted.dmi', src, "locked")
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 551741c5ef..f3e17bc474 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -103,7 +103,7 @@
charge_tick = 0
return 1
-/obj/item/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/energy/attackby(obj/item/A as obj, mob/user as mob)
..()
/obj/item/gun/energy/switch_firemodes(mob/user)
@@ -125,7 +125,7 @@
M?.hud_used.update_ammo_hud(M, src)
return new projectile_type(src)
-/obj/item/gun/energy/proc/load_ammo(var/obj/item/C, mob/user)
+/obj/item/gun/energy/proc/load_ammo(obj/item/C, mob/user)
if(istype(C, /obj/item/cell))
if(self_recharge || battery_lock)
to_chat(user, span_notice("[src] does not have a battery port."))
@@ -165,7 +165,7 @@
else
to_chat(user, span_notice("[src] does not have a power cell."))
-/obj/item/gun/energy/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/energy/attackby(obj/item/A as obj, mob/user as mob)
..()
load_ammo(A, user)
@@ -201,7 +201,7 @@
else
. += "Does not have a power cell."
-/obj/item/gun/energy/update_icon(var/ignore_inhands)
+/obj/item/gun/energy/update_icon(ignore_inhands)
if(power_supply == null)
if(modifystate)
icon_state = "[modifystate]_open"
diff --git a/code/modules/projectiles/guns/energy/altevian_vr.dm b/code/modules/projectiles/guns/energy/altevian_vr.dm
index 5968f7e743..392c82bf44 100644
--- a/code/modules/projectiles/guns/energy/altevian_vr.dm
+++ b/code/modules/projectiles/guns/energy/altevian_vr.dm
@@ -108,7 +108,7 @@
. = ..()
strike_thing(A)
-/obj/item/projectile/beam/ratminer/proc/strike_thing(var/atom/A)
+/obj/item/projectile/beam/ratminer/proc/strike_thing(atom/A)
var/turf/target_turf = get_turf(A)
if(!target_turf)
target_turf = get_turf(src)
diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm
index d459883ec3..ad1b384c8b 100644
--- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm
+++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm
@@ -24,7 +24,7 @@
scanmod = new(src)
update_fail_chance()
-/obj/item/bluespace_harpoon/examine(var/mob/user)
+/obj/item/bluespace_harpoon/examine(mob/user)
. = ..()
. += "It is currently in [mode ? "transmitting" : "receiving"] mode."
. += "Spatial rearrangement is [dropnoms_active ? "active" : "inactive"]."
@@ -37,7 +37,7 @@
else
failure_chance = 75 // You can't even use it if there's no scanmod, but why not.
-/obj/item/bluespace_harpoon/attackby(var/obj/item/I, var/mob/living/user)
+/obj/item/bluespace_harpoon/attackby(obj/item/I, mob/living/user)
if(!istype(user))
return
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
index 08111d8d20..c4da7f7466 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/cell_loaded.dm
@@ -104,12 +104,12 @@
return TRUE
*/
-/obj/item/gun/projectile/cell_loaded/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/cell_loaded/load_ammo(obj/item/A, mob/user)
. = ..()
if(ammo_magazine && ammo_magazine.stored_ammo.len)
switch_to(ammo_magazine.stored_ammo[1])
-/obj/item/gun/projectile/cell_loaded/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/cell_loaded/unload_ammo(mob/user, allow_dump=1)
chambered = null
return ..()
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
index a56a3c7590..16a51eec76 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/ml3m_cells.dm
@@ -22,7 +22,7 @@
tracer_type = /obj/effect/projectile/tracer/medigun
impact_type = /obj/effect/projectile/impact/medigun
-/obj/item/projectile/beam/medical_cell/on_hit(var/mob/living/carbon/human/target) //what does it do when it hits someone?
+/obj/item/projectile/beam/medical_cell/on_hit(mob/living/carbon/human/target) //what does it do when it hits someone?
return
/obj/item/ammo_casing/microbattery/medical/brute
@@ -31,7 +31,7 @@
type_name = "BRUTE"
projectile_type = /obj/item/projectile/beam/medical_cell/brute
-/obj/item/projectile/beam/medical_cell/brute/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/brute/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-10)
@@ -44,7 +44,7 @@
type_name = "BURN"
projectile_type = /obj/item/projectile/beam/medical_cell/burn
-/obj/item/projectile/beam/medical_cell/burn/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/burn/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustFireLoss(-10)
@@ -57,7 +57,7 @@
type_name = "STABILIZE"
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize
-/obj/item/projectile/beam/medical_cell/stabilize/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/stabilize/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.adjustOxyLoss(-30)
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
@@ -85,7 +85,7 @@
type_name = "TOXIN"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin
-/obj/item/projectile/beam/medical_cell/toxin/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/toxin/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-10)
@@ -98,7 +98,7 @@
type_name = "OMNI"
projectile_type = /obj/item/projectile/beam/medical_cell/omni
-/obj/item/projectile/beam/medical_cell/omni/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/omni/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-5)
@@ -114,7 +114,7 @@
type_name = "ANTIRAD"
projectile_type = /obj/item/projectile/beam/medical_cell/antirad
-/obj/item/projectile/beam/medical_cell/antirad/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/antirad/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-5)
@@ -128,7 +128,7 @@
type_name = "BRUTE-II"
projectile_type = /obj/item/projectile/beam/medical_cell/brute2
-/obj/item/projectile/beam/medical_cell/brute2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/brute2/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-20)
@@ -141,7 +141,7 @@
type_name = "BURN-II"
projectile_type = /obj/item/projectile/beam/medical_cell/burn2
-/obj/item/projectile/beam/medical_cell/burn2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/burn2/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustFireLoss(-20)
@@ -154,7 +154,7 @@
type_name = "STABILIZE-II"
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2
-/obj/item/projectile/beam/medical_cell/stabilize2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/stabilize2/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.adjustOxyLoss(-200)
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
@@ -177,7 +177,7 @@
type_name = "OMNI-II"
projectile_type = /obj/item/projectile/beam/medical_cell/omni2
-/obj/item/projectile/beam/medical_cell/omni2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/omni2/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-10)
@@ -193,7 +193,7 @@
type_name = "TOXIN-II"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin2
-/obj/item/projectile/beam/medical_cell/toxin2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/toxin2/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-20)
@@ -206,7 +206,7 @@
type_name = "HASTE"
projectile_type = /obj/item/projectile/beam/medical_cell/haste
-/obj/item/projectile/beam/medical_cell/haste/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/haste/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.add_modifier(/datum/modifier/ml3mhaste, 20 SECONDS)
else
@@ -226,7 +226,7 @@
type_name = "RESIST"
projectile_type = /obj/item/projectile/beam/medical_cell/resist
-/obj/item/projectile/beam/medical_cell/resist/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/resist/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.add_modifier(/datum/modifier/resistance, 20 SECONDS)
else
@@ -246,7 +246,7 @@
type_name = "CORPSE MEND"
projectile_type = /obj/item/projectile/beam/medical_cell/corpse_mend
-/obj/item/projectile/beam/medical_cell/corpse_mend/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/corpse_mend/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat == DEAD)
target.adjustBruteLoss(-50)
@@ -262,7 +262,7 @@
type_name = "BRUTE-III"
projectile_type = /obj/item/projectile/beam/medical_cell/brute3
-/obj/item/projectile/beam/medical_cell/brute3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/brute3/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-40)
@@ -275,7 +275,7 @@
type_name = "BURN-III"
projectile_type = /obj/item/projectile/beam/medical_cell/burn3
-/obj/item/projectile/beam/medical_cell/burn3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/burn3/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustFireLoss(-40)
@@ -288,7 +288,7 @@
type_name = "TOXIN-III"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin3
-/obj/item/projectile/beam/medical_cell/toxin3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/toxin3/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustToxLoss(-40)
@@ -301,7 +301,7 @@
type_name = "OMNI-III"
projectile_type = /obj/item/projectile/beam/medical_cell/omni3
-/obj/item/projectile/beam/medical_cell/omni3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/omni3/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
if(target.stat != DEAD)
target.adjustBruteLoss(-20)
@@ -318,7 +318,7 @@
type_name = "SHRINK"
projectile_type = /obj/item/projectile/beam/medical_cell/shrink
-/obj/item/projectile/beam/medical_cell/shrink/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/shrink/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.resize(0.5)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
@@ -332,7 +332,7 @@
type_name = "GROW"
projectile_type = /obj/item/projectile/beam/medical_cell/grow
-/obj/item/projectile/beam/medical_cell/grow/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/grow/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.resize(2.0)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
@@ -346,7 +346,7 @@
type_name = "NORMALSIZE"
projectile_type = /obj/item/projectile/beam/medical_cell/normalsize
-/obj/item/projectile/beam/medical_cell/normalsize/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/normalsize/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.resize(1)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm
index 17a71e6826..e1da68a476 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon.dm
@@ -55,7 +55,7 @@
consume_next_projectile()
update_icon()
-/obj/item/gun/projectile/multi_cannon/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/multi_cannon/unload_ammo(mob/user, allow_dump=1)
.=..()
update_icon()
chambered = null
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm
index 49487e991d..9e3990c854 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/multi_cannon_cells.dm
@@ -114,14 +114,14 @@
bat_colour = "#ff9966"
projectile_type = /obj/item/projectile/beam/medical_cell/phys_heal
-/obj/item/projectile/beam/medical_cell/phys_heal/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/phys_heal/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.adjustBruteLoss(-20)
target.adjustFireLoss(-20)
else
return 1
-/obj/item/projectile/beam/medical_cell/detox/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/detox/on_hit(mob/living/carbon/human/target)
if(ishuman(target))
target.adjustToxLoss(-15)
target.radiation = max(target.radiation - 75, 0) //worse than mlem for rad, better for tox.
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm
index 815cf84a34..e3c9dbc441 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nerd_cells.dm
@@ -22,7 +22,7 @@
tracer_type = /obj/effect/projectile/tracer/medigun
impact_type = /obj/effect/projectile/impact/medigun
-/obj/item/projectile/beam/medical_cell/on_hit(var/mob/living/carbon/human/target) //what does it do when it hits someone?
+/obj/item/projectile/beam/medical_cell/on_hit(mob/living/carbon/human/target) //what does it do when it hits someone?
return
/obj/item/ammo_casing/microbattery/medical/brute
@@ -31,7 +31,7 @@
type_name = "BRUTE"
projectile_type = /obj/item/projectile/beam/medical_cell/brute
-/obj/item/projectile/beam/medical_cell/brute/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/brute/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-5)
@@ -44,7 +44,7 @@
type_name = "BURN"
projectile_type = /obj/item/projectile/beam/medical_cell/burn
-/obj/item/projectile/beam/medical_cell/burn/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/burn/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustFireLoss(-5)
@@ -57,7 +57,7 @@
type_name = "STABILIZE"
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize
-/obj/item/projectile/beam/medical_cell/stabilize/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/stabilize/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustOxyLoss(-30)
@@ -86,7 +86,7 @@
type_name = "TOXIN"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin
-/obj/item/projectile/beam/medical_cell/toxin/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/toxin/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustToxLoss(-5)
@@ -99,7 +99,7 @@
type_name = "OMNI"
projectile_type = /obj/item/projectile/beam/medical_cell/omni
-/obj/item/projectile/beam/medical_cell/omni/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/omni/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-2.5)
@@ -115,7 +115,7 @@
type_name = "ANTIRAD"
projectile_type = /obj/item/projectile/beam/medical_cell/antirad
-/obj/item/projectile/beam/medical_cell/antirad/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/antirad/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustToxLoss(-2.5)
@@ -129,7 +129,7 @@
type_name = "BRUTE-II"
projectile_type = /obj/item/projectile/beam/medical_cell/brute2
-/obj/item/projectile/beam/medical_cell/brute2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/brute2/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-10)
@@ -142,7 +142,7 @@
type_name = "BURN-II"
projectile_type = /obj/item/projectile/beam/medical_cell/burn2
-/obj/item/projectile/beam/medical_cell/burn2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/burn2/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustFireLoss(-10)
@@ -155,7 +155,7 @@
type_name = "STABILIZE-II"
projectile_type = /obj/item/projectile/beam/medical_cell/stabilize2
-/obj/item/projectile/beam/medical_cell/stabilize2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/stabilize2/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustOxyLoss(-200)
@@ -179,7 +179,7 @@
type_name = "OMNI-II"
projectile_type = /obj/item/projectile/beam/medical_cell/omni2
-/obj/item/projectile/beam/medical_cell/omni2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/omni2/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-5)
@@ -195,7 +195,7 @@
type_name = "TOXIN-II"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin2
-/obj/item/projectile/beam/medical_cell/toxin2/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/toxin2/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustToxLoss(-20)
@@ -208,7 +208,7 @@
type_name = "HASTE"
projectile_type = /obj/item/projectile/beam/medical_cell/haste
-/obj/item/projectile/beam/medical_cell/haste/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/haste/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.add_modifier(/datum/modifier/nerdhaste, 20 SECONDS)
@@ -229,7 +229,7 @@
type_name = "RESIST"
projectile_type = /obj/item/projectile/beam/medical_cell/resist
-/obj/item/projectile/beam/medical_cell/resist/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/resist/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.add_modifier(/datum/modifier/resistance, 20 SECONDS)
@@ -250,7 +250,7 @@
type_name = "CORPSE MEND"
projectile_type = /obj/item/projectile/beam/medical_cell/corpse_mend
-/obj/item/projectile/beam/medical_cell/corpse_mend/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/corpse_mend/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat == DEAD)
target.adjustBruteLoss(-50)
@@ -266,7 +266,7 @@
type_name = "BRUTE-III"
projectile_type = /obj/item/projectile/beam/medical_cell/brute3
-/obj/item/projectile/beam/medical_cell/brute3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/brute3/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-20)
@@ -279,7 +279,7 @@
type_name = "BURN-III"
projectile_type = /obj/item/projectile/beam/medical_cell/burn3
-/obj/item/projectile/beam/medical_cell/burn3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/burn3/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustFireLoss(-20)
@@ -292,7 +292,7 @@
type_name = "TOXIN-III"
projectile_type = /obj/item/projectile/beam/medical_cell/toxin3
-/obj/item/projectile/beam/medical_cell/toxin3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/toxin3/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustToxLoss(-20)
@@ -305,7 +305,7 @@
type_name = "OMNI-III"
projectile_type = /obj/item/projectile/beam/medical_cell/omni3
-/obj/item/projectile/beam/medical_cell/omni3/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/omni3/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
if(target.stat != DEAD)
target.adjustBruteLoss(-10)
@@ -322,7 +322,7 @@
type_name = "SHRINK"
projectile_type = /obj/item/projectile/beam/medical_cell/shrink
-/obj/item/projectile/beam/medical_cell/shrink/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/shrink/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
target.resize(0.5)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
@@ -336,7 +336,7 @@
type_name = "GROW"
projectile_type = /obj/item/projectile/beam/medical_cell/grow
-/obj/item/projectile/beam/medical_cell/grow/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/grow/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
target.resize(2.0)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
@@ -350,7 +350,7 @@
type_name = "NORMALSIZE"
projectile_type = /obj/item/projectile/beam/medical_cell/normalsize
-/obj/item/projectile/beam/medical_cell/normalsize/on_hit(var/mob/living/carbon/human/target)
+/obj/item/projectile/beam/medical_cell/normalsize/on_hit(mob/living/carbon/human/target)
if(istype(target, /mob/living/carbon/human))
target.resize(1)
target.show_message(span_blue("The beam fires into your body, changing your size!"))
diff --git a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm
index 41fb1ad3a1..15d47433a7 100644
--- a/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm
+++ b/code/modules/projectiles/guns/energy/cell_loaded_vr/nsfw_cells.dm
@@ -65,7 +65,7 @@
sharp = FALSE
check_armour = "melee"
-/obj/item/projectile/bullet/stripper/on_hit(var/atom/stripped)
+/obj/item/projectile/bullet/stripper/on_hit(atom/stripped)
if(ishuman(stripped))
var/mob/living/carbon/human/H = stripped
if(H.wear_suit)
@@ -99,7 +99,7 @@
tracer_type = /obj/effect/projectile/tracer/laser_omni
impact_type = /obj/effect/projectile/impact/laser_omni
-/obj/item/projectile/beam/final_option/on_hit(var/atom/impacted)
+/obj/item/projectile/beam/final_option/on_hit(atom/impacted)
if(isliving(impacted))
var/mob/living/L = impacted
if(L.mind)
diff --git a/code/modules/projectiles/guns/energy/crestrose_vr.dm b/code/modules/projectiles/guns/energy/crestrose_vr.dm
index 9af307534b..55b3b5ad2a 100644
--- a/code/modules/projectiles/guns/energy/crestrose_vr.dm
+++ b/code/modules/projectiles/guns/energy/crestrose_vr.dm
@@ -31,7 +31,7 @@
update_held_icon()
-/obj/item/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/gun/projectile/automatic/fluff/crestrose/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(50))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(user, 'sound/weapons/punchmiss.ogg', 50, 1)
diff --git a/code/modules/projectiles/guns/energy/cyborg.dm b/code/modules/projectiles/guns/energy/cyborg.dm
index 99877a5741..fdf7c6542f 100644
--- a/code/modules/projectiles/guns/energy/cyborg.dm
+++ b/code/modules/projectiles/guns/energy/cyborg.dm
@@ -2,15 +2,15 @@
/// Some things are included in here for relevence's sake (like the dogborg blade)
-/obj/item/gun/energy/robotic/proc/gun_flag_check(var/flag_to_check) //Checks for the flag of the gun.
+/obj/item/gun/energy/robotic/proc/gun_flag_check(flag_to_check) //Checks for the flag of the gun.
return (borg_flags & flag_to_check)
-/obj/item/melee/robotic/proc/weapon_flag_check(var/flag_to_check) //Checks for the flag of the gun.
+/obj/item/melee/robotic/proc/weapon_flag_check(flag_to_check) //Checks for the flag of the gun.
return (borg_flags & flag_to_check)
// THESE ARE OUTLIERS THAT SHOULD BE INCLUDED IN /MELEE BUT ARE SO HARDCODED THAT DOING SUCH WOULD BE A NIGHTMARE.
// THIS LIST SHOULD BE SHORT AND ONLY INCLUDE THINGS THAT ARE ABSOLUTELY NECESSARY.
-/obj/item/pickaxe/proc/weapon_flag_check(var/flag_to_check) //Checks for the flag of the gun.
+/obj/item/pickaxe/proc/weapon_flag_check(flag_to_check) //Checks for the flag of the gun.
return (borg_flags & flag_to_check)
@@ -251,7 +251,7 @@
deductcharge(600)
return ..()
-/obj/item/melee/robotic/borg_combat_shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/robotic/borg_combat_shocker/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(isrobot(target))
return ..()
@@ -375,7 +375,7 @@
Striking a lesser robotic entity will compel it to attack you, as well. It also does extra burn damage to robotic entities, but it does \
very little damage to purely organic targets."
-/obj/item/melee/robotic/blade/ionic/afterattack(var/atom/movable/AM, var/mob/living/user, var/proximity)
+/obj/item/melee/robotic/blade/ionic/afterattack(atom/movable/AM, mob/living/user, proximity)
if(istype(AM, /obj) && proximity)
// EMP stuff.
var/obj/O = AM
@@ -384,7 +384,7 @@
user.setClickCooldown(user.get_attack_speed(src)) // A lot of objects don't set click delay.
return ..()
-/obj/item/melee/robotic/blade/ionic/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/robotic/blade/ionic/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
if(target.isSynthetic())
// Do some extra damage. Not a whole lot more since emp_act() is pretty nasty on FBPs already.
@@ -474,7 +474,7 @@
deductcharge(hitcost)
return ..()
-/obj/item/melee/robotic/baton/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/robotic/baton/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(isrobot(target))
return ..()
@@ -529,7 +529,7 @@
agonyforce = 25 // Less efficent than a regular baton.
attack_verb = list("poked")
-/obj/item/melee/robotic/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/robotic/baton/shocker/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
..(target, user, hit_zone)
if(target.has_AI())
target.taunt(user)
diff --git a/code/modules/projectiles/guns/energy/dominator_vr.dm b/code/modules/projectiles/guns/energy/dominator_vr.dm
index 3a63c95c6d..c72f92c994 100644
--- a/code/modules/projectiles/guns/energy/dominator_vr.dm
+++ b/code/modules/projectiles/guns/energy/dominator_vr.dm
@@ -32,7 +32,7 @@
return ..()
-/obj/item/gun/energy/gun/fluff/dominator/emag_act(var/remaining_charges,var/mob/user)
+/obj/item/gun/energy/gun/fluff/dominator/emag_act(remaining_charges,mob/user)
..()
if(!emagged)
emagged = TRUE
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 95bad0614b..1c8aee6133 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -183,7 +183,7 @@
if(remainingshots || failurechance)
desc = "A rare weapon, produced by the Lunar Arms Company around 2105 - one of humanity's first wholly extra-terrestrial weapon designs. It's been reasonably well-preserved."
-/obj/item/gun/energy/captain/special_check(var/mob/user)
+/obj/item/gun/energy/captain/special_check(mob/user)
if(remainingshots)
remainingshots -= 1
if(!remainingshots) //you've shot your load, sonny
@@ -194,7 +194,7 @@
return 0
return ..()
-/obj/item/gun/energy/captain/proc/burnout(var/mob/user)
+/obj/item/gun/energy/captain/proc/burnout(mob/user)
//your gun is now rendered useless
projectile_type = /obj/item/projectile/beam/practice //just in case you somehow manage to get it to fire again, its beam type is set to one that sucks
power_supply.charge = 0
@@ -207,7 +207,7 @@
sparks.start()
update_icon()
-/obj/item/gun/energy/captain/proc/malfunction(var/mob/user)
+/obj/item/gun/energy/captain/proc/malfunction(mob/user)
var/screwup = rand(1,10)
switch(screwup)
if(1 to 5) //50% of just draining the battery and making future malfunctions more likely
diff --git a/code/modules/projectiles/guns/energy/particle.dm b/code/modules/projectiles/guns/energy/particle.dm
index 7d2af4eea1..19bef23722 100644
--- a/code/modules/projectiles/guns/energy/particle.dm
+++ b/code/modules/projectiles/guns/energy/particle.dm
@@ -59,7 +59,7 @@
//special behaviours for particle guns below
-/obj/item/gun/energy/particle/special_check(var/mob/user)
+/obj/item/gun/energy/particle/special_check(mob/user)
if (..())
var/turf/T = get_turf(src)
var/datum/gas_mixture/environment = T ? T.return_air() : null
@@ -81,7 +81,7 @@
return 1
return 0
-/obj/item/gun/energy/particle/proc/pressuremalfunction(severity, var/mob/user, var/turf/T)
+/obj/item/gun/energy/particle/proc/pressuremalfunction(severity, mob/user, turf/T)
if (severity <= 10) // just doesn't fire. 10% chance in 100 atmo.
user.visible_message(span_warning("*click*"), span_danger("\The [src] jams."))
playsound(src, 'sound/weapons/empty.ogg', 100, 1)
@@ -127,7 +127,7 @@
..(severity*2, user, T)
-/obj/item/gun/energy/particle/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/energy/particle/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/pressurelock))
if(safetycatch)
to_chat(user, span_notice("\The [src] already has a [attached_safety]."))
@@ -180,7 +180,7 @@
light_power = 1
light_color = "#CCFFFF"
-/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
+/turf/simulated/mineral/bullet_act(obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/bullet/particle))
if(prob(Proj.damage))
GetDrilled()
diff --git a/code/modules/projectiles/guns/energy/protector_vr.dm b/code/modules/projectiles/guns/energy/protector_vr.dm
index 1a26538696..111a9d1c0d 100644
--- a/code/modules/projectiles/guns/energy/protector_vr.dm
+++ b/code/modules/projectiles/guns/energy/protector_vr.dm
@@ -62,7 +62,7 @@
else
set_light(0)
-/obj/item/gun/energy/gun/protector/emag_act(var/remaining_charges,var/mob/user)
+/obj/item/gun/energy/gun/protector/emag_act(remaining_charges,mob/user)
..()
if(!emagged)
emagged = TRUE
@@ -150,7 +150,7 @@
else
return ..()
-/obj/item/gun/energy/gun/protector/pilotgun/locked/emag_act(var/remaining_charges,var/mob/user)
+/obj/item/gun/energy/gun/protector/pilotgun/locked/emag_act(remaining_charges,mob/user)
return ..()
/obj/item/gun/energy/gun/protector/pilotgun/locked/special_check(mob/user)
diff --git a/code/modules/projectiles/guns/energy/pummeler_vr.dm b/code/modules/projectiles/guns/energy/pummeler_vr.dm
index c66abe01d6..fc71354f02 100644
--- a/code/modules/projectiles/guns/energy/pummeler_vr.dm
+++ b/code/modules/projectiles/guns/energy/pummeler_vr.dm
@@ -35,7 +35,7 @@
vacuum_traversal = 0
range = 6 //Scary name, but just deletes the projectile after this range
-/obj/item/projectile/pummel/on_hit(var/atom/movable/target, var/blocked = 0)
+/obj/item/projectile/pummel/on_hit(atom/movable/target, blocked = 0)
if(isliving(target))
var/mob/living/L = target
var/throwdir = get_dir(firer,L)
diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm
index 8d5cf8ee41..3f1a88a22e 100644
--- a/code/modules/projectiles/guns/energy/pump.dm
+++ b/code/modules/projectiles/guns/energy/pump.dm
@@ -31,7 +31,7 @@
else
return ..()
-/obj/item/gun/energy/locked/emag_act(var/remaining_charges,var/mob/user)
+/obj/item/gun/energy/locked/emag_act(remaining_charges,mob/user)
..()
if(lockable)
locked = !locked
@@ -79,7 +79,7 @@
)
recoil_mode = 0
-/obj/item/gun/energy/locked/frontier/unload_ammo(var/mob/user)
+/obj/item/gun/energy/locked/frontier/unload_ammo(mob/user)
if(recharging)
return
recharging = 1
diff --git a/code/modules/projectiles/guns/energy/pump_ch.dm b/code/modules/projectiles/guns/energy/pump_ch.dm
index f340518616..c828714b92 100644
--- a/code/modules/projectiles/guns/energy/pump_ch.dm
+++ b/code/modules/projectiles/guns/energy/pump_ch.dm
@@ -92,7 +92,7 @@
else
return ..()
-/obj/item/gun/energy/locked/emag_act(var/remaining_charges,var/mob/user)
+/obj/item/gun/energy/locked/emag_act(remaining_charges,mob/user)
..()
if(lockable)
locked = !locked
@@ -132,7 +132,7 @@
) //CHOMPedit Adjusts cost and fire delay to match adjusted beams.
recoil_mode = 0
-/obj/item/gun/energy/locked/frontier/unload_ammo(var/mob/user)
+/obj/item/gun/energy/locked/frontier/unload_ammo(mob/user)
if(recharging)
return
recharging = 1
diff --git a/code/modules/projectiles/guns/energy/sickshot_vr.dm b/code/modules/projectiles/guns/energy/sickshot_vr.dm
index 04b4db73f9..6cc4a22953 100644
--- a/code/modules/projectiles/guns/energy/sickshot_vr.dm
+++ b/code/modules/projectiles/guns/energy/sickshot_vr.dm
@@ -33,7 +33,7 @@
vacuum_traversal = 0
range = 5 //Scary name, but just deletes the projectile after this range
-/obj/item/projectile/sickshot/on_hit(var/atom/movable/target, var/blocked = 0)
+/obj/item/projectile/sickshot/on_hit(atom/movable/target, blocked = 0)
if(isliving(target))
var/mob/living/L = target
if(prob(20))
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 44022df89c..8d59dc29fa 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -63,7 +63,7 @@
. = ..()
emitter = new(src)
-/obj/item/gun/energy/floragun/examine(var/mob/user)
+/obj/item/gun/energy/floragun/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "It has [emitter ? emitter : "no micro laser"] installed."
@@ -189,7 +189,7 @@
battery_lock = 1
charge_meter = 0
-/obj/item/gun/energy/staff/special_check(var/mob/user)
+/obj/item/gun/energy/staff/special_check(mob/user)
if((user.mind && !GLOB.wizards.is_antagonist(user.mind)))
to_chat(user, span_warning("You focus your mind on \the [src], but nothing happens!"))
return 0
@@ -269,7 +269,7 @@
var/power_cycle = FALSE
-/obj/item/gun/energy/maghowitzer/proc/pick_random_target(var/turf/T)
+/obj/item/gun/energy/maghowitzer/proc/pick_random_target(turf/T)
var/foundmob = FALSE
var/foundmobs = list()
for(var/mob/living/L in T.contents)
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 0f6ff94041..4a2511d0b9 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -112,7 +112,7 @@
several TSCs have been trying to get a hold of the blueprints for half a decade."
var/unique_reskin
-/obj/item/gun/energy/stunrevolver/detective/update_icon(var/ignore_inhands)
+/obj/item/gun/energy/stunrevolver/detective/update_icon(ignore_inhands)
if(power_supply == null)
if(unique_reskin)
icon_state = "[unique_reskin]_open"
diff --git a/code/modules/projectiles/guns/lasertag.dm b/code/modules/projectiles/guns/lasertag.dm
index 67924af0e2..ac623040a4 100644
--- a/code/modules/projectiles/guns/lasertag.dm
+++ b/code/modules/projectiles/guns/lasertag.dm
@@ -44,7 +44,7 @@
///Allows firing without a vest.
var/vest_override = FALSE
-/obj/item/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M)
+/obj/item/gun/energy/lasertag/special_check(mob/living/carbon/human/M)
if(ishuman(M) && !vest_override)
if(!istype(M.wear_suit, required_vest))
to_chat(M, span_warning("You need to be wearing your laser tag vest!"))
diff --git a/code/modules/projectiles/guns/launcher.dm b/code/modules/projectiles/guns/launcher.dm
index 76db11d46b..85605c53c2 100644
--- a/code/modules/projectiles/guns/launcher.dm
+++ b/code/modules/projectiles/guns/launcher.dm
@@ -10,7 +10,7 @@
fire_sound_text = "a launcher firing"
//This normally uses a proc on projectiles and our ammo is not strictly speaking a projectile.
-/obj/item/gun/launcher/can_hit(var/mob/living/target as mob, var/mob/living/user as mob)
+/obj/item/gun/launcher/can_hit(mob/living/target as mob, mob/living/user as mob)
return 1
//Override this to avoid a runtime with suicide handling.
@@ -21,7 +21,7 @@
/obj/item/gun/launcher/proc/update_release_force(obj/item/projectile)
return 0
-/obj/item/gun/launcher/process_projectile(obj/item/projectile, mob/user, atom/target, var/target_zone, var/params=null, var/pointblank=0, var/reflex=0)
+/obj/item/gun/launcher/process_projectile(obj/item/projectile, mob/user, atom/target, target_zone, params=null, pointblank=0, reflex=0)
update_release_force(projectile)
projectile.loc = get_turf(user)
projectile.throw_at(target, throw_distance, release_force, user)
diff --git a/code/modules/projectiles/guns/launcher/bows.dm b/code/modules/projectiles/guns/launcher/bows.dm
index 5dc07a2d54..795cb0999d 100644
--- a/code/modules/projectiles/guns/launcher/bows.dm
+++ b/code/modules/projectiles/guns/launcher/bows.dm
@@ -94,7 +94,7 @@
else
draw(user)
-/obj/item/gun/launcher/crossbow/bow/draw(var/mob/user)
+/obj/item/gun/launcher/crossbow/bow/draw(mob/user)
if(!bolt)
to_chat(user, span_infoplain("You don't have anything nocked to [src]."))
return
diff --git a/code/modules/projectiles/guns/launcher/crossbow.dm b/code/modules/projectiles/guns/launcher/crossbow.dm
index 0685c87bfd..f86864a55e 100644
--- a/code/modules/projectiles/guns/launcher/crossbow.dm
+++ b/code/modules/projectiles/guns/launcher/crossbow.dm
@@ -107,7 +107,7 @@
else
draw(user)
-/obj/item/gun/launcher/crossbow/proc/draw(var/mob/user as mob)
+/obj/item/gun/launcher/crossbow/proc/draw(mob/user as mob)
if(!bolt)
to_chat(user, "You don't have anything nocked to [src].")
@@ -141,7 +141,7 @@
user.visible_message("[user] draws back the string of [src]!",span_notice("You continue drawing back the string of [src]!"))
-/obj/item/gun/launcher/crossbow/proc/increase_tension(var/mob/user as mob)
+/obj/item/gun/launcher/crossbow/proc/increase_tension(mob/user as mob)
if(!bolt || !tension || current_user != user) //Arrow has been fired, bow has been relaxed or user has changed.
return
@@ -189,7 +189,7 @@
else
..()
-/obj/item/gun/launcher/crossbow/proc/superheat_rod(var/mob/user)
+/obj/item/gun/launcher/crossbow/proc/superheat_rod(mob/user)
if(!user || !cell || !bolt) return
if(cell.charge < 500) return
if(bolt.throwforce >= 15) return
diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm
index e166ae6567..02c399f6e9 100644
--- a/code/modules/projectiles/guns/launcher/syringe_gun.dm
+++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm
@@ -131,7 +131,7 @@
else
..()
-/obj/item/gun/launcher/syringe/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/launcher/syringe/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/syringe_cartridge))
var/obj/item/syringe_cartridge/C = A
if(darts.len >= max_darts)
diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm
index 073a224b7d..ffa4c4692f 100644
--- a/code/modules/projectiles/guns/magnetic/bore.dm
+++ b/code/modules/projectiles/guns/magnetic/bore.dm
@@ -53,7 +53,7 @@
overlays = overlays_to_add
..()
-/obj/item/gun/magnetic/matfed/attack_hand(var/mob/user) // It doesn't keep a loaded item inside.
+/obj/item/gun/magnetic/matfed/attack_hand(mob/user) // It doesn't keep a loaded item inside.
if(user.get_inactive_hand() == src)
var/obj/item/removing
@@ -84,7 +84,7 @@
return span_warning("It\'s out of [ammo_material]!")
-/obj/item/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user)
+/obj/item/gun/magnetic/matfed/attackby(obj/item/thing, mob/user)
. = ..()
update_rating_mod()
if(removable_components)
diff --git a/code/modules/projectiles/guns/magnetic/gasthrower.dm b/code/modules/projectiles/guns/magnetic/gasthrower.dm
index 55f3b45e7a..a5dcc9feb0 100644
--- a/code/modules/projectiles/guns/magnetic/gasthrower.dm
+++ b/code/modules/projectiles/guns/magnetic/gasthrower.dm
@@ -67,7 +67,7 @@
Tank.air_contents.remove(moles_to_pull)
-/obj/item/gun/magnetic/gasthrower/show_ammo(var/mob/user)
+/obj/item/gun/magnetic/gasthrower/show_ammo(mob/user)
. = ..()
if(loaded)
diff --git a/code/modules/projectiles/guns/magnetic/magnetic.dm b/code/modules/projectiles/guns/magnetic/magnetic.dm
index 00790f278a..1750c8982b 100644
--- a/code/modules/projectiles/guns/magnetic/magnetic.dm
+++ b/code/modules/projectiles/guns/magnetic/magnetic.dm
@@ -122,7 +122,7 @@
return ammotext
-/obj/item/gun/magnetic/examine(var/mob/user)
+/obj/item/gun/magnetic/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
. += show_ammo()
@@ -140,7 +140,7 @@
else
. += span_notice("The capacitor charge indicator is [span_green("green")].")
-/obj/item/gun/magnetic/attackby(var/obj/item/thing, var/mob/user)
+/obj/item/gun/magnetic/attackby(obj/item/thing, mob/user)
if(removable_components)
if(istype(thing, /obj/item/cell))
@@ -200,7 +200,7 @@
return
. = ..()
-/obj/item/gun/magnetic/attack_hand(var/mob/user)
+/obj/item/gun/magnetic/attack_hand(mob/user)
if(user.get_inactive_hand() == src)
var/obj/item/removing
@@ -326,7 +326,7 @@
else
return
-/obj/item/gun/magnetic/fuelrod/proc/blitzed(var/turf/T, var/mob/living/carbon/M, var/max_range, var/banglet) // Added a new proc called 'bang' that takes a location and a person to be banged.
+/obj/item/gun/magnetic/fuelrod/proc/blitzed(turf/T, mob/living/carbon/M, max_range, banglet) // Added a new proc called 'bang' that takes a location and a person to be banged.
to_chat(M, span_danger("BANG")) // Called during the loop that bangs people in lockers/containers and when banging
playsound(src, 'sound/effects/bang.ogg', 50, 1, 30) // people in normal view. Could theroetically be called during other explosions.
diff --git a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm
index 058a2a1ceb..ccc3fa5ced 100644
--- a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm
+++ b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm
@@ -7,7 +7,7 @@
var/construction_stage = 1
-/obj/item/coilgun_assembly/attackby(var/obj/item/thing, var/mob/user)
+/obj/item/coilgun_assembly/attackby(obj/item/thing, mob/user)
if(istype(thing, /obj/item/stack/material) && construction_stage == 1)
var/obj/item/stack/material/reinforcing = thing
@@ -87,7 +87,7 @@
construction_stage++
icon_state = "coilgun_construction_[construction_stage]"
-/obj/item/coilgun_assembly/examine(var/mob/user)
+/obj/item/coilgun_assembly/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
switch(construction_stage)
diff --git a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
index 8cd28e8ed9..ad1cb38efb 100644
--- a/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
+++ b/code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
@@ -71,7 +71,7 @@
list(mode_name="long bursts", burst=6, fire_delay=null, move_delay=10, one_handed_penalty=30, burst_accuracy=list(0,-15,-15,-15,-30), dispersion=list(0.6, 0.6, 1.0, 1.0, 1.2)),
)
-/obj/item/gun/magnetic/railgun/automatic/examine(var/mob/user)
+/obj/item/gun/magnetic/railgun/automatic/examine(mob/user)
. = ..()
if(Adjacent(user))
. += span_notice("Someone has scratched Ultima Ratio Regum onto the side of the barrel.")
diff --git a/code/modules/projectiles/guns/modular_guns.dm b/code/modules/projectiles/guns/modular_guns.dm
index 675c1e5031..2cf13656f4 100644
--- a/code/modules/projectiles/guns/modular_guns.dm
+++ b/code/modules/projectiles/guns/modular_guns.dm
@@ -128,7 +128,7 @@
new /datum/firemode(src, list(mode_name="[burstmode] shot lethal", projectile_type=beammode_lethal, charge_cost = chargecost_lethal, burst = burstmode)),
)
-/obj/item/gun/energy/modular/load_ammo(var/obj/item/C, mob/user)
+/obj/item/gun/energy/modular/load_ammo(obj/item/C, mob/user)
if(istype(C, cell_type))
if(self_recharge || battery_lock)
to_chat(user, span_notice("[src] does not have a battery port."))
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 33706fa69b..90bd8d5ddc 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -37,7 +37,7 @@
///Var for attack_self chain
var/special_weapon_handling = FALSE
-/obj/item/gun/projectile/Initialize(mapload, var/starts_loaded = 1)
+/obj/item/gun/projectile/Initialize(mapload, starts_loaded = 1)
. = ..()
if(starts_loaded)
if(ispath(ammo_type) && (load_method & (SINGLE_CASING|SPEEDLOADER)))
@@ -124,7 +124,7 @@
//Attempts to load A into src, depending on the type of thing being loaded and the load_method
//Maybe this should be broken up into separate procs for each load method?
-/obj/item/gun/projectile/proc/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/proc/load_ammo(obj/item/A, mob/user)
if(istype(A, /obj/item/ammo_magazine))
var/obj/item/ammo_magazine/AM = A
if(!(load_method & AM.mag_type) || caliber != AM.caliber || allowed_magazines && !is_type_in_list(A, allowed_magazines))
@@ -199,7 +199,7 @@
user.hud_used.update_ammo_hud(user, src)
//attempts to unload src. If allow_dump is set to 0, the speedloader unloading method will be disabled
-/obj/item/gun/projectile/proc/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/proc/unload_ammo(mob/user, allow_dump=1)
if(manual_chamber && only_open_load && !bolt_open) //CHOMPEdit - Manual Chambering
to_chat(user,span_warning("You must open the bolt to load or unload this gun!")) //CHOMPEdit - Manual Chambering
return //CHOMPEdit - Manual Chambering
@@ -235,7 +235,7 @@
update_icon()
user.hud_used.update_ammo_hud(user, src)
-/obj/item/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/projectile/attackby(obj/item/A as obj, mob/user as mob)
..()
load_ammo(A, user)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index bc82b33b04..09a7d027f8 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -120,7 +120,7 @@
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
)
-/obj/item/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands)
+/obj/item/gun/projectile/automatic/sts35/update_icon(ignore_inhands)
..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/m545/small))
icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite.
@@ -150,7 +150,7 @@
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
)
-/obj/item/gun/projectile/automatic/pdw/update_icon(var/ignore_inhands)
+/obj/item/gun/projectile/automatic/pdw/update_icon(ignore_inhands)
..()
if(ammo_magazine)
icon_state = "pdw"
@@ -250,7 +250,7 @@
else
..()
-/obj/item/gun/projectile/automatic/z8/update_icon(var/ignore_inhands)
+/obj/item/gun/projectile/automatic/z8/update_icon(ignore_inhands)
..()
if(ammo_magazine)
icon_state = "carbine-[round(ammo_magazine.stored_ammo.len,2)]"
@@ -341,13 +341,13 @@
item_state = "l6[cover_open ? "open" : "closed"][ammo_magazine ? "" : "-empty"]"
update_held_icon()
-/obj/item/gun/projectile/automatic/l6_saw/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/automatic/l6_saw/load_ammo(obj/item/A, mob/user)
if(!cover_open)
to_chat(user, span_warning("You need to open the cover to load [src]."))
return
..()
-/obj/item/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/automatic/l6_saw/unload_ammo(mob/user, allow_dump=1)
if(!cover_open)
to_chat(user, span_warning("You need to open the cover to unload [src]."))
return
@@ -532,7 +532,7 @@
list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6))
)
-/obj/item/gun/projectile/automatic/bullpup/update_icon(var/ignore_inhands)
+/obj/item/gun/projectile/automatic/bullpup/update_icon(ignore_inhands)
..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/m762))
icon_state = "bullpup-small"
diff --git a/code/modules/projectiles/guns/projectile/automatic_ch.dm b/code/modules/projectiles/guns/projectile/automatic_ch.dm
index b0e59f34cf..930135a41a 100644
--- a/code/modules/projectiles/guns/projectile/automatic_ch.dm
+++ b/code/modules/projectiles/guns/projectile/automatic_ch.dm
@@ -117,7 +117,7 @@
list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(60,35), dispersion=list(0.0, 0.6))
)
-/obj/item/gun/projectile/automatic/fal/update_icon(var/ignore_inhands)
+/obj/item/gun/projectile/automatic/fal/update_icon(ignore_inhands)
..()
if(ammo_magazine)
icon_state = initial(icon_state)
diff --git a/code/modules/projectiles/guns/projectile/automatic_vr.dm b/code/modules/projectiles/guns/projectile/automatic_vr.dm
index 79971a8c04..b05efd004c 100644
--- a/code/modules/projectiles/guns/projectile/automatic_vr.dm
+++ b/code/modules/projectiles/guns/projectile/automatic_vr.dm
@@ -36,7 +36,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/mtg)
load_method = MAGAZINE
-/obj/item/gun/projectile/automatic/stg/update_icon(var/ignore_inhands)
+/obj/item/gun/projectile/automatic/stg/update_icon(ignore_inhands)
..()
icon_state = (ammo_magazine)? "stg60" : "stg60-empty"
item_state = (ammo_magazine)? "arifle" : "arifle-empty"
diff --git a/code/modules/projectiles/guns/projectile/automatic_yw.dm b/code/modules/projectiles/guns/projectile/automatic_yw.dm
index 90dfde3293..ee16178bee 100644
--- a/code/modules/projectiles/guns/projectile/automatic_yw.dm
+++ b/code/modules/projectiles/guns/projectile/automatic_yw.dm
@@ -60,13 +60,13 @@
item_state = "mg42"
update_held_icon()
-/obj/item/gun/projectile/automatic/mg42/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/automatic/mg42/load_ammo(obj/item/A, mob/user)
if(!cover_open)
to_chat(user, span_warning("You need to open the cover to load [src]."))
return
..()
-/obj/item/gun/projectile/automatic/mg42/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/automatic/mg42/unload_ammo(mob/user, allow_dump=1)
if(!cover_open)
to_chat(user, span_warning("You need to open the cover to unload [src]."))
return
diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm
index 82fb243413..30ff45c3f6 100644
--- a/code/modules/projectiles/guns/projectile/boltaction.dm
+++ b/code/modules/projectiles/guns/projectile/boltaction.dm
@@ -67,7 +67,7 @@
var/sawn_off = FALSE
-/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL)
if(sawn_off)
to_chat(user, span_warning("The [src] is already shortened!"))
diff --git a/code/modules/projectiles/guns/projectile/contender.dm b/code/modules/projectiles/guns/projectile/contender.dm
index 946d3b67e8..ac6b9a9d17 100644
--- a/code/modules/projectiles/guns/projectile/contender.dm
+++ b/code/modules/projectiles/guns/projectile/contender.dm
@@ -45,7 +45,7 @@
icon_state = initial(icon_state)
retracted_bolt = 0
-/obj/item/gun/projectile/contender/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/contender/load_ammo(obj/item/A, mob/user)
if(!retracted_bolt)
to_chat(user, span_notice("You can't load [src] without cycling the bolt."))
return
diff --git a/code/modules/projectiles/guns/projectile/dartgun.dm b/code/modules/projectiles/guns/projectile/dartgun.dm
index 4fc0dfdf5b..afb4341287 100644
--- a/code/modules/projectiles/guns/projectile/dartgun.dm
+++ b/code/modules/projectiles/guns/projectile/dartgun.dm
@@ -12,7 +12,7 @@
reagents = new/datum/reagents(reagent_amount)
reagents.my_atom = src
-/obj/item/projectile/bullet/chemdart/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
+/obj/item/projectile/bullet/chemdart/on_hit(atom/target, blocked = 0, def_zone = null)
if(blocked < 2 && isliving(target))
var/mob/living/L = target
if(L.can_inject(target_zone=def_zone))
@@ -126,7 +126,7 @@
..()
//fills the given dart with reagents
-/obj/item/gun/projectile/dartgun/proc/fill_dart(var/obj/item/projectile/bullet/chemdart/dart)
+/obj/item/gun/projectile/dartgun/proc/fill_dart(obj/item/projectile/bullet/chemdart/dart)
if(mixing.len)
var/mix_amount = dart.reagent_amount/mixing.len
for(var/obj/item/reagent_containers/glass/beaker/B in mixing)
@@ -168,7 +168,7 @@
popup.set_content(dat)
popup.open()
-/obj/item/gun/projectile/dartgun/proc/check_beaker_mixing(var/obj/item/B)
+/obj/item/gun/projectile/dartgun/proc/check_beaker_mixing(obj/item/B)
if(!mixing || !beakers)
return 0
for(var/obj/item/M in mixing)
diff --git a/code/modules/projectiles/guns/projectile/dartgun_vr.dm b/code/modules/projectiles/guns/projectile/dartgun_vr.dm
index 970f000fb9..3b6e99b99d 100644
--- a/code/modules/projectiles/guns/projectile/dartgun_vr.dm
+++ b/code/modules/projectiles/guns/projectile/dartgun_vr.dm
@@ -29,7 +29,7 @@
return 1
// This is to allow xenobio to activate slime cores via remote.
-/obj/item/projectile/bullet/chemdart/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
+/obj/item/projectile/bullet/chemdart/on_hit(atom/target, blocked = 0, def_zone = null)
..()
if(blocked < 2)
if(istype(target, /obj/item/reagent_containers/food) || istype(target, /obj/item/slime_extract))
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 36b89b5bf9..f8dc412c7a 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -37,7 +37,7 @@
return
return ..()
-/obj/item/gun/projectile/revolver/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/revolver/load_ammo(obj/item/A, mob/user)
chamber_offset = 0
return ..()
@@ -183,7 +183,7 @@
else
icon_state = "deckard-empty"
-/obj/item/gun/projectile/revolver/deckard/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/revolver/deckard/load_ammo(obj/item/A, mob/user)
if(istype(A, /obj/item/ammo_magazine))
flick("deckard-reload",src)
..()
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 2ca2b2b6da..7d7674e44e 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -182,7 +182,7 @@
return 1
*/ //CHOMP Remove end
//this is largely hacky and bad :( -Pete //less hacky and bad now :) -Ghost
-/obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/projectile/shotgun/doublebarrel/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter))
if(sawn_off)
to_chat(user, span_warning("The [src] is already shortened!"))
diff --git a/code/modules/projectiles/guns/projectile/smartgun.dm b/code/modules/projectiles/guns/projectile/smartgun.dm
index ac28a70050..c7d8ef612d 100644
--- a/code/modules/projectiles/guns/projectile/smartgun.dm
+++ b/code/modules/projectiles/guns/projectile/smartgun.dm
@@ -48,13 +48,13 @@
return null
return ..()
-/obj/item/gun/projectile/smartgun/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/smartgun/load_ammo(obj/item/A, mob/user)
if(closed)
to_chat(user, span_warning("[src] can't be loaded until you un-ready it. (Alt-click)"))
return
return ..()
-/obj/item/gun/projectile/smartgun/unload_ammo(mob/user, var/allow_dump=0)
+/obj/item/gun/projectile/smartgun/unload_ammo(mob/user, allow_dump=0)
if(closed)
to_chat(user, span_warning("[src] can't be unloaded until you un-ready it. (Alt-click)"))
return
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 9792fc7a15..ac661b08ea 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -55,12 +55,12 @@
return 0
return ..()
-/obj/item/gun/projectile/heavysniper/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/heavysniper/load_ammo(obj/item/A, mob/user)
if(!bolt_open)
return
..()
-/obj/item/gun/projectile/heavysniper/unload_ammo(mob/user, var/allow_dump=1)
+/obj/item/gun/projectile/heavysniper/unload_ammo(mob/user, allow_dump=1)
if(!bolt_open)
return
..()
diff --git a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm
index 3165b127f0..d4119cce2a 100644
--- a/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper/collapsible_sniper.dm
@@ -95,7 +95,7 @@
update_build(user)
-/obj/item/sniper_rifle_part/attackby(var/obj/item/sniper_rifle_part/A as obj, mob/user as mob)
+/obj/item/sniper_rifle_part/attackby(obj/item/sniper_rifle_part/A as obj, mob/user as mob)
to_chat(user, span_notice("You begin adding \the [A] to \the [src]."))
if(!do_after(user, 3 SECONDS, target = src))
diff --git a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
index e76eac2d5c..052a4ecf34 100644
--- a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
+++ b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
@@ -1024,7 +1024,7 @@
if(do_after(user, 5 SECONDS, src)) //Give them a chance to take it back.
. = ..() //RIP
-/obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, var/pointblank=0, var/reflex=0)
+/obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, pointblank=0, reflex=0)
. = ..()
var/unhappy_factor = 1.3333333*(user.size_multiplier - 0.5) //Unhappy factor based on size. Below 50% is a really bad day, and above 125% is fine, everything inbetween is varying.
if(unhappy_factor >= 1) //They're fine
@@ -1620,7 +1620,7 @@
icon_expected_width = 64
var/is_picked_up = FALSE
-/obj/item/gun/projectile/shotgun/doublebarrel/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded)
+/obj/item/gun/projectile/shotgun/doublebarrel/process_accuracy(obj/projectile, mob/living/user, atom/target, burst, held_twohanded)
. = ..()
var/obj/item/projectile/bullet/P = projectile
if(!istype(P))
@@ -1628,7 +1628,7 @@
if(sawn_off)
P.submunition_spread_max = 100 //More spread when sawn off
-/obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/projectile/shotgun/doublebarrel/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter))
if(sawn_off) //Don't do anything if we were already sawed off.
return
diff --git a/code/modules/projectiles/guns/projectile_ch.dm b/code/modules/projectiles/guns/projectile_ch.dm
index 533ad44dbf..ad7d34b307 100644
--- a/code/modules/projectiles/guns/projectile_ch.dm
+++ b/code/modules/projectiles/guns/projectile_ch.dm
@@ -24,7 +24,7 @@
var/sound_chamber = 'sound/weapons/ballistics/pistol_chamber.ogg'
special_handling = TRUE
-/obj/item/gun/projectile/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0)
+/obj/item/gun/projectile/handle_post_fire(mob/user, atom/target, pointblank=0, reflex=0)
if(fire_anim)
flick(fire_anim, src)
@@ -118,7 +118,7 @@
span_notice("You close \the [bolt_name][casing_chambered]."))
user.hud_used.update_ammo_hud(user, src)
-/obj/item/gun/projectile/proc/bolt_toggle(var/manual)
+/obj/item/gun/projectile/proc/bolt_toggle(manual)
if(!bolt_open)
if(auto_loading_type)
var/able_to_lock = (CHECK_BITFIELD(auto_loading_type,LOCK_OPEN_EMPTY) || (CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK) && manual))
@@ -203,7 +203,7 @@
else
return FALSE
-/obj/item/gun/projectile/load_ammo(var/obj/item/A, mob/user)
+/obj/item/gun/projectile/load_ammo(obj/item/A, mob/user)
if(istype(A, /obj/item/ammo_magazine))
var/obj/item/ammo_magazine/AM = A
if(!(load_method & AM.mag_type) || caliber != AM.caliber || allowed_magazines && !is_type_in_list(A, allowed_magazines))
@@ -322,7 +322,7 @@
update_icon()
-/obj/item/gun/projectile/special_check(var/mob/user)
+/obj/item/gun/projectile/special_check(mob/user)
if(..())
if(manual_chamber)
if(CHECK_BITFIELD(auto_loading_type,OPEN_BOLT) && !bolt_open)
diff --git a/code/modules/projectiles/guns/vox.dm b/code/modules/projectiles/guns/vox.dm
index 564783b3e0..40ae57dfb4 100644
--- a/code/modules/projectiles/guns/vox.dm
+++ b/code/modules/projectiles/guns/vox.dm
@@ -150,7 +150,7 @@
/obj/item/projectile/sonic/strong
damage = 45
-/obj/item/projectile/sonic/strong/on_hit(var/atom/movable/target, var/blocked = 0)
+/obj/item/projectile/sonic/strong/on_hit(atom/movable/target, blocked = 0)
if(ismob(target))
var/throwdir = get_dir(firer,target)
target.throw_at(get_edge_target_turf(target, throwdir), rand(1,6), 10)
diff --git a/code/modules/projectiles/projectile/animate.dm b/code/modules/projectiles/projectile/animate.dm
index 13584a64ad..ffd5ff1c5e 100644
--- a/code/modules/projectiles/projectile/animate.dm
+++ b/code/modules/projectiles/projectile/animate.dm
@@ -10,7 +10,7 @@
light_color = "#55AAFF"
combustion = FALSE
-/obj/item/projectile/animate/Bump(var/atom/change)
+/obj/item/projectile/animate/Bump(atom/change)
if((istype(change, /obj/item) || istype(change, /obj/structure)) && !is_type_in_list(change, protected_objects))
var/obj/O = change
new /mob/living/simple_mob/hostile/mimic/copy(O.loc, O, firer)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 801b530526..90a4b2ac8a 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -195,7 +195,7 @@
tracer_type = /obj/effect/projectile/tracer/laser_pulse
impact_type = /obj/effect/projectile/impact/laser_pulse
-/obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/beam/pulse/on_hit(atom/target, blocked = 0)
if(isturf(target))
target.ex_act(2)
..()
@@ -230,7 +230,7 @@
combustion = FALSE
-/obj/item/projectile/beam/lasertag/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
return handle_lasertag_attack(target, firer, tag_damage, TRUE, allowed_suits = allowed_suits) //We can't shoot this in the first place without having the proper vest / vest_override, so we feed it vest_override = TRUE
/obj/item/projectile/beam/lasertag/blue
@@ -463,7 +463,7 @@
damage = 0
nodamage = TRUE
-/obj/item/projectile/beam/sparkledog/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/beam/sparkledog/on_hit(atom/target, blocked = 0)
if(ishuman(target))
var/mob/living/carbon/human/M = target
M.druggy = max(M.druggy, 20)
@@ -523,11 +523,11 @@
tracer_type = /obj/effect/projectile/tracer/xray
impact_type = /obj/effect/projectile/impact/xray
-/obj/item/projectile/beam/energy_net/on_hit(var/atom/netted)
+/obj/item/projectile/beam/energy_net/on_hit(atom/netted)
do_net(netted)
..()
-/obj/item/projectile/beam/energy_net/proc/do_net(var/mob/M)
+/obj/item/projectile/beam/energy_net/proc/do_net(mob/M)
var/obj/item/energy_net/net = new net_type(get_turf(M))
net.throw_impact(M, throwing)
@@ -566,7 +566,7 @@
tracer_type = /obj/effect/projectile/tracer/medigun
impact_type = /obj/effect/projectile/impact/medigun
-/obj/item/projectile/beam/medigun/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/beam/medigun/on_hit(atom/target, blocked = 0)
if(ishuman(target))
var/mob/living/carbon/human/M = target
if(M.health < M.getMaxHealth())
diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm
index 761c53cafd..6bfdaebe7b 100644
--- a/code/modules/projectiles/projectile/blob.dm
+++ b/code/modules/projectiles/projectile/blob.dm
@@ -20,7 +20,7 @@
create_reagents(splatter_volume)
ready_chemicals()
-/obj/item/projectile/energy/blob/on_impact(var/atom/A)
+/obj/item/projectile/energy/blob/on_impact(atom/A)
if(splatter)
var/turf/location = get_turf(src)
var/datum/effect/effect/system/smoke_spread/chem/blob/S = new /datum/effect/effect/system/smoke_spread/chem/blob
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index b795cda81a..c2ab9758fb 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -17,12 +17,12 @@
muzzle_type = /obj/effect/projectile/muzzle/bullet
-/obj/item/projectile/bullet/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/on_hit(atom/target, blocked = 0)
..(target, blocked)
//var/mob/living/L = target
//shake_camera(L, 3, 2) CHOMPEDIT - "Muh realism". The screenshake is obnoxious for gameplay. TODO: Replace with blood splatter indicator.
-/obj/item/projectile/bullet/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier)
+/obj/item/projectile/bullet/attack_mob(mob/living/target_mob, distance, miss_modifier)
if(penetrating > 0 && damage > 20 && prob(damage))
mob_passthrough_check = 1
else
@@ -35,7 +35,7 @@
return 0
return ..()
-/obj/item/projectile/bullet/check_penetrate(var/atom/A)
+/obj/item/projectile/bullet/check_penetrate(atom/A)
if(!A || !A.density) return 1 //if whatever it was got destroyed when we hit it, then I guess we can just keep going
if(istype(A, /obj/mecha))
@@ -193,7 +193,7 @@
combustion = FALSE
-/obj/item/projectile/bullet/shotgun/ion/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/shotgun/ion/on_hit(atom/target, blocked = 0)
..()
empulse(target, 0, 0, 0, 0) //Only affects what it hits
return 1
@@ -303,7 +303,7 @@
edge = TRUE
hud_state = "pistol_fire"
-/obj/item/projectile/bullet/burstbullet/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/burstbullet/on_hit(atom/target, blocked = 0)
if(isturf(target))
explosion(target, -1, 0, 2)
..()
@@ -445,17 +445,17 @@
range = 15
hud_state = "grenade_dummy"
-/obj/item/projectile/bullet/foam_dart/on_impact(var/atom/A)
+/obj/item/projectile/bullet/foam_dart/on_impact(atom/A)
. = ..()
var/turf/T = get_turf(loc)
if(istype(T))
new /obj/item/ammo_casing/afoam_dart(get_turf(loc))
///Doesn't give a damn about what faction you're on, hits you anyway.
-/obj/item/projectile/bullet/foam_dart/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/foam_dart/on_hit(atom/target, blocked = 0)
handle_lasertag_attack(target, firer, tag_damage = 1, vest_override = TRUE)
-/obj/item/projectile/bullet/foam_dart/on_range(var/atom/A)
+/obj/item/projectile/bullet/foam_dart/on_range(atom/A)
. = ..()
var/turf/T = get_turf(loc)
if(istype(T))
@@ -478,17 +478,17 @@
range = 15
hud_state = "grenade_he"
-/obj/item/projectile/bullet/foam_dart_riot/on_impact(var/atom/A)
+/obj/item/projectile/bullet/foam_dart_riot/on_impact(atom/A)
. = ..()
var/turf/T = get_turf(loc)
if(istype(T))
new /obj/item/ammo_casing/afoam_dart/riot(get_turf(loc))
-/obj/item/projectile/bullet/foam_dart_riot/on_range(var/atom/A)
+/obj/item/projectile/bullet/foam_dart_riot/on_range(atom/A)
. = ..()
var/turf/T = get_turf(loc)
if(istype(T))
new /obj/item/ammo_casing/afoam_dart/riot(get_turf(loc))
-/obj/item/projectile/bullet/foam_dart_riot/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/foam_dart_riot/on_hit(atom/target, blocked = 0)
handle_lasertag_attack(target, firer, 5, vest_override = TRUE) //Insult to injury.
diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm
index a1e6c1dd29..20a99708a4 100644
--- a/code/modules/projectiles/projectile/change.dm
+++ b/code/modules/projectiles/projectile/change.dm
@@ -8,10 +8,10 @@
combustion = FALSE
-/obj/item/projectile/change/on_hit(var/atom/change)
+/obj/item/projectile/change/on_hit(atom/change)
wabbajack(change)
-/obj/item/projectile/change/proc/wabbajack(var/mob/M)
+/obj/item/projectile/change/proc/wabbajack(mob/M)
if(isliving(M) && M.stat != DEAD)
if(M.transforming)
return
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 9c5ef5fbc6..37d2e8f03e 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -26,7 +26,7 @@
var/light_colour = "#ffffff"
hud_state = "grenade_dummy"
-/obj/item/projectile/energy/flash/on_impact(var/atom/A)
+/obj/item/projectile/energy/flash/on_impact(atom/A)
var/turf/T = flash_range? src.loc : get_turf(A)
if(!istype(T)) return
@@ -64,7 +64,7 @@
flash_strength = 20
hud_state = "grenade_dummy"
-/obj/item/projectile/energy/flash/flare/on_impact(var/atom/A)
+/obj/item/projectile/energy/flash/flare/on_impact(atom/A)
light_colour = pick("#e58775", "#ffffff", "#90ff90", "#a09030")
..() //initial flash
@@ -241,7 +241,7 @@
vacuum_traversal = 0 //Projectile disappears in empty space
hud_state = "plasma_rifle_blast"
-/obj/item/projectile/energy/plasmastun/proc/bang(var/mob/living/carbon/M)
+/obj/item/projectile/energy/plasmastun/proc/bang(mob/living/carbon/M)
to_chat(M, span_danger("You hear a loud roar."))
playsound(src, 'sound/effects/bang.ogg', 50, 1)
@@ -268,7 +268,7 @@
to_chat(M, span_danger("Your ears start to ring!"))
M.update_icons() //Just to apply matrix transform for laying asap
-/obj/item/projectile/energy/plasmastun/on_hit(var/atom/target)
+/obj/item/projectile/energy/plasmastun/on_hit(atom/target)
bang(target)
. = ..()
diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm
index d03de505b5..8cb226883b 100644
--- a/code/modules/projectiles/projectile/force.dm
+++ b/code/modules/projectiles/projectile/force.dm
@@ -13,14 +13,14 @@
/obj/item/projectile/forcebolt/strong
name = "force bolt"
-/obj/item/projectile/forcebolt/on_hit(var/atom/movable/target, var/blocked = 0)
+/obj/item/projectile/forcebolt/on_hit(atom/movable/target, blocked = 0)
if(istype(target))
var/throwdir = get_dir(firer,target)
target.throw_at(get_edge_target_turf(target, throwdir),10,10)
return 1
/*
-/obj/item/projectile/forcebolt/strong/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/forcebolt/strong/on_hit(atom/target, blocked = 0)
// NONE OF THIS WORKS. DO NOT USE.
var/throwdir = null
diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm
index 0a06c21f10..2d07474500 100644
--- a/code/modules/projectiles/projectile/hook.dm
+++ b/code/modules/projectiles/projectile/hook.dm
@@ -71,15 +71,15 @@
chain.Draw()
return
-/obj/item/projectile/energy/hook/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
+/obj/item/projectile/energy/hook/on_hit(atom/target, blocked = 0, def_zone = null)
if(..())
perform_intent_unique(target)
-/obj/item/projectile/energy/hook/on_impact(var/atom/A)
+/obj/item/projectile/energy/hook/on_impact(atom/A)
perform_intent_unique(get_turf(A))
-/obj/item/projectile/energy/hook/proc/ranged_disarm(var/mob/living/carbon/human/H)
+/obj/item/projectile/energy/hook/proc/ranged_disarm(mob/living/carbon/human/H)
if(istype(H))
var/list/holding = list(H.get_active_hand() = 60, H.get_inactive_hand() = 40)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 720e1dde06..1fa11219d0 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -9,12 +9,12 @@
combustion = TRUE
-/obj/item/projectile/energy/fireball/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/energy/fireball/on_hit(atom/target, blocked = 0)
new /obj/effect/explosion(get_turf(target))
explosion(target, -1, 0, 2, 0, 0) //CHOMPEdit - Don't spam admins
..()
-/obj/item/projectile/energy/fireball/on_impact(var/atom/target)
+/obj/item/projectile/energy/fireball/on_impact(atom/target)
new /obj/effect/explosion(get_turf(target))
explosion(target, -1, 0, 2, 0, 0) //CHOMPEdit - Don't spam admins
..()
diff --git a/code/modules/projectiles/projectile/magnetic.dm b/code/modules/projectiles/projectile/magnetic.dm
index ec2c56eda1..4ffd25905f 100644
--- a/code/modules/projectiles/projectile/magnetic.dm
+++ b/code/modules/projectiles/projectile/magnetic.dm
@@ -81,7 +81,7 @@
var/detonate_mob = 0 //Will this fuelrod explode when it hits a mob?
var/energetic_impact = 0 //Does this fuelrod cause a bright flash on impact with a mob?
-/obj/item/projectile/bullet/magnetic/fuelrod/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) //Future-proofing. Special effects for impact.
+/obj/item/projectile/bullet/magnetic/fuelrod/on_hit(atom/target, blocked = 0, def_zone = null) //Future-proofing. Special effects for impact.
if(isliving(target))
var/mob/living/V = target
if(detonate_mob)
@@ -105,7 +105,7 @@
return ..(target, blocked, def_zone)
-/obj/item/projectile/bullet/magnetic/fuelrod/on_impact(var/atom/A) //Future-proofing, again. In the event new fuel rods are introduced, and have special effects for when they stop flying.
+/obj/item/projectile/bullet/magnetic/fuelrod/on_impact(atom/A) //Future-proofing, again. In the event new fuel rods are introduced, and have special effects for when they stop flying.
if(src.loc)
if(detonate_travel && detonate_mob)
visible_message(span_warning("\The [src] shatters in a violent explosion!"))
@@ -152,7 +152,7 @@
energetic_impact = 1
hud_state = "rocket_thermobaric"
-/obj/item/projectile/bullet/magnetic/fuelrod/supermatter/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) //You cannot touch the supermatter without disentigrating. Assumedly, this is true for condensed rods of it flying at relativistic speeds.
+/obj/item/projectile/bullet/magnetic/fuelrod/supermatter/on_hit(atom/target, blocked = 0, def_zone = null) //You cannot touch the supermatter without disentigrating. Assumedly, this is true for condensed rods of it flying at relativistic speeds.
if(istype(target,/turf/simulated/wall) || isliving(target))
target.visible_message(span_danger("The [src] burns a perfect hole through \the [target] with a blinding flash!"))
playsound(target, 'sound/effects/teleport.ogg', 40, 0)
diff --git a/code/modules/projectiles/projectile/magnetic_ch.dm b/code/modules/projectiles/projectile/magnetic_ch.dm
index 2c45c0b88d..9a64ae6ec4 100644
--- a/code/modules/projectiles/projectile/magnetic_ch.dm
+++ b/code/modules/projectiles/projectile/magnetic_ch.dm
@@ -25,7 +25,7 @@
energetic_impact = 1
hud_state = "rocket_thermobaric"
-/obj/item/projectile/bullet/magnetic/fuelrod/blitz/on_impact(var/atom/A)
+/obj/item/projectile/bullet/magnetic/fuelrod/blitz/on_impact(atom/A)
if(isturf(loc))
explosion(loc, 3, 4, 5, 10)
..(A)
diff --git a/code/modules/projectiles/projectile/pellets.dm b/code/modules/projectiles/projectile/pellets.dm
index df858c93db..86bcf4f9a4 100644
--- a/code/modules/projectiles/projectile/pellets.dm
+++ b/code/modules/projectiles/projectile/pellets.dm
@@ -9,11 +9,11 @@
var/base_spread = 90 //lower means the pellets spread more across body parts. If zero then this is considered a shrapnel explosion instead of a shrapnel cone
var/spread_step = 10 //higher means the pellets spread more across body parts with distance
-/obj/item/projectile/bullet/pellet/proc/get_pellets(var/distance)
+/obj/item/projectile/bullet/pellet/proc/get_pellets(distance)
var/pellet_loss = round((distance - 1)/range_step) //pellets lost due to distance
return max(pellets - pellet_loss, 1)
-/obj/item/projectile/bullet/pellet/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier)
+/obj/item/projectile/bullet/pellet/attack_mob(mob/living/target_mob, distance, miss_modifier)
if (pellets < 0) return 1
var/total_pellets = get_pellets(distance)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 3ca750695b..338572e79c 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -22,7 +22,7 @@
var/sev3_range = 1
var/sev4_range = 1
-/obj/item/projectile/ion/on_impact(var/atom/target)
+/obj/item/projectile/ion/on_impact(atom/target)
empulse(target, sev1_range, sev2_range, sev3_range, sev4_range)
..()
@@ -47,7 +47,7 @@
edge = TRUE
hud_state = "rocket_fire"
-/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
explosion(target, -1, 0, 2, 0, 0) //CHOMPEdit - Don't spam admins
..()
@@ -151,7 +151,7 @@
combustion = FALSE
hud_state = "electrothermal"
-/obj/item/projectile/energy/floramut/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/energy/floramut/on_hit(atom/target, blocked = 0)
var/mob/living/M = target
if(ishuman(target))
var/mob/living/carbon/human/H = M
@@ -209,7 +209,7 @@
var/lasermod = 0
hud_state = "electrothermal"
-/obj/item/projectile/energy/florayield/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/energy/florayield/on_hit(atom/target, blocked = 0)
var/mob/living/M = target
if(ishuman(target)) //These rays make plantmen fat.
var/mob/living/carbon/human/H = M
@@ -235,7 +235,7 @@
var/lasermod = 0
hud_state = "electrothermal"
-/obj/item/projectile/energy/floraprune/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/energy/floraprune/on_hit(atom/target, blocked = 0)
var/mob/living/M = target
if(ishuman(target)) //Make plantpeople thin, seeing as we're removing reagents from actual plants
var/mob/living/carbon/human/H = M
@@ -253,7 +253,7 @@
combustion = FALSE
hud_state = "electrothermal"
-/obj/item/projectile/beam/mindflayer/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/beam/mindflayer/on_hit(atom/target, blocked = 0)
if(ishuman(target))
var/mob/living/carbon/human/M = target
M.Confuse(rand(5,8))
@@ -280,7 +280,7 @@
combustion = FALSE
-/obj/item/projectile/bola/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bola/on_hit(atom/target, blocked = 0)
if(ishuman(target))
var/mob/living/carbon/human/human_target = target
var/obj/item/handcuffs/legcuffs/bola/B = new(src.loc)
@@ -308,7 +308,7 @@
hud_state = "monkey"
combustion = FALSE
-/obj/item/projectile/webball/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/webball/on_hit(atom/target, blocked = 0)
if(isturf(target.loc))
var/obj/effect/spider/stickyweb/W = locate() in get_turf(target)
if(!W && prob(75))
@@ -333,7 +333,7 @@
tracer_type = /obj/effect/projectile/tracer/tungsten
impact_type = /obj/effect/projectile/impact/tungsten
-/obj/item/projectile/beam/tungsten/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/beam/tungsten/on_hit(atom/target, blocked = 0)
if(isliving(target))
var/mob/living/L = target
L.add_modifier(/datum/modifier/grievous_wounds, 30 SECONDS)
@@ -379,7 +379,7 @@
..()
-/obj/item/projectile/beam/tungsten/on_impact(var/atom/A)
+/obj/item/projectile/beam/tungsten/on_impact(atom/A)
if(istype(A,/turf/simulated/shuttle/wall) || istype(A,/turf/simulated/wall) || (ismineralturf(A) && A.density) || istype(A,/obj/mecha) || istype(A,/obj/machinery/door))
var/blast_dir = src.dir
A.visible_message(span_danger("\The [A] begins to glow!"))
diff --git a/code/modules/projectiles/projectile/trace.dm b/code/modules/projectiles/projectile/trace.dm
index 9d94f6ca9d..b2ea0ffb6c 100644
--- a/code/modules/projectiles/projectile/trace.dm
+++ b/code/modules/projectiles/projectile/trace.dm
@@ -1,6 +1,6 @@
// Helper proc to check if you can hit them or not.
// Will return a list of hit mobs/objects.
-/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, var/pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE, flags=null)
+/proc/check_trajectory(atom/target as mob|obj, atom/firer as mob|obj, pass_flags=PASSTABLE|PASSGLASS|PASSGRILLE, flags=null)
if(!istype(target) || !istype(firer))
return 0
@@ -13,7 +13,7 @@
return trace.launch_projectile(target) //Test it!
-/obj/item/projectile/proc/_check_fire(atom/target as mob, var/mob/living/user as mob) //Checks if you can hit them or not.
+/obj/item/projectile/proc/_check_fire(atom/target as mob, mob/living/user as mob) //Checks if you can hit them or not.
if(target in check_trajectory(target, user, pass_flags, flags))
return TRUE
return FALSE
diff --git a/code/modules/projectiles/targeting/targeting_gun.dm b/code/modules/projectiles/targeting/targeting_gun.dm
index cec51cc569..fd49c16004 100644
--- a/code/modules/projectiles/targeting/targeting_gun.dm
+++ b/code/modules/projectiles/targeting/targeting_gun.dm
@@ -1,17 +1,17 @@
//Removing the lock and the buttons.
-/obj/item/gun/dropped(var/mob/living/user)
+/obj/item/gun/dropped(mob/living/user)
if(istype(user))
user.stop_aiming(src)
return ..()
-/obj/item/gun/equipped(var/mob/living/user, var/slot)
+/obj/item/gun/equipped(mob/living/user, slot)
if(istype(user) && (slot != slot_l_hand && slot != slot_r_hand))
user.stop_aiming(src)
return ..()
//Compute how to fire.....
//Return 1 if a target was found, 0 otherwise.
-/obj/item/gun/proc/PreFire(var/atom/A, var/mob/living/user, var/params)
+/obj/item/gun/proc/PreFire(atom/A, mob/living/user, params)
if(!user.aiming)
user.aiming = new(user)
user.face_atom(A)
diff --git a/code/modules/projectiles/targeting/targeting_mob.dm b/code/modules/projectiles/targeting/targeting_mob.dm
index de5d49050b..34f8a0786e 100644
--- a/code/modules/projectiles/targeting/targeting_mob.dm
+++ b/code/modules/projectiles/targeting/targeting_mob.dm
@@ -15,7 +15,7 @@
to_chat(src, span_warning("This verb may only be used by living mobs, sorry."))
return
-/mob/living/proc/stop_aiming(var/obj/item/thing, var/no_message = 0)
+/mob/living/proc/stop_aiming(obj/item/thing, no_message = 0)
if(!aiming)
aiming = new(src)
if(thing && aiming.aiming_with != thing)
@@ -35,7 +35,7 @@
stop_aiming(no_message=1)
..()
-/turf/Enter(var/mob/living/mover)
+/turf/Enter(mob/living/mover)
. = ..()
if(istype(mover))
if(mover.aiming && mover.aiming.aiming_at)
@@ -50,7 +50,7 @@
if(aimed.len)
trigger_aiming(TARGET_CAN_MOVE)
-/mob/living/proc/set_m_intent(var/intent)
+/mob/living/proc/set_m_intent(intent)
if (intent != I_WALK && intent != I_RUN)
return 0
m_intent = intent
diff --git a/code/modules/projectiles/targeting/targeting_overlay.dm b/code/modules/projectiles/targeting/targeting_overlay.dm
index 6cab0459b1..8118138e7a 100644
--- a/code/modules/projectiles/targeting/targeting_overlay.dm
+++ b/code/modules/projectiles/targeting/targeting_overlay.dm
@@ -26,7 +26,7 @@
moveToNullspace()
verbs.Cut()
-/obj/aiming_overlay/proc/toggle_permission(var/perm)
+/obj/aiming_overlay/proc/toggle_permission(perm)
if(target_permissions & perm)
target_permissions &= ~perm
@@ -143,7 +143,7 @@
spawn(0)
owner.set_dir(get_dir(get_turf(owner), get_turf(src)))
-/obj/aiming_overlay/proc/aim_at(var/mob/target, var/obj/thing)
+/obj/aiming_overlay/proc/aim_at(mob/target, obj/thing)
if(!owner)
return
@@ -193,7 +193,7 @@
else
icon_state = "locking"
-/obj/aiming_overlay/proc/toggle_active(var/force_state = null)
+/obj/aiming_overlay/proc/toggle_active(force_state = null)
if(!isnull(force_state))
if(active == force_state)
return
@@ -213,7 +213,7 @@
owner.client.remove_gun_icons()
owner.gun_setting_icon?.icon_state = "gun[active]"
-/obj/aiming_overlay/proc/cancel_aiming(var/no_message = 0)
+/obj/aiming_overlay/proc/cancel_aiming(no_message = 0)
if(!aiming_with || !aiming_at)
return
if(istype(aiming_with, /obj/item/gun))
diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm
index 7f0dd162aa..1325ca9a40 100644
--- a/code/modules/projectiles/targeting/targeting_triggers.dm
+++ b/code/modules/projectiles/targeting/targeting_triggers.dm
@@ -1,8 +1,8 @@
//as core click exists at the mob level
-/mob/proc/trigger_aiming(var/trigger_type)
+/mob/proc/trigger_aiming(trigger_type)
return
-/mob/living/trigger_aiming(var/trigger_type)
+/mob/living/trigger_aiming(trigger_type)
if(!aimed.len)
return
for(var/obj/aiming_overlay/AO in aimed)
@@ -12,7 +12,7 @@
AO.trigger(trigger_type)
AO.update_aiming_deferred()
-/obj/aiming_overlay/proc/trigger(var/perm)
+/obj/aiming_overlay/proc/trigger(perm)
if(!owner || !aiming_with || !aiming_at || !locked)
return
if(perm && (target_permissions & perm))
diff --git a/code/modules/random_map/automata/caves.dm b/code/modules/random_map/automata/caves.dm
index d1d0770091..efa46c5039 100644
--- a/code/modules/random_map/automata/caves.dm
+++ b/code/modules/random_map/automata/caves.dm
@@ -8,10 +8,10 @@
/datum/random_map/automata/cave_system/no_cracks
make_cracked_turfs = FALSE
-/datum/random_map/automata/cave_system/get_appropriate_path(var/value)
+/datum/random_map/automata/cave_system/get_appropriate_path(value)
return
-/datum/random_map/automata/cave_system/get_map_char(var/value)
+/datum/random_map/automata/cave_system/get_map_char(value)
switch(value)
if(DOOR_CHAR)
return "x"
@@ -55,7 +55,7 @@
#endif
return 1
-/datum/random_map/automata/cave_system/apply_to_turf(var/x,var/y)
+/datum/random_map/automata/cave_system/apply_to_turf(x,y)
var/current_cell = get_map_cell(x,y)
if(!current_cell)
return 0
diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm
index f228b09d3d..5668080e7e 100644
--- a/code/modules/random_map/automata/diona.dm
+++ b/code/modules/random_map/automata/diona.dm
@@ -1,7 +1,7 @@
/turf/simulated/wall/diona/Initialize(mapload)
. = ..(mapload, MAT_BIOMASS)
-/turf/simulated/wall/diona/attack_generic(var/mob/user, var/damage, var/attack_message)
+/turf/simulated/wall/diona/attack_generic(mob/user, damage, attack_message)
if(istype(user, /mob/living/carbon/alien/diona))
if(can_open == WALL_OPENING)
return
@@ -65,7 +65,7 @@
floor_type = /turf/simulated/floor/diona
// This is disgusting.
-/datum/random_map/automata/diona/proc/search_neighbors_for(var/search_val, var/x, var/y)
+/datum/random_map/automata/diona/proc/search_neighbors_for(search_val, x, y)
var/current_cell = get_map_cell(x-1,y-1)
if(current_cell && map[current_cell] == search_val) return 1
current_cell = get_map_cell(x-1,y)
@@ -142,14 +142,14 @@
nymph_count--
return
-/datum/random_map/automata/diona/get_appropriate_path(var/value)
+/datum/random_map/automata/diona/get_appropriate_path(value)
switch(value)
if(EMPTY_CHAR, DOOR_CHAR, MONSTER_CHAR, ARTIFACT_CHAR)
return floor_type
if(WALL_CHAR)
return wall_type
-/datum/random_map/automata/diona/get_additional_spawns(var/value, var/turf/T)
+/datum/random_map/automata/diona/get_additional_spawns(value, turf/T)
if(value != FLOOR_CHAR)
for(var/thing in T)
diff --git a/code/modules/random_map/building/building.dm b/code/modules/random_map/building/building.dm
index fdaee1ceb6..6fdcbd44c7 100644
--- a/code/modules/random_map/building/building.dm
+++ b/code/modules/random_map/building/building.dm
@@ -14,7 +14,7 @@
else
map[current_cell] = FLOOR_CHAR
-/datum/random_map/building/handle_post_overlay_on(var/datum/random_map/target_map, var/tx, var/ty)
+/datum/random_map/building/handle_post_overlay_on(datum/random_map/target_map, tx, ty)
var/list/possible_doors
for(var/x = 1, x <= limit_x, x++)
for(var/y = 1, y <= limit_y, y++)
diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm
index 0ccc8bd986..f330e8cde2 100644
--- a/code/modules/random_map/drop/droppod.dm
+++ b/code/modules/random_map/drop/droppod.dm
@@ -24,7 +24,7 @@
var/placement_explosion_light = 6
var/placement_explosion_flash = 4
-/datum/random_map/droppod/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly, var/do_not_apply, var/do_not_announce, var/supplied_drop, var/list/supplied_drops, var/automated)
+/datum/random_map/droppod/New(seed, tx, ty, tz, tlx, tly, do_not_apply, do_not_announce, supplied_drop, list/supplied_drops, automated)
if(supplied_drop)
drop_type = supplied_drop
@@ -87,7 +87,7 @@
sleep(15) // Let the explosion finish proccing before we ChangeTurf(), otherwise it might destroy our spawned objects.
return ..()
-/datum/random_map/droppod/get_appropriate_path(var/value)
+/datum/random_map/droppod/get_appropriate_path(value)
if(value == SD_FLOOR_TILE || value == SD_SUPPLY_TILE)
return floor_type
else if(value == SD_WALL_TILE)
@@ -97,7 +97,7 @@
return null
// Pods are circular. Get the direction this object is facing from the center of the pod.
-/datum/random_map/droppod/get_spawn_dir(var/x, var/y)
+/datum/random_map/droppod/get_spawn_dir(x, y)
var/x_midpoint = n_ceil(limit_x / 2)
var/y_midpoint = n_ceil(limit_y / 2)
if(x == x_midpoint && y == y_midpoint)
@@ -108,7 +108,7 @@
return null
return get_dir(middle, target)
-/datum/random_map/droppod/get_additional_spawns(var/value, var/turf/T, var/spawn_dir)
+/datum/random_map/droppod/get_additional_spawns(value, turf/T, spawn_dir)
// Splatter anything under us that survived the explosion.
if(value != SD_EMPTY_TILE && T.contents.len)
@@ -124,7 +124,7 @@
else if(value == SD_SUPPLY_TILE)
get_spawned_drop(T)
-/datum/random_map/droppod/proc/get_spawned_drop(var/turf/T)
+/datum/random_map/droppod/proc/get_spawned_drop(turf/T)
var/obj/structure/bed/chair/C = new(T)
C.set_light(3, l_color = "#CC0000")
var/mob/living/drop
diff --git a/code/modules/random_map/drop/droppod_doors.dm b/code/modules/random_map/drop/droppod_doors.dm
index e0fd1cd96d..ae6bca4ba7 100644
--- a/code/modules/random_map/drop/droppod_doors.dm
+++ b/code/modules/random_map/drop/droppod_doors.dm
@@ -10,20 +10,20 @@
var/deploying
var/deployed
-/obj/structure/droppod_door/Initialize(mapload, var/autoopen)
+/obj/structure/droppod_door/Initialize(mapload, autoopen)
. = ..()
if(autoopen)
addtimer(CALLBACK(src, PROC_REF(deploy)), 10 SECONDS)
-/obj/structure/droppod_door/attack_ai(var/mob/user)
+/obj/structure/droppod_door/attack_ai(mob/user)
if(!user.Adjacent(src))
return
attack_hand(user)
-/obj/structure/droppod_door/attack_generic(var/mob/user)
+/obj/structure/droppod_door/attack_generic(mob/user)
attack_hand(user)
-/obj/structure/droppod_door/attack_hand(var/mob/user)
+/obj/structure/droppod_door/attack_hand(mob/user)
if(deploying) return
deploying = TRUE
to_chat(user, span_danger("You prime the explosive bolts. Better get clear!"))
diff --git a/code/modules/random_map/drop/supply.dm b/code/modules/random_map/drop/supply.dm
index 6402dc039c..255f030495 100644
--- a/code/modules/random_map/drop/supply.dm
+++ b/code/modules/random_map/drop/supply.dm
@@ -9,7 +9,7 @@
// UNLIKE THE DROP POD, this map deals ENTIRELY with strings and types.
// Drop type is a string representing a mode rather than an atom or path.
// supplied_drop_types is a list of types to spawn in the pod.
-/datum/random_map/droppod/supply/get_spawned_drop(var/turf/T)
+/datum/random_map/droppod/supply/get_spawned_drop(turf/T)
if(!drop_type) drop_type = pick(GLOB.supply_drop)
diff --git a/code/modules/random_map/mazes/maze.dm b/code/modules/random_map/mazes/maze.dm
index 6c658e199c..58725955c1 100644
--- a/code/modules/random_map/mazes/maze.dm
+++ b/code/modules/random_map/mazes/maze.dm
@@ -56,7 +56,7 @@
openlist.Cut()
closedlist.Cut()
-/datum/random_map/maze/proc/add_to_openlist(var/tx, var/ty, var/nx, var/ny)
+/datum/random_map/maze/proc/add_to_openlist(tx, ty, nx, ny)
if(tx < 1 || ty < 1 || tx > limit_x || ty > limit_y || !isnull(checked_coord_cache["[tx]-[ty]"]))
return 0
checked_coord_cache["[tx]-[ty]"] = 1
diff --git a/code/modules/random_map/mazes/maze_cell.dm b/code/modules/random_map/mazes/maze_cell.dm
index 0cd0b47fa6..2740b3ddbe 100644
--- a/code/modules/random_map/mazes/maze_cell.dm
+++ b/code/modules/random_map/mazes/maze_cell.dm
@@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(maze_cell_count, 0)
var/ox
var/oy
-/datum/maze_cell/New(var/nx,var/ny,var/nox,var/noy)
+/datum/maze_cell/New(nx,ny,nox,noy)
GLOB.maze_cell_count++
uid = GLOB.maze_cell_count
name = "cell #[uid]"
diff --git a/code/modules/random_map/noise/desert.dm b/code/modules/random_map/noise/desert.dm
index ccb768ce3a..a6819af33a 100644
--- a/code/modules/random_map/noise/desert.dm
+++ b/code/modules/random_map/noise/desert.dm
@@ -6,10 +6,10 @@
descriptor = "desert (replacement)"
target_turf_type = /turf/space
-/datum/random_map/noise/desert/get_map_char(var/value)
+/datum/random_map/noise/desert/get_map_char(value)
return "[pick(list(",",".","'","`"))]"
-/datum/random_map/noise/desert/get_appropriate_path(var/value)
+/datum/random_map/noise/desert/get_appropriate_path(value)
var/val = min(9,max(0,round((value/cell_range)*10)))
if(isnull(val)) val = 0
switch(val)
@@ -18,7 +18,7 @@
else
return /turf/simulated/floor/beach/sand/desert
-/datum/random_map/noise/desert/get_additional_spawns(var/value, var/turf/T)
+/datum/random_map/noise/desert/get_additional_spawns(value, turf/T)
var/val = min(9,max(0,round((value/cell_range)*10)))
if(isnull(val)) val = 0
switch(val)
diff --git a/code/modules/random_map/noise/magma.dm b/code/modules/random_map/noise/magma.dm
index 4f94b69687..1dd1017cfc 100644
--- a/code/modules/random_map/noise/magma.dm
+++ b/code/modules/random_map/noise/magma.dm
@@ -32,10 +32,10 @@
if(!count)
map[current_cell] = 177
-/datum/random_map/noise/volcanism/get_appropriate_path(var/value)
+/datum/random_map/noise/volcanism/get_appropriate_path(value)
return
-/datum/random_map/noise/volcanism/get_additional_spawns(var/value, var/turf/T)
+/datum/random_map/noise/volcanism/get_additional_spawns(value, turf/T)
if(value>=178)
if(istype(T,/turf/simulated/floor/asteroid))
T.ChangeTurf(/turf/simulated/floor/airless/lava)
diff --git a/code/modules/random_map/noise/noise.dm b/code/modules/random_map/noise/noise.dm
index 58a94761fd..ac575bfad8 100644
--- a/code/modules/random_map/noise/noise.dm
+++ b/code/modules/random_map/noise/noise.dm
@@ -48,12 +48,12 @@
// Begin recursion.
subdivide(1,1,1,(limit_y-1))
-/datum/random_map/noise/get_map_char(var/value)
+/datum/random_map/noise/get_map_char(value)
var/val = min(9,max(0,round((value/cell_range)*10)))
if(isnull(val)) val = 0
return "[val]"
-/datum/random_map/noise/proc/subdivide(var/iteration,var/x,var/y,var/input_size)
+/datum/random_map/noise/proc/subdivide(iteration,x,y,input_size)
var/isize = input_size
var/hsize = round(input_size/2)
diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm
index 4a4e77345c..b50c3dbfd5 100644
--- a/code/modules/random_map/noise/ore.dm
+++ b/code/modules/random_map/noise/ore.dm
@@ -36,7 +36,7 @@
else
return 1
-/datum/random_map/noise/ore/apply_to_turf(var/x,var/y)
+/datum/random_map/noise/ore/apply_to_turf(x,y)
var/tx = ((origin_x-1)+x)*chunk_size
var/ty = ((origin_y-1)+y)*chunk_size
@@ -111,7 +111,7 @@
T.resources[ORE_PAINITE] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
return
-/datum/random_map/noise/ore/get_map_char(var/value)
+/datum/random_map/noise/ore/get_map_char(value)
if(value < rare_val)
return "S"
else if(value < deep_val)
diff --git a/code/modules/random_map/noise/tundra.dm b/code/modules/random_map/noise/tundra.dm
index 6cb8114298..22dcdb2934 100644
--- a/code/modules/random_map/noise/tundra.dm
+++ b/code/modules/random_map/noise/tundra.dm
@@ -6,7 +6,7 @@
descriptor = "tundra (replacement)"
target_turf_type = /turf/space
-/datum/random_map/noise/tundra/get_map_char(var/value)
+/datum/random_map/noise/tundra/get_map_char(value)
var/val = min(9,max(0,round((value/cell_range)*10)))
if(isnull(val)) val = 0
switch(val)
@@ -31,7 +31,7 @@
if(9)
return "[pick(list("T","t"))]"
-/datum/random_map/noise/tundra/get_appropriate_path(var/value)
+/datum/random_map/noise/tundra/get_appropriate_path(value)
var/val = min(9,max(0,round((value/cell_range)*10)))
if(isnull(val)) val = 0
switch(val)
@@ -40,7 +40,7 @@
else
return /turf/simulated/floor/snow
-/datum/random_map/noise/tundra/get_additional_spawns(var/value, var/turf/T)
+/datum/random_map/noise/tundra/get_additional_spawns(value, turf/T)
var/val = min(9,max(0,round((value/cell_range)*10)))
if(isnull(val)) val = 0
switch(val)
diff --git a/code/modules/random_map/random_map.dm b/code/modules/random_map/random_map.dm
index 2860a0e700..dbc479e4e3 100644
--- a/code/modules/random_map/random_map.dm
+++ b/code/modules/random_map/random_map.dm
@@ -31,7 +31,7 @@
// Test to see if rand_seed() can be used reliably.
var/priority_process
-/datum/random_map/New(var/seed, var/tx, var/ty, var/tz, var/tlx, var/tly, var/do_not_apply, var/do_not_announce, var/admin_map)
+/datum/random_map/New(seed, tx, ty, tz, tlx, tly, do_not_apply, do_not_announce, admin_map)
if(!isnum(tz))
var/old_tz = tz
tz = GLOB.map_templates_loaded[tz]
@@ -78,14 +78,14 @@
else
admin_notice(span_danger("[capitalize(name)] failed to generate ([round(0.1*(world.timeofday-start_time),0.1)] seconds): could not produce sane map."), R_DEBUG)
-/datum/random_map/proc/get_map_cell(var/x,var/y)
+/datum/random_map/proc/get_map_cell(x,y)
if(!map)
set_map_size()
. = ((y-1)*limit_x)+x
if((. < 1) || (. > map.len))
return null
-/datum/random_map/proc/get_map_char(var/value)
+/datum/random_map/proc/get_map_char(value)
switch(value)
if(WALL_CHAR)
return "#"
@@ -153,7 +153,7 @@
/datum/random_map/proc/check_map_sanity()
return 1
-/datum/random_map/proc/set_origins(var/tx, var/ty, var/tz)
+/datum/random_map/proc/set_origins(tx, ty, tz)
origin_x = tx ? tx : 1
origin_y = ty ? ty : 1
origin_z = tz ? tz : 1
@@ -168,7 +168,7 @@
if(!priority_process) sleep(-1)
apply_to_turf(x,y)
-/datum/random_map/proc/apply_to_turf(var/x,var/y)
+/datum/random_map/proc/apply_to_turf(x,y)
var/current_cell = get_map_cell(x,y)
if(!current_cell)
return 0
@@ -184,21 +184,21 @@
/datum/random_map/proc/get_spawn_dir()
return 0
-/datum/random_map/proc/get_appropriate_path(var/value)
+/datum/random_map/proc/get_appropriate_path(value)
switch(value)
if(FLOOR_CHAR)
return floor_type
if(WALL_CHAR)
return wall_type
-/datum/random_map/proc/get_additional_spawns(var/value, var/turf/T)
+/datum/random_map/proc/get_additional_spawns(value, turf/T)
if(value == DOOR_CHAR)
new /obj/machinery/door/airlock(T)
/datum/random_map/proc/cleanup()
return
-/datum/random_map/proc/overlay_with(var/datum/random_map/target_map, var/tx, var/ty)
+/datum/random_map/proc/overlay_with(datum/random_map/target_map, tx, ty)
if(!map.len || !istype(target_map))
return
tx-- // Update origin so that x/y index
@@ -216,5 +216,5 @@
handle_post_overlay_on(target_map,tx,ty)
-/datum/random_map/proc/handle_post_overlay_on(var/datum/random_map/target_map, var/tx, var/ty)
+/datum/random_map/proc/handle_post_overlay_on(datum/random_map/target_map, tx, ty)
return
diff --git a/code/modules/reagents/Chemistry-Metabolism.dm b/code/modules/reagents/Chemistry-Metabolism.dm
index d979b5cc17..7ca6106c17 100644
--- a/code/modules/reagents/Chemistry-Metabolism.dm
+++ b/code/modules/reagents/Chemistry-Metabolism.dm
@@ -3,7 +3,7 @@
var/metabolism_speed = 1 // Multiplicative, 1 is full speed, 0.5 is half, etc.
var/mob/living/carbon/parent
-/datum/reagents/metabolism/New(var/max = 100, mob/living/carbon/parent_mob, var/met_class = null)
+/datum/reagents/metabolism/New(max = 100, mob/living/carbon/parent_mob, met_class = null)
..(max, parent_mob)
if(met_class)
diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm
index 5518907e50..0aa0bd7233 100644
--- a/code/modules/reagents/holder/holder.dm
+++ b/code/modules/reagents/holder/holder.dm
@@ -4,7 +4,7 @@
var/maximum_volume = 100
var/atom/my_atom = null
-/datum/reagents/New(var/max = 100, atom/A = null)
+/datum/reagents/New(max = 100, atom/A = null)
..()
maximum_volume = max
my_atom = A
@@ -109,7 +109,7 @@
/* Holder-to-chemical */
-/datum/reagents/proc/add_reagent(var/id, var/amount, var/data = null, var/safety = 0, var/was_from_belly, var/can_dialysis = TRUE)
+/datum/reagents/proc/add_reagent(id, amount, data = null, safety = 0, was_from_belly, can_dialysis = TRUE)
if(!isnum(amount) || amount <= 0)
return 0
@@ -160,7 +160,7 @@
del_reagent(R.id)
update_total()
-/datum/reagents/proc/remove_reagent(var/id, var/amount, var/safety = 0)
+/datum/reagents/proc/remove_reagent(id, amount, safety = 0)
if(!isnum(amount))
return 0
for(var/datum/reagent/current in reagent_list)
@@ -174,7 +174,7 @@
return 1
return 0
-/datum/reagents/proc/del_reagent(var/id)
+/datum/reagents/proc/del_reagent(id)
for(var/datum/reagent/current in reagent_list)
if (current.id == id)
reagent_list -= current
@@ -184,7 +184,7 @@
my_atom.on_reagent_change()
return 0
-/datum/reagents/proc/has_reagent(var/id, var/amount = 0)
+/datum/reagents/proc/has_reagent(id, amount = 0)
for(var/datum/reagent/current in reagent_list)
if(current.id == id)
if(current.volume >= amount)
@@ -193,7 +193,7 @@
return 0
return 0
-/datum/reagents/proc/has_any_reagent(var/list/check_reagents)
+/datum/reagents/proc/has_any_reagent(list/check_reagents)
for(var/datum/reagent/current in reagent_list)
if(current.id in check_reagents)
if(current.volume >= check_reagents[current.id])
@@ -202,7 +202,7 @@
return 0
return 0
-/datum/reagents/proc/has_all_reagents(var/list/check_reagents)
+/datum/reagents/proc/has_all_reagents(list/check_reagents)
//this only works if check_reagents has no duplicate entries... hopefully okay since it expects an associative list
var/missing = check_reagents.len
for(var/datum/reagent/current in reagent_list)
@@ -216,13 +216,13 @@
del_reagent(current.id)
return
-/datum/reagents/proc/get_reagent_amount(var/id)
+/datum/reagents/proc/get_reagent_amount(id)
for(var/datum/reagent/current in reagent_list)
if(current.id == id)
return current.volume
return 0
-/datum/reagents/proc/get_data(var/id)
+/datum/reagents/proc/get_data(id)
for(var/datum/reagent/current in reagent_list)
if(current.id == id)
return current.get_data()
@@ -236,7 +236,7 @@
/* Holder-to-holder and similar procs */
-/datum/reagents/proc/remove_any(var/amount = 1) // Removes up to [amount] of reagents from [src]. Returns actual amount removed.
+/datum/reagents/proc/remove_any(amount = 1) // Removes up to [amount] of reagents from [src]. Returns actual amount removed.
amount = min(amount, total_volume)
if(!amount)
@@ -252,7 +252,7 @@
handle_reactions()
return amount
-/datum/reagents/proc/trans_to_holder(var/datum/reagents/target, var/amount = 1, var/multiplier = 1, var/copy = 0, var/can_dialysis = TRUE) // Transfers [amount] reagents from [src] to [target], multiplying them by [multiplier]. Returns actual amount removed from [src] (not amount transferred to [target]).
+/datum/reagents/proc/trans_to_holder(datum/reagents/target, amount = 1, multiplier = 1, copy = 0, can_dialysis = TRUE) // Transfers [amount] reagents from [src] to [target], multiplying them by [multiplier]. Returns actual amount removed from [src] (not amount transferred to [target]).
if(!target || !istype(target))
return
@@ -286,7 +286,7 @@
//not directly injected into the contents. It first calls touch, then the appropriate trans_to_*() or splash_mob().
//If for some reason touch effects are bypassed (e.g. injecting stuff directly into a reagent container or person),
//call the appropriate trans_to_*() proc.
-/datum/reagents/proc/trans_to(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0, var/force_open_container = FALSE)
+/datum/reagents/proc/trans_to(atom/target, amount = 1, multiplier = 1, copy = 0, force_open_container = FALSE)
touch(target, amount * multiplier) //First, handle mere touch effects
if(ismob(target))
@@ -298,7 +298,7 @@
return 0
//Splashing reagents is messier than trans_to, the target's loc gets some of the reagents as well.
-/datum/reagents/proc/splash(var/atom/target, var/amount = 1, var/multiplier = 1, var/copy = 0, var/min_spill=0, var/max_spill=60)
+/datum/reagents/proc/splash(atom/target, amount = 1, multiplier = 1, copy = 0, min_spill=0, max_spill=60)
var/spill = 0
if(!isturf(target) && target.loc)
spill = amount*(rand(min_spill, max_spill)/100)
@@ -309,7 +309,7 @@
if(!trans_to(target, amount, multiplier, copy))
touch(target, amount)
-/datum/reagents/proc/trans_type_to(var/target, var/rtype, var/amount = 1)
+/datum/reagents/proc/trans_type_to(target, rtype, amount = 1)
if (!target)
return
@@ -337,7 +337,7 @@
else if (istype(target, /datum/reagents))
return F.trans_to_holder(target, amount)
-/datum/reagents/proc/trans_id_to(var/atom/target, var/id, var/amount = 1, var/force_open_container = FALSE)
+/datum/reagents/proc/trans_id_to(atom/target, id, amount = 1, force_open_container = FALSE)
if (!target || !target.reagents)
return
@@ -357,7 +357,7 @@
// This does not handle transferring reagents to things.
// For example, splashing someone with water will get them wet and extinguish them if they are on fire,
// even if they are wearing an impermeable suit that prevents the reagents from contacting the skin.
-/datum/reagents/proc/touch(var/atom/target, var/amount)
+/datum/reagents/proc/touch(atom/target, amount)
if(ismob(target))
touch_mob(target, amount)
if(isturf(target))
@@ -366,7 +366,7 @@
touch_obj(target, amount)
return
-/datum/reagents/proc/touch_mob(var/mob/target)
+/datum/reagents/proc/touch_mob(mob/target)
if(!target || !istype(target))
return
if(target.is_incorporeal()) // I really cannot imagine any scenario in which you would want reagent touch clouds to affect phased shadekin, so putting it here instead of higher up.
@@ -377,7 +377,7 @@
update_total()
-/datum/reagents/proc/touch_turf(var/turf/target, var/amount)
+/datum/reagents/proc/touch_turf(turf/target, amount)
if(!target || !istype(target))
return
@@ -386,7 +386,7 @@
update_total()
-/datum/reagents/proc/touch_obj(var/obj/target, var/amount)
+/datum/reagents/proc/touch_obj(obj/target, amount)
if(!target || !istype(target))
return
@@ -398,7 +398,7 @@
// Attempts to place a reagent on the mob's skin.
// Reagents are not guaranteed to transfer to the target.
// Do not call this directly, call trans_to() instead.
-/datum/reagents/proc/splash_mob(var/mob/target, var/amount = 1, var/copy = 0)
+/datum/reagents/proc/splash_mob(mob/target, amount = 1, copy = 0)
var/perm = 1
if(isliving(target)) //will we ever even need to tranfer reagents to non-living mobs?
var/mob/living/L = target
@@ -409,7 +409,7 @@
perm = L.reagent_permeability()
return trans_to_mob(target, amount, CHEM_TOUCH, perm, copy)
-/datum/reagents/proc/trans_to_mob(var/mob/target, var/amount = 1, var/type = CHEM_BLOOD, var/multiplier = 1, var/copy = 0, var/can_dialysis = TRUE) // Transfer after checking into which holder...
+/datum/reagents/proc/trans_to_mob(mob/target, amount = 1, type = CHEM_BLOOD, multiplier = 1, copy = 0, can_dialysis = TRUE) // Transfer after checking into which holder...
if(!target || !istype(target))
return
if(iscarbon(target))
@@ -433,7 +433,7 @@
. = trans_to_holder(R, amount, multiplier, copy, can_dialysis)
R.touch_mob(target)
-/datum/reagents/proc/trans_to_turf(var/turf/target, var/amount = 1, var/multiplier = 1, var/copy = 0) // Turfs don't have any reagents (at least, for now). Just touch it.
+/datum/reagents/proc/trans_to_turf(turf/target, amount = 1, multiplier = 1, copy = 0) // Turfs don't have any reagents (at least, for now). Just touch it.
if(!target)
return
@@ -442,7 +442,7 @@
R.touch_turf(target, amount)
return
-/datum/reagents/proc/trans_to_obj(var/obj/target, var/amount = 1, var/multiplier = 1, var/copy = 0) // Objects may or may not; if they do, it's probably a beaker or something and we need to transfer properly; otherwise, just touch.
+/datum/reagents/proc/trans_to_obj(obj/target, amount = 1, multiplier = 1, copy = 0) // Objects may or may not; if they do, it's probably a beaker or something and we need to transfer properly; otherwise, just touch.
if(!target)
return
@@ -456,13 +456,13 @@
/* Atom reagent creation - use it all the time */
-/atom/proc/create_reagents(var/max_vol, var/reagents_type = /datum/reagents)
+/atom/proc/create_reagents(max_vol, reagents_type = /datum/reagents)
if(!ispath(reagents_type))
reagents_type = /datum/reagents
reagents = new reagents_type(max_vol, src)
// Aurora Cooking Port
-/datum/reagents/proc/get_reagent(var/id) // Returns reference to reagent matching passed ID
+/datum/reagents/proc/get_reagent(id) // Returns reference to reagent matching passed ID
for(var/datum/reagent/A in reagent_list)
if (A.id == id)
return A
@@ -470,7 +470,7 @@
return null
//Spreads the contents of this reagent holder all over the vicinity of the target turf.
-/datum/reagents/proc/splash_area(var/turf/epicentre, var/range = 3, var/portion = 1.0, var/multiplier = 1, var/copy = 0)
+/datum/reagents/proc/splash_area(turf/epicentre, range = 3, portion = 1.0, multiplier = 1, copy = 0)
var/list/things = dview(range, epicentre, INVISIBILITY_LIGHTING)
var/list/turfs = list()
for (var/turf/T in things)
@@ -491,7 +491,7 @@
//Spreads the contents of this reagent holder all over the target turf, dividing among things in it.
//50% is divided between mobs, 20% between objects, and whatever is left on the turf itself
-/datum/reagents/proc/splash_turf(var/turf/T, var/amount = null, var/multiplier = 1, var/copy = 0)
+/datum/reagents/proc/splash_turf(turf/T, amount = null, multiplier = 1, copy = 0)
if (isnull(amount))
amount = total_volume
else
diff --git a/code/modules/reagents/holder/vorebelly.dm b/code/modules/reagents/holder/vorebelly.dm
index 78b8b68d7a..839a3ed4bc 100644
--- a/code/modules/reagents/holder/vorebelly.dm
+++ b/code/modules/reagents/holder/vorebelly.dm
@@ -1,4 +1,4 @@
-/datum/reagents/proc/vore_trans_to_mob(var/mob/target, var/amount = 1, var/type = CHEM_VORE, var/multiplier = 1, var/copy = 0, var/obj/belly/target_belly = null) // Transfer after checking into which holder...
+/datum/reagents/proc/vore_trans_to_mob(mob/target, amount = 1, type = CHEM_VORE, multiplier = 1, copy = 0, obj/belly/target_belly = null) // Transfer after checking into which holder...
if(!target || !istype(target))
return
@@ -19,7 +19,7 @@
. = trans_to_holder(R, amount, multiplier, copy)
R.touch_mob(target)
-/datum/reagents/proc/vore_trans_to_con(var/obj/item/reagent_containers/T, var/amount = 1, var/multiplier = 1, var/copy = 0) // Transfer after checking into which holder...
+/datum/reagents/proc/vore_trans_to_con(obj/item/reagent_containers/T, amount = 1, multiplier = 1, copy = 0) // Transfer after checking into which holder...
if(!T || !istype(T))
return
diff --git a/code/modules/reagents/machinery/alembic.dm b/code/modules/reagents/machinery/alembic.dm
index b5deab5cec..0e2fbe6e9d 100644
--- a/code/modules/reagents/machinery/alembic.dm
+++ b/code/modules/reagents/machinery/alembic.dm
@@ -31,7 +31,7 @@
icon_state = "alembic-bubble"
return
-/obj/machinery/alembic/attackby(var/obj/item/potion_material/O, var/mob/user)
+/obj/machinery/alembic/attackby(obj/item/potion_material/O, mob/user)
if(istype(O,/obj/item/potion_material))
if(potion_reagent != 0 )
to_chat(user, span_warning("There is already a reagent in the alembic!"))
diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm
index e3df1a3b77..309bab829a 100644
--- a/code/modules/reagents/machinery/chem_master.dm
+++ b/code/modules/reagents/machinery/chem_master.dm
@@ -44,7 +44,7 @@
/obj/machinery/chem_master/update_icon()
icon_state = "mixer[beaker ? "1" : "0"]"
-/obj/machinery/chem_master/attackby(var/obj/item/B as obj, var/mob/user as mob)
+/obj/machinery/chem_master/attackby(obj/item/B as obj, mob/user as mob)
if(istype(B, /obj/item/reagent_containers/glass) || istype(B, /obj/item/reagent_containers/food))
diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
index 4655dcdc89..b370ec3592 100644
--- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm
+++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm
@@ -244,7 +244,7 @@
return ..()
-/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/reagent_dispensers/fueltank/bullet_act(obj/item/projectile/Proj)
if(Proj.get_structure_damage())
if(istype(Proj.firer))
message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).")
@@ -500,7 +500,7 @@
reagents.add_reagent(REAGENT_ID_COOKINGOIL,5000)
AddElement(/datum/element/climbable)
-/obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/reagent_dispensers/cookingoil/bullet_act(obj/item/projectile/Proj)
if(Proj.get_structure_damage())
explode()
diff --git a/code/modules/reagents/machinery/distillery.dm b/code/modules/reagents/machinery/distillery.dm
index 35720d43f8..38f8dcde3c 100644
--- a/code/modules/reagents/machinery/distillery.dm
+++ b/code/modules/reagents/machinery/distillery.dm
@@ -246,7 +246,7 @@
update_icon()
-/obj/machinery/portable_atmospherics/powered/reagent_distillery/use_power(var/amount, var/chan = -1)
+/obj/machinery/portable_atmospherics/powered/reagent_distillery/use_power(amount, chan = -1)
last_power_draw = amount
if(use_cell && cell && cell.charge)
var/cellcharge = cell.charge
diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm
index 2e9d661871..df0334ce70 100644
--- a/code/modules/reagents/machinery/grinder.dm
+++ b/code/modules/reagents/machinery/grinder.dm
@@ -52,7 +52,7 @@
icon_state = "juicer"+num2text(!isnull(beaker))
return
-/obj/machinery/reagentgrinder/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/reagentgrinder/attackby(obj/item/O, mob/user)
if(beaker)
if(default_deconstruction_screwdriver(user, O))
return
diff --git a/code/modules/reagents/machinery/injector_maker.dm b/code/modules/reagents/machinery/injector_maker.dm
index eba5777bc0..c41b12f88b 100644
--- a/code/modules/reagents/machinery/injector_maker.dm
+++ b/code/modules/reagents/machinery/injector_maker.dm
@@ -52,7 +52,7 @@
return
-/obj/machinery/injector_maker/attackby(var/obj/item/O, var/mob/user)
+/obj/machinery/injector_maker/attackby(obj/item/O, mob/user)
if (istype(O, /obj/item/multitool))
return ..()
@@ -246,7 +246,7 @@
update_icon()
-/obj/machinery/injector_maker/proc/make_injector(var/size, var/amount, var/new_name, var/material, mob/user)
+/obj/machinery/injector_maker/proc/make_injector(size, amount, new_name, material, mob/user)
if(!beaker)
return
var/amount_per_injector = null
diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm
index 8968cc548d..a9faa3d7af 100644
--- a/code/modules/reagents/machinery/pump.dm
+++ b/code/modules/reagents/machinery/pump.dm
@@ -101,7 +101,7 @@
// Returns TRUE/FALSE on power state changing
// var/target = target power state
// var/message = TRUE/FALSE whether to make a message about state change
-/obj/machinery/pump/proc/set_state(var/target, var/message = TRUE)
+/obj/machinery/pump/proc/set_state(target, message = TRUE)
if(target == on)
return FALSE
@@ -181,12 +181,12 @@
/turf/proc/pump_reagents()
return
-/turf/simulated/floor/lava/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/lava/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_MINERALIZEDFLUID, round(volume / 2, 0.1))
-/turf/simulated/floor/water/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/water/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_WATER, round(volume, 0.1))
@@ -198,19 +198,19 @@
if(M.mineral && prob(40) && M.mineral.reagent) // v
R.add_reagent(M.mineral.reagent, round(volume / 5, 0.1)) // Was the turf's reagents variable not the R argument, and changed ore_reagent to M.mineral.reagent because of above change. Also nerfed amount to 1/5 instead of 1/2
-/turf/simulated/floor/water/pool/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/water/pool/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_CHLORINE, round(volume / 10, 0.1))
-/turf/simulated/floor/water/deep/pool/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/water/deep/pool/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_CHLORINE, round(volume / 10, 0.1))
-/turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/floor/water/contaminated/pump_reagents(datum/reagents/R, volume)
. = ..()
R.add_reagent(REAGENT_ID_VATSTABILIZER, round(volume / 2, 0.1))
-/turf/simulated/mineral/pump_reagents(var/datum/reagents/R, var/volume)
+/turf/simulated/mineral/pump_reagents(datum/reagents/R, volume)
. = ..()
if(density)
return
diff --git a/code/modules/reagents/reactions/_reactions.dm b/code/modules/reagents/reactions/_reactions.dm
index c2a196fec6..4d34401479 100644
--- a/code/modules/reagents/reactions/_reactions.dm
+++ b/code/modules/reagents/reactions/_reactions.dm
@@ -36,7 +36,7 @@
var/log_is_important = 0 // If this reaction should be considered important for logging. Important recipes message admins when mixed, non-important ones just log to file.
var/wiki_flag = 0
-/datum/decl/chemical_reaction/proc/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/proc/can_happen(datum/reagents/holder)
//check that all the required reagents are present
if(!holder.has_all_reagents(required_reagents))
return FALSE
@@ -51,7 +51,7 @@
return TRUE
-/datum/decl/chemical_reaction/proc/calc_reaction_progress(var/datum/reagents/holder, var/reaction_limit)
+/datum/decl/chemical_reaction/proc/calc_reaction_progress(datum/reagents/holder, reaction_limit)
var/progress = reaction_limit * reaction_rate //simple exponential progression
//calculate yield
@@ -79,7 +79,7 @@
return progress
-/datum/decl/chemical_reaction/process(var/datum/reagents/holder, var/belly_reagent)
+/datum/decl/chemical_reaction/process(datum/reagents/holder, belly_reagent)
//determine how far the reaction can proceed
var/list/reaction_limits = list()
for(var/reactant in required_reagents)
@@ -112,11 +112,11 @@
return reaction_progress
//called when a reaction processes
-/datum/decl/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/proc/on_reaction(datum/reagents/holder, created_volume)
return
//called after processing reactions, if they occurred
-/datum/decl/chemical_reaction/proc/post_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/proc/post_reaction(datum/reagents/holder)
var/atom/container = holder.my_atom
if(mix_message && container && !ismob(container))
var/turf/T = get_turf(container)
@@ -128,5 +128,5 @@
//obtains any special data that will be provided to the reaction products
//this is called just before reactants are removed.
-/datum/decl/chemical_reaction/proc/send_data(var/datum/reagents/holder, var/reaction_limit)
+/datum/decl/chemical_reaction/proc/send_data(datum/reagents/holder, reaction_limit)
return null
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index 196bcfdacb..f02ac4f6b6 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -32,7 +32,7 @@
var/minimum_xgm_pressure = null
var/consumes_xgm_gas = 0 // Mols of gas consumed during reaction
-/datum/decl/chemical_reaction/distilling/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/distilling/can_happen(datum/reagents/holder)
if(!istype(holder, /datum/reagents/distilling))
return FALSE
@@ -68,7 +68,7 @@
return ..()
-/datum/decl/chemical_reaction/distilling/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/distilling/on_reaction(datum/reagents/holder, created_volume)
// Handle gas consumption
var/datum/gas_mixture/GM = holder.my_atom.return_air()
if(consumes_xgm_gas != 0 && GM)
@@ -215,7 +215,7 @@
temp_range = list(T0C + 600, T0C + 700)
temp_shift = 4
-/datum/decl/chemical_reaction/distilling/berserkjuice/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/distilling/berserkjuice/on_reaction(datum/reagents/holder, created_volume)
..()
if(prob(1))
@@ -234,7 +234,7 @@
temp_range = list(T0C + 10, T20C + 15) //CHOMPedit: I know this doesn't make sense, and this is a baindaid fix but distiller code refuses to go this low, even with correct variables
temp_shift = 20
-/datum/decl/chemical_reaction/distilling/cryogel/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/distilling/cryogel/on_reaction(datum/reagents/holder, created_volume)
..()
if(prob(1))
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index 12561ab14e..844941121a 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -17,7 +17,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/tofu/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/tofu(location)
@@ -31,7 +31,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
@@ -45,7 +45,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/chocolatebar(location)
@@ -136,7 +136,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location)
@@ -150,7 +150,7 @@
catalysts = list(REAGENT_ID_ENZYME = 5)
result_amount = 3
-/datum/decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/meatball/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/meatball(location)
@@ -164,7 +164,7 @@
inhibitors = list(REAGENT_ID_WATER = 1, REAGENT_ID_BEER = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/dough(location)
@@ -177,7 +177,7 @@
required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 5)
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location)
@@ -224,7 +224,7 @@
required_reagents = list(REAGENT_ID_CREAM = 20, REAGENT_ID_SODIUMCHLORIDE = 1)
result_amount = 1
-/datum/decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/food/butter/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/spreads/butter(location)
diff --git a/code/modules/reagents/reactions/instant/food_ch.dm b/code/modules/reagents/reactions/instant/food_ch.dm
index 2ab167a5f8..7482ea1b40 100644
--- a/code/modules/reagents/reactions/instant/food_ch.dm
+++ b/code/modules/reagents/reactions/instant/food_ch.dm
@@ -8,7 +8,7 @@
required_reagents = list(REAGENT_ID_CHEESE = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_CLONEXADONE = 10,)
result_amount = 1
-/datum/decl/chemical_reaction/instant/cube/sagaru/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/cube/sagaru/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/monkeycube/sarucube(location)
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 75461a5008..cf1c8dec9d 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -582,7 +582,7 @@
result_amount = 1
var/sheet_to_give = /obj/item/stack/material/iron
-/datum/decl/chemical_reaction/instant/solidification/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/solidification/on_reaction(datum/reagents/holder, created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new sheet_to_give(get_turf(holder.my_atom), sheets)
@@ -652,7 +652,7 @@
required_reagents = list(REAGENT_ID_PACID = 1, REAGENT_ID_PLASTICIDE = 2)
result_amount = 1
-/datum/decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/plastication/on_reaction(datum/reagents/holder, created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new /obj/item/stack/material/plastic(get_turf(holder.my_atom), sheets)
@@ -664,7 +664,7 @@
required_reagents = list(REAGENT_ID_COOKINGOIL = 10, REAGENT_ID_LYE = 2)
result_amount = 1
-/datum/decl/chemical_reaction/instant/soapification/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/soapification/on_reaction(datum/reagents/holder, created_volume)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/soap(get_turf(holder.my_atom))
@@ -692,7 +692,7 @@
result_amount = 2
var/carpet_type = /obj/item/stack/tile/carpet
-/datum/decl/chemical_reaction/instant/carpetify/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/carpetify/on_reaction(datum/reagents/holder, created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new carpet_type(get_turf(holder.my_atom), sheets)
@@ -745,7 +745,7 @@
required_reagents = list(REAGENT_ID_CALCIUM = 2, REAGENT_ID_SILICATE = 2, REAGENT_ID_WATER = 2)
result_amount = 1
-/datum/decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/concrete/on_reaction(datum/reagents/holder, created_volume)
var/sheets = FLOOR(created_volume,1)
if(sheets)
new /obj/item/stack/material/concrete(get_turf(holder.my_atom), sheets)
@@ -760,7 +760,7 @@
result_amount = 2
mix_message = null
-/datum/decl/chemical_reaction/instant/explosion_potassium/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/explosion_potassium/on_reaction(datum/reagents/holder, created_volume)
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
if(isliving(holder.my_atom))
@@ -783,7 +783,7 @@
required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SULFUR = 1 )
result_amount = null
-/datum/decl/chemical_reaction/instant/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/flash_powder/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, location)
@@ -815,7 +815,7 @@
required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_IRON = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
result_amount = 2
-/datum/decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/emp_pulse/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
// 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
// 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
@@ -836,7 +836,7 @@
#ifndef UNIT_TESTS
// If it becomes possible to make this without exploding and clearing reagents, remove the UNIT_TESTS wrapper
-/datum/decl/chemical_reaction/instant/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/nitroglycerin/on_reaction(datum/reagents/holder, created_volume)
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round (created_volume/2, 1), holder.my_atom, 0, 0)
if(isliving(holder.my_atom))
@@ -859,7 +859,7 @@
required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_SACID = 1 )
result_amount = 1
-/datum/decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/napalm/on_reaction(datum/reagents/holder, created_volume)
var/turf/location = get_turf(holder.my_atom.loc)
for(var/turf/simulated/floor/target_tile in range(0,location))
target_tile.assume_gas(GAS_VOLATILE_FUEL, created_volume, 400+T0C)
@@ -874,7 +874,7 @@
required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1)
result_amount = 0.4
-/datum/decl/chemical_reaction/instant/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/chemsmoke/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
@@ -896,7 +896,7 @@
result_amount = 2
mix_message = "The solution violently bubbles!"
-/datum/decl/chemical_reaction/instant/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/foam/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
@@ -918,7 +918,7 @@
required_reagents = list(REAGENT_ID_ALUMINIUM = 3, REAGENT_ID_FOAMINGAGENT = 1, REAGENT_ID_PACID = 1)
result_amount = 5
-/datum/decl/chemical_reaction/instant/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/metalfoam/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
@@ -936,7 +936,7 @@
required_reagents = list(REAGENT_ID_IRON = 3, REAGENT_ID_FOAMINGAGENT = 1, REAGENT_ID_PACID = 1)
result_amount = 5
-/datum/decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/ironfoam/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
@@ -1036,7 +1036,7 @@
required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2)
result_amount = 5
-/datum/decl/chemical_reaction/instant/blood_paint/send_data(var/datum/reagents/T)
+/datum/decl/chemical_reaction/instant/blood_paint/send_data(datum/reagents/T)
var/t = T.get_data(REAGENT_ID_BLOOD)
if(t && t["blood_colour"])
return t["blood_colour"]
diff --git a/code/modules/reagents/reactions/instant/instant_ch.dm b/code/modules/reagents/reactions/instant/instant_ch.dm
index 40103301f7..8310885efc 100644
--- a/code/modules/reagents/reactions/instant/instant_ch.dm
+++ b/code/modules/reagents/reactions/instant/instant_ch.dm
@@ -132,7 +132,7 @@
result = null
required_reagents = list(REAGENT_ID_MONSTERTAMER = 5, REAGENT_ID_CLONEXADONE = 5)
-/datum/decl/chemical_reaction/instant/xenolazarus/on_reaction(var/datum/reagents/holder, var/created_volume) //literally all this does is mash the regenerate button
+/datum/decl/chemical_reaction/instant/xenolazarus/on_reaction(datum/reagents/holder, created_volume) //literally all this does is mash the regenerate button
if(ishuman(holder.my_atom))
var/mob/living/carbon/human/H = holder.my_atom
var/datum/component/xenochimera/comp = H.GetComponent(/datum/component/xenochimera)
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 10ba08a299..355c74c67b 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -39,7 +39,7 @@
result = null
required_reagents = list(REAGENT_ID_MICROCILLIN = 1, REAGENT_ID_MACROCILLIN = 1)
-/datum/decl/chemical_reaction/instant/dontcrossthebeams/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/decl/chemical_reaction/instant/dontcrossthebeams/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
playsound(location, 'sound/weapons/gauss_shoot.ogg', 50, 1)
var/datum/effect/effect/system/grav_pull/s = new /datum/effect/effect/system/grav_pull
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index 609526d2c5..6b8ea82cc3 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -194,7 +194,7 @@
required_reagents = list(REAGENT_ID_ADRANOL = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
-/datum/decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
@@ -215,7 +215,7 @@
required_reagents = list(REAGENT_ID_IMMUNOSUPRIZINE = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
-/datum/decl/chemical_reaction/instant/neuter_virus/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/neuter_virus/on_reaction(datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
@@ -228,7 +228,7 @@
required_reagents = list(REAGENT_ID_SPACEACILLIN = 1)
catalysts = list(REAGENT_ID_BLOOD = 1)
-/datum/decl/chemical_reaction/instant/falter_virus/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/falter_virus/on_reaction(datum/reagents/holder)
var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
if(B && B.data)
var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
diff --git a/code/modules/reagents/reagent_containers/_reagent_containers.dm b/code/modules/reagents/reagent_containers/_reagent_containers.dm
index 688470624d..2d21e1cce8 100644
--- a/code/modules/reagents/reagent_containers/_reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers/_reagent_containers.dm
@@ -42,7 +42,7 @@
return reagents.get_reagents()
return "No reagent holder"
-/obj/item/reagent_containers/proc/standard_dispenser_refill(var/mob/user, var/obj/structure/reagent_dispensers/target) // This goes into afterattack
+/obj/item/reagent_containers/proc/standard_dispenser_refill(mob/user, obj/structure/reagent_dispensers/target) // This goes into afterattack
if(!istype(target))
return 0
@@ -61,7 +61,7 @@
balloon_alert(user, "[trans] units transfered to \the [src]")
return 1
-/obj/item/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
+/obj/item/reagent_containers/proc/standard_splash_mob(mob/user, mob/target) // This goes into afterattack
if(!istype(target))
return
@@ -79,19 +79,19 @@
reagents.splash(target, reagents.total_volume)
return 1
-/obj/item/reagent_containers/proc/self_feed_message(var/mob/user)
+/obj/item/reagent_containers/proc/self_feed_message(mob/user)
balloon_alert(user, "you eat \the [src]")
-/obj/item/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target)
+/obj/item/reagent_containers/proc/other_feed_message_start(mob/user, mob/target)
balloon_alert_visible(user, "[user] is trying to feed [target] \the [src]!")
-/obj/item/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target)
+/obj/item/reagent_containers/proc/other_feed_message_finish(mob/user, mob/target)
balloon_alert_visible(user, "[user] has fed [target] \the [src]!")
-/obj/item/reagent_containers/proc/feed_sound(var/mob/user)
+/obj/item/reagent_containers/proc/feed_sound(mob/user)
return
-/obj/item/reagent_containers/proc/standard_feed_mob(var/mob/user, var/mob/target) // This goes into attack
+/obj/item/reagent_containers/proc/standard_feed_mob(mob/user, mob/target) // This goes into attack
if(!istype(target) || !target.can_feed())
return FALSE
@@ -134,7 +134,7 @@
feed_sound(user)
return TRUE
-/obj/item/reagent_containers/proc/standard_pour_into(var/mob/user, var/atom/target) // This goes into afterattack and yes, it's atom-level
+/obj/item/reagent_containers/proc/standard_pour_into(mob/user, atom/target) // This goes into afterattack and yes, it's atom-level
if(!target.is_open_container() || !target.reagents)
return 0
@@ -164,7 +164,7 @@
var/datum/reagent/blood/blood = reagents.get_reagent(REAGENT_ID_BLOOD)
EXTRAPOLATOR_ACT_ADD_DISEASES(., blood?.get_diseases())
-/obj/item/reagent_containers/proc/attempt_changeling_test(var/obj/item/W,var/mob/user)
+/obj/item/reagent_containers/proc/attempt_changeling_test(obj/item/W,mob/user)
if(is_open_container() && W.is_hot())
var/datum/reagent/blood/B = reagents.get_reagent("blood")
if(B)
diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm
index 94bb6ad8f0..66e6f0d6f0 100644
--- a/code/modules/reagents/reagent_containers/borghypo.dm
+++ b/code/modules/reagents/reagent_containers/borghypo.dm
@@ -56,7 +56,7 @@
reagent_ids = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
/// Performs a single reagent addition. Returns its success (or error) status at doing so.
-/obj/item/reagent_containers/borghypo/proc/try_add_reagent(var/datum/reagents/target_reagents, var/mob/user, var/reagent_id, var/amount)
+/obj/item/reagent_containers/borghypo/proc/try_add_reagent(datum/reagents/target_reagents, mob/user, reagent_id, amount)
var/reagent_volume = reagent_volumes[reagent_id]
if(!reagent_volume || reagent_volume < amount)
return BORGHYPO_STATUS_NOCHARGE
@@ -73,7 +73,7 @@
return BORGHYPO_STATUS_SUCCESS
/// Attempts to add one reagent or multiple reagents, depending on if this hypo is currently set to dispense a recipe, (see `is_dispensing_recipe`.) Returns its success (or error) status at doing so.
-/obj/item/reagent_containers/borghypo/proc/try_injection(var/datum/reagents/target_reagents, var/mob/user)
+/obj/item/reagent_containers/borghypo/proc/try_injection(datum/reagents/target_reagents, mob/user)
if(is_dispensing_recipe && selected_recipe_id)
// Add reagents with our selected ID
var/foundRecipe = saved_recipes[selected_recipe_id]
@@ -189,7 +189,7 @@
return
/* No longer necessary because we use TGUI for this now!
-/obj/item/reagent_containers/borghypo/Topic(var/href, var/list/href_list)
+/obj/item/reagent_containers/borghypo/Topic(href, list/href_list)
if(href_list["reagent"])
var/t = reagent_ids.Find(href_list["reagent"])
if(t)
@@ -400,7 +400,7 @@
/obj/item/reagent_containers/borghypo/service/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
return NONE
-/obj/item/reagent_containers/borghypo/service/afterattack(var/obj/target, var/mob/user, var/proximity)
+/obj/item/reagent_containers/borghypo/service/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index d67575befc..a1779f48b5 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -15,7 +15,7 @@
drop_sound = 'sound/items/drop/glass.ogg'
pickup_sound = 'sound/items/pickup/glass.ogg'
-/obj/item/reagent_containers/dropper/examine(var/mob/user)
+/obj/item/reagent_containers/dropper/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
if(reagents && reagents.reagent_list.len)
@@ -23,7 +23,7 @@
else
. += span_notice("It is empty.")
-/obj/item/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/proximity)
+/obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user, proximity)
if(!target.reagents || !proximity) return
if(reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 05aee11693..4d661763eb 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -40,7 +40,7 @@
base_name = name
base_desc = desc
-/obj/item/reagent_containers/glass/examine(var/mob/user)
+/obj/item/reagent_containers/glass/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
if(reagents && reagents.reagent_list.len)
@@ -77,12 +77,12 @@
return ITEM_INTERACT_FAILURE
-/obj/item/reagent_containers/glass/standard_feed_mob(var/mob/user, var/mob/target)
+/obj/item/reagent_containers/glass/standard_feed_mob(mob/user, mob/target)
if(user.a_intent == I_HURT)
return 1
return ..()
-/obj/item/reagent_containers/glass/self_feed_message(var/mob/user)
+/obj/item/reagent_containers/glass/self_feed_message(mob/user)
balloon_alert(user, "swallowed from \the [src]")
/obj/item/reagent_containers/glass/proc/attempt_snake_milking(mob/living/user, mob/living/target)
@@ -110,7 +110,7 @@
reagents.add_reagent(reagent, amount)
return ITEM_INTERACT_SUCCESS
-/obj/item/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/proximity)
+/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
if(!proximity || !is_open_container()) //Is the container open & are they next to whatever they're clicking?
return 1 //If not, do nothing.
for(var/type in GLOB.reagent_containers_can_be_placed_into[container_can_be_placed_into]) //Is it something it can be placed into?
@@ -305,7 +305,7 @@
drop_sound = 'sound/items/drop/helm.ogg'
pickup_sound = 'sound/items/pickup/helm.ogg'
-/obj/item/reagent_containers/glass/bucket/attackby(var/obj/item/D, mob/user as mob)
+/obj/item/reagent_containers/glass/bucket/attackby(obj/item/D, mob/user as mob)
if(isprox(D))
to_chat(user, "You add [D] to [src].")
qdel(D)
@@ -364,7 +364,7 @@
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
-/obj/item/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob)
+/obj/item/reagent_containers/glass/bucket/wood/attackby(obj/D, mob/user as mob)
if(isprox(D))
to_chat(user, "This wooden bucket doesn't play well with electronics.")
return
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index fc797e5020..8440253b10 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -415,7 +415,7 @@
//reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks.
reagents.add_reagent(REAGENT_ID_HYPERZINE,10)
-/obj/item/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
+/obj/item/reagent_containers/syringe/proc/dirty(mob/living/carbon/human/target, obj/item/organ/external/eo)
if(!ishuman(loc))
return //Avoid borg syringe problems.
LAZYINITLIST(targets)
@@ -452,7 +452,7 @@
if(!used)
START_PROCESSING(SSobj, src)
-/obj/item/reagent_containers/syringe/proc/infect_limb(var/obj/item/organ/external/eo)
+/obj/item/reagent_containers/syringe/proc/infect_limb(obj/item/organ/external/eo)
src = null
var/datum/weakref/limb_ref = WEAKREF(eo)
spawn(rand(5 MINUTES,10 MINUTES))
diff --git a/code/modules/reagents/reagents/_helpers.dm b/code/modules/reagents/reagents/_helpers.dm
index 43cf483363..7146a0e7aa 100644
--- a/code/modules/reagents/reagents/_helpers.dm
+++ b/code/modules/reagents/reagents/_helpers.dm
@@ -1,4 +1,4 @@
-/atom/movable/proc/can_be_injected_by(var/atom/injector)
+/atom/movable/proc/can_be_injected_by(atom/injector)
if(!Adjacent(get_turf(injector)))
return FALSE
if(!reagents)
@@ -16,11 +16,11 @@
istype(src, /obj/item/storage/fancy/cigarettes) || \
istype(src, /obj/item/clothing/mask/chewable) // CHOMPEdit
-/obj/can_be_injected_by(var/atom/injector)
+/obj/can_be_injected_by(atom/injector)
if(!..())
return FALSE
// Then check if this is a type of container that can be injected
return is_injectable_container()
-/mob/living/can_be_injected_by(var/atom/injector)
+/mob/living/can_be_injected_by(atom/injector)
return ..() && (can_inject(null, 0, BP_TORSO) || can_inject(null, 0, BP_GROIN))
diff --git a/code/modules/reagents/reagents/_reagents.dm b/code/modules/reagents/reagents/_reagents.dm
index 3e6808be9a..85d0363e7f 100644
--- a/code/modules/reagents/reagents/_reagents.dm
+++ b/code/modules/reagents/reagents/_reagents.dm
@@ -62,24 +62,24 @@
///This is for chemicals that don't have any special touch effects.
var/dermal_absorption = 0
-/datum/reagent/proc/remove_self(var/amount) // Shortcut
+/datum/reagent/proc/remove_self(amount) // Shortcut
if(holder)
holder.remove_reagent(id, amount)
// This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing.
-/datum/reagent/proc/touch_mob(var/mob/M, var/amount)
+/datum/reagent/proc/touch_mob(mob/M, amount)
SEND_SIGNAL(M, COMSIG_REAGENT_EXPOSE_MOB, src, amount)
return
-/datum/reagent/proc/touch_obj(var/obj/O, var/amount) // Acid melting, cleaner cleaning, etc
+/datum/reagent/proc/touch_obj(obj/O, amount) // Acid melting, cleaner cleaning, etc
SEND_SIGNAL(O, COMSIG_REAGENT_EXPOSE_OBJ, src, amount)
return
-/datum/reagent/proc/touch_turf(var/turf/T, var/amount) // Cleaner cleaning, lube lubbing, etc, all go here
+/datum/reagent/proc/touch_turf(turf/T, amount) // Cleaner cleaning, lube lubbing, etc, all go here
SEND_SIGNAL(T, COMSIG_REAGENT_EXPOSE_TURF, src, amount)
return
-/datum/reagent/proc/on_mob_life(var/mob/living/carbon/M, var/alien, var/datum/reagents/metabolism/location) // Currently, on_mob_life is called on carbons. Any interaction with non-carbon mobs (lube) will need to be done in touch_mob.
+/datum/reagent/proc/on_mob_life(mob/living/carbon/M, alien, datum/reagents/metabolism/location) // Currently, on_mob_life is called on carbons. Any interaction with non-carbon mobs (lube) will need to be done in touch_mob.
if(!istype(M))
return
if(!affects_dead && M.stat == DEAD && !M.has_modifier_of_type(/datum/modifier/bloodpump_corpse))
@@ -203,20 +203,20 @@
remove_self(removed)
return
-/datum/reagent/proc/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/proc/affect_blood(mob/living/carbon/M, alien, removed)
return
-/datum/reagent/proc/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/proc/affect_ingest(mob/living/carbon/M, alien, removed)
M.bloodstr.add_reagent(id, removed)
if(src.id == M.species.blood_reagents)
M.add_chemical_effect(CE_BLOODRESTORE, 8 * removed)
return
-/datum/reagent/proc/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/proc/affect_touch(mob/living/carbon/M, alien, removed)
M.bloodstr.add_reagent(id, removed * dermal_absorption)
return
-/datum/reagent/proc/overdose(var/mob/living/carbon/M, var/alien, var/removed) // Overdose effect.
+/datum/reagent/proc/overdose(mob/living/carbon/M, alien, removed) // Overdose effect.
if(alien == IS_DIONA)
return
if(ishuman(M))
@@ -227,12 +227,12 @@
// Overall, max damage is slightly less effective than hydrophoron, and 1/5 as effective as cyanide.
M.adjustToxLoss(min(removed * overdose_mod * round(3 + 3 * volume / overdose), 3.6))
-/datum/reagent/proc/initialize_data(var/newdata) // Called when the reagent is created.
+/datum/reagent/proc/initialize_data(newdata) // Called when the reagent is created.
if(!isnull(newdata))
data = newdata
return
-/datum/reagent/proc/mix_data(var/newdata, var/newamount) // You have a reagent with data, and new reagent with its own data get added, how do you deal with that?
+/datum/reagent/proc/mix_data(newdata, newamount) // You have a reagent with data, and new reagent with its own data get added, how do you deal with that?
return
/datum/reagent/proc/get_data() // Just in case you have a reagent that handles data differently.
diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm
index 7b1c7ce8bc..6f11548133 100644
--- a/code/modules/reagents/reagents/core.dm
+++ b/code/modules/reagents/reagents/core.dm
@@ -20,7 +20,7 @@
coolant_modifier = 0.25
-/datum/reagent/blood/initialize_data(var/newdata)
+/datum/reagent/blood/initialize_data(newdata)
..()
if(data && data["blood_colour"])
color = data["blood_colour"]
@@ -34,7 +34,7 @@
t["viruses"] = v.Copy()
return t
-/datum/reagent/blood/touch_turf(var/turf/simulated/T)
+/datum/reagent/blood/touch_turf(turf/simulated/T)
if(!istype(T) || volume < 3)
return
@@ -50,7 +50,7 @@
var/obj/effect/decal/cleanable/blood/B = blood_splatter(T, src, 1)
B.add_blooddna(null,null)
-/datum/reagent/blood/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/blood/affect_ingest(mob/living/carbon/M, alien, removed)
var/effective_dose = dose
if(issmall(M)) effective_dose *= 2
@@ -90,7 +90,7 @@
continue
D.try_infect(M)
-/datum/reagent/blood/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/blood/affect_touch(mob/living/carbon/M, alien, removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.isSynthetic())
@@ -155,7 +155,7 @@
data["viruses"] = preserve
-/datum/reagent/blood/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/blood/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME) //They don't have blood, so it seems weird that they would instantly 'process' the chemical like another species does.
affect_ingest(M, alien, removed)
return
@@ -178,7 +178,7 @@
M.inject_blood(src, volume * volume_mod)
remove_self(volume)
-/datum/reagent/blood/proc/changling_blood_test(var/datum/reagents/holder)
+/datum/reagent/blood/proc/changling_blood_test(datum/reagents/holder)
if(data["changeling"])
var/location = get_turf(holder.my_atom)
holder.my_atom.visible_message(span_danger("The blood in \the [holder.my_atom] screams and leaps out!"))
@@ -205,7 +205,7 @@
volume_mod = 2
coolant_modifier = 0.25
-/datum/reagent/blood/synthblood/initialize_data(var/newdata)
+/datum/reagent/blood/synthblood/initialize_data(newdata)
..()
if(data && !data["blood_type"])
data["blood_type"] = "O-"
@@ -234,7 +234,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/antibodies/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/antibodies/affect_blood(mob/living/carbon/M, alien, removed)
if(src.data)
M.antibodies |= src.data[REAGENT_ID_ANTIBODIES]
..()
@@ -258,7 +258,7 @@
industrial_use = REFINERYEXPORT_REASON_RAW
coolant_modifier = 1 // Water!
-/datum/reagent/water/touch_turf(var/turf/simulated/T)
+/datum/reagent/water/touch_turf(turf/simulated/T)
if(!istype(T))
return
@@ -286,7 +286,7 @@
T.apply_fire_protection() // CHOMPAdd - Apply fire protection so fires can actually be put out.
-/datum/reagent/water/touch_obj(var/obj/O, var/amount)
+/datum/reagent/water/touch_obj(obj/O, amount)
..()
if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
var/obj/item/reagent_containers/food/snacks/monkeycube/cube = O
@@ -298,7 +298,7 @@
else
O.water_act(amount / 5)
-/datum/reagent/water/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/water/touch_mob(mob/living/L, amount)
..()
if(istype(L))
// First, kill slimes.
@@ -324,19 +324,19 @@
H.visible_message(span_notice("[H]\'s [S.name] is put out."))
//YWedit start, readds promethean damage that was removed by vorestation.
-/datum/reagent/water/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/water/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME)
M.adjustToxLoss(6 * removed)
else
..()
-/datum/reagent/water/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/water/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME)
M.adjustToxLoss(6 * removed)
else
..()
-/datum/reagent/water/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/water/affect_touch(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME && prob(10))
M.visible_message(span_warning("[M]'s flesh sizzles where the water touches it!"), span_danger("Your flesh burns in the water!"))
..()
@@ -360,17 +360,17 @@
industrial_use = REFINERYEXPORT_REASON_RAW
coolant_modifier = 0.15
-/datum/reagent/fuel/touch_turf(var/turf/T, var/amount)
+/datum/reagent/fuel/touch_turf(turf/T, amount)
..()
new /obj/effect/decal/cleanable/liquid_fuel(T, amount, FALSE)
remove_self(amount)
return
-/datum/reagent/fuel/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/fuel/affect_blood(mob/living/carbon/M, alien, removed)
if(issmall(M)) removed *= 2
M.adjustToxLoss(4 * removed)
-/datum/reagent/fuel/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/fuel/touch_mob(mob/living/L, amount)
..()
if(istype(L))
L.adjust_fire_stacks(amount / 10) // Splashing people with welding fuel to make them easy to ignite!
diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm
index 6b0f2b05bf..3a14d62a35 100644
--- a/code/modules/reagents/reagents/dispenser.dm
+++ b/code/modules/reagents/reagents/dispenser.dm
@@ -23,7 +23,7 @@
industrial_use = REFINERYEXPORT_REASON_RAW
//VOREStation Edit
-/datum/reagent/calcium/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/calcium/affect_ingest(mob/living/carbon/M, alien, removed)
if(ishuman(M) && rand(1,10000) == 1)
var/mob/living/carbon/human/H = M
for(var/obj/item/organ/external/O in H.bad_external_organs)
@@ -47,7 +47,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/carbon/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/carbon/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(M.ingested && M.ingested.reagent_list.len > 1) // Need to have at least 2 reagents - cabon and something to remove
@@ -57,7 +57,7 @@
continue
M.ingested.remove_reagent(R.id, removed * effect)
-/datum/reagent/carbon/touch_turf(var/turf/T)
+/datum/reagent/carbon/touch_turf(turf/T)
..()
if(!istype(T, /turf/space))
var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, T)
@@ -79,10 +79,10 @@
industrial_use = REFINERYEXPORT_REASON_RAW
coolant_modifier = 0.15
-/datum/reagent/chlorine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/chlorine/affect_blood(mob/living/carbon/M, alien, removed)
M.take_organ_damage(1*REM, 0)
-/datum/reagent/chlorine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/chlorine/affect_touch(mob/living/carbon/M, alien, removed)
M.take_organ_damage(1*REM, 0)
/datum/reagent/copper
@@ -126,12 +126,12 @@
industrial_use = REFINERYEXPORT_REASON_FOOD
coolant_modifier = 1.15
-/datum/reagent/ethanol/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/ethanol/touch_mob(mob/living/L, amount)
..()
if(istype(L))
L.adjust_fire_stacks(amount / 15)
-/datum/reagent/ethanol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //This used to do just toxin. That's boring. Let's make this FUN.
+/datum/reagent/ethanol/affect_blood(mob/living/carbon/M, alien, removed) //This used to do just toxin. That's boring. Let's make this FUN.
if(issmall(M))
removed *= 2
@@ -170,7 +170,7 @@
if(halluci)
M.hallucination = max(M.hallucination, halluci*3)
-/datum/reagent/ethanol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/affect_ingest(mob/living/carbon/M, alien, removed)
var/ep_base_power = 60 //base nutrition gain for ethanol-processing synthetics, reduced by alcohol strength
var/ep_final_mod = 30 //final divisor on nutrition gain
if(issmall(M))
@@ -216,7 +216,7 @@
if(adj_temp < 0 && M.bodytemperature > targ_temp)
M.bodytemperature = min(targ_temp, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT))
-/datum/reagent/ethanol/touch_obj(var/obj/O)
+/datum/reagent/ethanol/touch_obj(obj/O)
..()
if(istype(O, /obj/item/paper))
var/obj/item/paper/paperaffected = O
@@ -234,7 +234,7 @@
to_chat(usr, span_notice("The solution dissolves the ink on the book."))
return
-/datum/reagent/ethanol/handle_addiction(var/mob/living/carbon/M, var/alien)
+/datum/reagent/ethanol/handle_addiction(mob/living/carbon/M, alien)
// A copy of the base with withdrawl, but with much less effects, such as vomiting.
var/current_addiction = M.get_addiction_to_reagent(id)
var/realistic_addiction = FALSE //DEFAULT set to FALSE. Toggle to TRUE for a more realistic addiction with potentially fatal side effects.
@@ -315,10 +315,10 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_RAW
-/datum/reagent/fluorine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/fluorine/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustToxLoss(removed)
-/datum/reagent/fluorine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/fluorine/affect_touch(mob/living/carbon/M, alien, removed)
M.adjustToxLoss(removed)
/datum/reagent/hydrogen
@@ -355,7 +355,7 @@
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
coolant_modifier = 0.15
-/datum/reagent/lithium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lithium/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
if(M.canmove && !M.restrained() && istype(M.loc, /turf/space))
step(M, pick(GLOB.cardinal))
@@ -373,7 +373,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/mercury/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/mercury/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
if(M.canmove && !M.restrained() && istype(M.loc, /turf/space))
step(M, pick(GLOB.cardinal))
@@ -405,7 +405,7 @@
industrial_use = REFINERYEXPORT_REASON_RAW
coolant_modifier = 0.25
-/datum/reagent/oxygen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/oxygen/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_VOX)
M.adjustToxLoss(removed * 3)
@@ -442,11 +442,11 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/radium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/radium/affect_blood(mob/living/carbon/M, alien, removed)
if(issmall(M)) removed *= 2
M.apply_effect(10 * removed, IRRADIATE, 0)
-/datum/reagent/radium/touch_turf(var/turf/T)
+/datum/reagent/radium/touch_turf(turf/T)
..()
if(volume >= 3)
if(!istype(T, /turf/space))
@@ -466,11 +466,11 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/radium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/radium/affect_blood(mob/living/carbon/M, alien, removed)
if(issmall(M)) removed *= 2
M.apply_effect(10 * removed, IRRADIATE, 0) // Radium may increase your chances to cure a disease
-/datum/reagent/radium/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/radium/affect_touch(mob/living/carbon/M, alien, removed)
if(issmall(M)) removed *= 2
M.apply_effect(10 * removed, IRRADIATE, 0) // Radium may increase your chances to cure a disease
@@ -491,13 +491,13 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/acid/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/acid/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_GREY) //ywedit
return
if(issmall(M)) removed *= 2
M.take_organ_damage(0, removed * power * 2)
-/datum/reagent/acid/affect_touch(var/mob/living/carbon/M, var/alien, var/removed) // This is the most interesting
+/datum/reagent/acid/affect_touch(mob/living/carbon/M, alien, removed) // This is the most interesting
if(alien == IS_GREY) //ywedit
return
if(ishuman(M) && !isbelly(M.loc)) //CHOMPEdit Start
@@ -571,7 +571,7 @@
else
M.take_organ_damage(0, removed * power * 0.1) // Balance. The damage is instant, so it's weaker. 10 units -> 5 damage, double for pacid. 120 units beaker could deal 60, but a) it's burn, which is not as dangerous, b) it's a one-use weapon, c) missing with it will splash it over the ground and d) clothes give some protection, so not everything will hit
-/datum/reagent/acid/touch_obj(var/obj/O, var/amount) //CHOMPEdit Start
+/datum/reagent/acid/touch_obj(obj/O, amount) //CHOMPEdit Start
if(istype(O, /obj/item) && O.loc)
if(isbelly(O.loc) || isbelly(O.loc.loc))
var/obj/belly/B = (isbelly(O.loc) ? O.loc : O.loc.loc)
@@ -594,7 +594,7 @@
qdel(O)
remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile
-/datum/reagent/acid/touch_mob(var/mob/living/L) //CHOMPAdd Start
+/datum/reagent/acid/touch_mob(mob/living/L) //CHOMPAdd Start
if(!isliving(L))
return
if(isbelly(L.loc))
@@ -653,7 +653,7 @@
industrial_use = REFINERYEXPORT_REASON_FOOD
coolant_modifier = -0.25
-/datum/reagent/sugar/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sugar/affect_blood(mob/living/carbon/M, alien, removed)
M.adjust_nutrition(removed * 3)
var/effective_dose = dose
diff --git a/code/modules/reagents/reagents/drugs.dm b/code/modules/reagents/reagents/drugs.dm
index 055981b9b1..c42e04ad7c 100644
--- a/code/modules/reagents/reagents/drugs.dm
+++ b/code/modules/reagents/reagents/drugs.dm
@@ -29,7 +29,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_ILLDRUG
-/datum/reagent/drugs/affect_blood(mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
@@ -65,7 +65,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED // bonus
industrial_use = REFINERYEXPORT_REASON_ILLDRUG
-/datum/reagent/drugs/bliss/affect_blood(mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/bliss/affect_blood(mob/living/carbon/M, alien, removed)
..()
var/drug_strength = 15
if(M.species.chem_strength_tox > 0)
@@ -81,7 +81,7 @@
M.emote(pick("twitch", "drool", "moan", "giggle"))
prob_proc = FALSE
-/datum/reagent/drugs/bliss/overdose(var/mob/living/M as mob)
+/datum/reagent/drugs/bliss/overdose(mob/living/M as mob)
if(prob_proc == TRUE && prob(20))
M.hallucination = max(M.hallucination, 5)
prob_proc = FALSE
@@ -111,7 +111,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED // bonus
industrial_use = REFINERYEXPORT_REASON_ILLDRUG
-/datum/reagent/drugs/ambrosia_extract/affect_blood(mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/ambrosia_extract/affect_blood(mob/living/carbon/M, alien, removed)
..()
var/drug_strength = 3
if(M.species.chem_strength_tox > 0) //Closer to 0 means they're more resistant to toxins. Higher than 1 means they're weaker to toxins.
@@ -145,7 +145,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED // bonus
industrial_use = REFINERYEXPORT_REASON_ILLDRUG
-/datum/reagent/drugs/psilocybin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/psilocybin/affect_blood(mob/living/carbon/M, alien, removed)
..()
var/threshold = 1
@@ -200,7 +200,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_ILLDRUG
-/datum/reagent/drugs/talum_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/talum_quem/affect_blood(mob/living/carbon/M, alien, removed)
..()
var/drug_strength = 29
@@ -228,7 +228,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_RECDRUG
-/datum/reagent/drugs/nicotine/handle_addiction(var/mob/living/carbon/M, var/alien)
+/datum/reagent/drugs/nicotine/handle_addiction(mob/living/carbon/M, alien)
// A copy of the base with withdrawl, but with much less effects, such as vomiting.
var/current_addiction = M.get_addiction_to_reagent(id)
// slow degrade
@@ -288,7 +288,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/drugs/citalopram/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/citalopram/affect_blood(mob/living/carbon/M, alien, removed)
..()
M.fear = max((M.fear - 3),0)
@@ -305,7 +305,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/drugs/paroxetine/affect_blood(mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/paroxetine/affect_blood(mob/living/carbon/M, alien, removed)
..()
M.fear = max((M.fear - 6),0)
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index 69523f8cc4..57462b9315 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -19,7 +19,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_FOOD
-/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount)
+/datum/reagent/nutriment/mix_data(list/newdata, newamount)
if(!islist(newdata) || !newdata.len)
return
@@ -43,7 +43,7 @@
if(data[taste]/totalFlavor < 0.1)
data -= taste
-/datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/affect_blood(mob/living/carbon/M, alien, removed)
if(!injectable && alien != IS_SLIME && alien != IS_CHIMERA && !M.isSynthetic()) //VOREStation Edit
M.adjustToxLoss(0.1 * removed)
return
@@ -54,7 +54,7 @@
//VOREStation Edits End
..()
-/datum/reagent/nutriment/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/affect_ingest(mob/living/carbon/M, alien, removed)
switch(alien)
if(IS_DIONA) return
if(IS_UNATHI) removed *= 0.5
@@ -89,7 +89,7 @@
var/coated_adj = "coated"
var/cooked_name = "coating"
-/datum/reagent/nutriment/coating/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/coating/affect_ingest(mob/living/carbon/M, alien, removed)
//We'll assume that the batter isnt going to be regurgitated and eaten by someone else. Only show this once
if(data["cooked"] != 1)
@@ -103,7 +103,7 @@
M.vomit()
..()
-/datum/reagent/nutriment/coating/initialize_data(var/newdata) // Called when the reagent is created.
+/datum/reagent/nutriment/coating/initialize_data(newdata) // Called when the reagent is created.
..()
if (!data)
data = list()
@@ -120,7 +120,7 @@
//Handles setting the temperature when oils are mixed
-/datum/reagent/nutriment/coating/mix_data(var/newdata, var/newamount)
+/datum/reagent/nutriment/coating/mix_data(newdata, newamount)
if (!data)
data = list()
@@ -148,7 +148,7 @@
coated_adj = "beer-battered"
allergen_type = ALLERGEN_GRAINS | ALLERGEN_EGGS //Made with flour(grain), eggs(eggs), and beer(grain)
-/datum/reagent/nutriment/coating/beerbatter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/coating/beerbatter/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.add_chemical_effect(CE_ALCOHOL, 0.02) //Very slightly alcoholic
@@ -178,7 +178,7 @@
touch_met = 1.5
var/lastburnmessage = 0
-/datum/reagent/nutriment/triglyceride/oil/touch_turf(var/turf/simulated/T)
+/datum/reagent/nutriment/triglyceride/oil/touch_turf(turf/simulated/T)
if(!istype(T))
return
@@ -195,13 +195,13 @@
if(volume >= 3)
T.wet_floor(2)
-/datum/reagent/nutriment/triglyceride/oil/initialize_data(var/newdata) // Called when the reagent is created.
+/datum/reagent/nutriment/triglyceride/oil/initialize_data(newdata) // Called when the reagent is created.
..()
if (!data)
data = list("temperature" = T20C)
//Handles setting the temperature when oils are mixed
-/datum/reagent/nutriment/triglyceride/oil/mix_data(var/newdata, var/newamount)
+/datum/reagent/nutriment/triglyceride/oil/mix_data(newdata, newamount)
if (!data)
data = list()
@@ -220,7 +220,7 @@
//Calculates a scaling factor for scalding damage, based on the temperature of the oil and creature's heat resistance
-/datum/reagent/nutriment/triglyceride/oil/proc/heatdamage(var/mob/living/carbon/M)
+/datum/reagent/nutriment/triglyceride/oil/proc/heatdamage(mob/living/carbon/M)
var/threshold = 360//Human heatdamage threshold
var/datum/species/S = M.get_species(1)
if (S && istype(S))
@@ -239,7 +239,7 @@
. /= step
. = min(., 2.5)//Cap multiplier at 2.5
-/datum/reagent/nutriment/triglyceride/oil/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/triglyceride/oil/affect_touch(mob/living/carbon/M, alien, removed)
var/dfactor = heatdamage(M)
if (dfactor)
M.take_organ_damage(0, removed * 1.5 * dfactor)
@@ -290,7 +290,7 @@
color = "#440000"
allergen_type = ALLERGEN_MEAT //"Animal protein" implies it comes from animals, therefore meat.
-/datum/reagent/nutriment/protein/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/protein/affect_ingest(mob/living/carbon/M, alien, removed)
switch(alien)
if(IS_TESHARI)
..(M, alien, removed*1.2) // Teshari get a bit more nutrition from meat.
@@ -363,7 +363,7 @@
color = "#FFFF00"
cup_prefix = REAGENT_ID_HONEY
-/datum/reagent/nutriment/honey/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/honey/affect_ingest(mob/living/carbon/M, alien, removed)
..()
var/effective_dose = dose
@@ -412,7 +412,7 @@
color = "#FFFFFF"
allergen_type = ALLERGEN_GRAINS //Flour is made from grain
-/datum/reagent/nutriment/flour/touch_turf(var/turf/simulated/T)
+/datum/reagent/nutriment/flour/touch_turf(turf/simulated/T)
..()
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/flour(T)
@@ -620,7 +620,7 @@
glass_name = "durian paste"
glass_desc = "Durian paste. It smells horrific."
-/datum/reagent/nutriment/durian/touch_mob(var/mob/M, var/amount)
+/datum/reagent/nutriment/durian/touch_mob(mob/M, amount)
..()
if(iscarbon(M) && !M.isSynthetic())
var/message = pick("Oh god, it smells disgusting here.", "What is that stench?", "That's an awful odor.")
@@ -630,7 +630,7 @@
L.vomit()
return ..()
-/datum/reagent/nutriment/durian/touch_turf(var/turf/T, var/amount)
+/datum/reagent/nutriment/durian/touch_turf(turf/T, amount)
..()
if(istype(T))
var/obj/effect/decal/cleanable/chemcoating/C = new /obj/effect/decal/cleanable/chemcoating(T)
@@ -677,7 +677,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DIET
-/datum/reagent/lipozine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lipozine/affect_blood(mob/living/carbon/M, alien, removed)
M.adjust_nutrition(-10 * removed)
/* Non-food stuff like condiments */
@@ -696,12 +696,12 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_FOOD
-/datum/reagent/sodiumchloride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sodiumchloride/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
M.adjustFireLoss(removed)
-/datum/reagent/sodiumchloride/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sodiumchloride/affect_ingest(mob/living/carbon/M, alien, removed)
var/pass_mod = rand(3,5)
var/passthrough = (removed - (removed/pass_mod)) //Some may be nullified during consumption, between one third and one fifth.
affect_blood(M, alien, passthrough)
@@ -791,7 +791,7 @@
industrial_use = REFINERYEXPORT_REASON_FOOD
coolant_modifier = 2.5
-/datum/reagent/frostoil/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/frostoil/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.bodytemperature = min(M.bodytemperature, max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 215))
@@ -799,7 +799,7 @@
M.emote("shiver")
holder.remove_reagent(REAGENT_ID_CAPSAICIN, 5)
-/datum/reagent/frostoil/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) // Eating frostoil now acts like capsaicin. Wee!
+/datum/reagent/frostoil/affect_ingest(mob/living/carbon/M, alien, removed) // Eating frostoil now acts like capsaicin. Wee!
if(alien == IS_DIONA)
return
if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much.
@@ -846,16 +846,16 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/capsaicin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/capsaicin/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.adjustToxLoss(0.5 * removed)
-/datum/reagent/capsaicin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/capsaicin/affect_ingest(mob/living/carbon/M, alien, removed)
// Do not call parent, we don't want this absorbed into our bloodstream!
handle_spicy(M, alien, removed)
-/datum/reagent/proc/handle_spicy(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/proc/handle_spicy(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(alien == IS_ALRAUNE) // VOREStation Edit: It wouldn't affect plants that much.
@@ -894,12 +894,12 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/condensedcapsaicin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/condensedcapsaicin/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.adjustToxLoss(0.5 * removed)
-/datum/reagent/condensedcapsaicin/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/condensedcapsaicin/affect_touch(mob/living/carbon/M, alien, removed)
var/eyes_covered = 0
var/mouth_covered = 0
@@ -1012,7 +1012,7 @@
to_chat(M, span_warning("The exposed flesh on your feet burns!"))
M.apply_effect(effective_strength / 2, AGONY, 0)
-/datum/reagent/condensedcapsaicin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/condensedcapsaicin/affect_ingest(mob/living/carbon/M, alien, removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!H.can_feel_pain())
@@ -1046,14 +1046,14 @@
industrial_use = REFINERYEXPORT_REASON_FOOD
coolant_modifier = 0.8
-/datum/reagent/drink/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/affect_blood(mob/living/carbon/M, alien, removed)
var/strength_mod = 1
if(alien == IS_SLIME && water_based)
strength_mod = 3
M.adjustToxLoss(removed * strength_mod) // Probably not a good idea; not very deadly though
return
-/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/affect_ingest(mob/living/carbon/M, alien, removed)
if(!(M.species.allergens & allergen_type) && !(M.species.medallergens & medallergen_type))
var/bonus = M.food_preference(allergen_type)
M.adjust_nutrition((nutrition + bonus) * removed)
@@ -1068,7 +1068,7 @@
if(M.species.organic_food_coeff) //CHOMPStation addition. If this is set to 0, they don't get nutrition from food.
M.nutrition += nutriment_factor * removed //CHOMPStation addition For hunger and fatness
-/datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired.
+/datum/reagent/drink/overdose(mob/living/carbon/M, alien) //Add special interactions here in the future if desired.
..()
// Juices
@@ -1121,7 +1121,7 @@
allergen_type = ALLERGEN_VEGETABLE //Carrots are vegetables
cup_prefix = "carrot"
-/datum/reagent/drink/juice/carrot/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/juice/carrot/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, removed * 0.2)
@@ -1149,7 +1149,7 @@
allergen_type = ALLERGEN_FRUIT //Grapes are fruit
cup_prefix = "grape"
-/datum/reagent/drink/juice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/juice/affect_ingest(mob/living/carbon/M, alien, removed)
..()
var/effective_dose = dose/2
@@ -1211,7 +1211,7 @@
allergen_type = ALLERGEN_FRUIT //Limes are fruit
cup_prefix = "lime"
-/datum/reagent/drink/juice/lime/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/juice/lime/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -1229,7 +1229,7 @@
allergen_type = ALLERGEN_FRUIT //Oranges are fruit
cup_prefix = "orange"
-/datum/reagent/drink/juice/orange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/juice/orange/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -1290,7 +1290,7 @@
glass_desc = "Are you sure this is tomato juice?"
allergen_type = ALLERGEN_FRUIT //Yes tomatoes are a fruit
-/datum/reagent/drink/juice/tomato/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/juice/tomato/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -1340,7 +1340,7 @@
glass_desc = "Deliciously fattening!"
allergen_type = ALLERGEN_CHOCOLATE
-/datum/reagent/drink/milk/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/milk/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -1423,7 +1423,7 @@
cup_desc = "Tasty black tea, it has antioxidants, it's good for you!"
allergen_type = ALLERGEN_STIMULANT //Black tea strong enough to have significant caffeine content
-/datum/reagent/drink/tea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/tea/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -1462,7 +1462,7 @@
cup_name = "iced tea"
cup_desc = "No relation to a certain rap artist/ actor."
-/datum/reagent/drink/tea/icetea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/tea/icetea/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(M.bodytemperature > T0C)
@@ -1471,7 +1471,7 @@
M.bodytemperature += 0.5
//M.adjustToxLoss(5 * removed) //VOREStation Removal
-/datum/reagent/drink/tea/icetea/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/tea/icetea/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(M.bodytemperature > T0C)
@@ -1667,7 +1667,7 @@
glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Apparently coffee contains coffee
-/datum/reagent/drink/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
..()
@@ -1678,7 +1678,7 @@
if(adj_temp > 0)
holder.remove_reagent(REAGENT_ID_FROSTOIL, 10 * removed)
-/datum/reagent/drink/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/affect_blood(mob/living/carbon/M, alien, removed)
..()
//if(alien == IS_TAJARA)
@@ -1686,7 +1686,7 @@
//M.make_jittery(4)
//return
-/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/drink/coffee/overdose(mob/living/carbon/M, alien)
if(alien == IS_DIONA)
return
//if(alien == IS_TAJARA)
@@ -1694,7 +1694,7 @@
//M.apply_effect(3, STUTTER) //VOREStation Edit end
M.make_jittery(5)
-/datum/reagent/drink/coffee/handle_addiction(var/mob/living/carbon/M, var/alien)
+/datum/reagent/drink/coffee/handle_addiction(mob/living/carbon/M, alien)
// A copy of the base with withdrawl, but with much less effects, no vomiting and sometimes halloss
var/current_addiction = M.get_addiction_to_reagent(id)
// slow degrade
@@ -1727,7 +1727,7 @@
glass_desc = "A drink to perk you up and refresh you!"
glass_special = list(DRINK_ICE)
-/datum/reagent/drink/coffee/icecoffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/icecoffee/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(M.bodytemperature > T0C)
@@ -1736,7 +1736,7 @@
M.bodytemperature += 0.5
//M.adjustToxLoss(5 * removed) //VOREStation Removal
-/datum/reagent/drink/coffee/icecoffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/icecoffee/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(M.bodytemperature > T0C)
@@ -1761,7 +1761,7 @@
cup_desc = "A nice and refreshing beverage while you are reading."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_BEANS //Soy(beans) and coffee
-/datum/reagent/drink/coffee/soy_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/soy_latte/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.heal_organ_damage(0.5 * removed, 0)
@@ -1781,7 +1781,7 @@
cup_desc = "A nice and refreshing beverage while you are reading."
allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY //Cream and coffee
-/datum/reagent/drink/coffee/cafe_latte/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/cafe_latte/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.heal_organ_damage(0.5 * removed, 0)
@@ -2152,7 +2152,7 @@
glass_desc = "Glorious brainfreezing mixture."
allergen_type = ALLERGEN_DAIRY //Made with dairy products
-/datum/reagent/drink/milkshake/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/milkshake/affect_ingest(mob/living/carbon/M, alien, removed)
..()
var/effective_dose = dose/2
@@ -2212,7 +2212,7 @@
glass_desc = "An energizing coffee milkshake, perfect for hot days at work.."
allergen_type = ALLERGEN_DAIRY|ALLERGEN_COFFEE //Made with coffee and dairy products
-/datum/reagent/drink/milkshake/coffeeshake/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/drink/milkshake/coffeeshake/overdose(mob/living/carbon/M, alien)
M.make_jittery(5)
/datum/reagent/drink/milkshake/peanutshake
@@ -2239,7 +2239,7 @@
glass_desc = "The secret of the sanctuary of the Libarian..."
allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made with space mountain wind (Fruit, caffeine)
-/datum/reagent/drink/rewriter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/rewriter/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.make_jittery(5)
@@ -2258,7 +2258,7 @@
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_STIMULANT
-/datum/reagent/drink/soda/nuka_cola/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/soda/nuka_cola/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.add_chemical_effect(CE_SPEEDBOOST, 1)
M.make_jittery(20)
@@ -2569,7 +2569,7 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from several fruit juices, and cream.
medallergen_type = MEDALLERGEN_TRICORD // this too!
-/datum/reagent/drink/doctor_delight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/doctor_delight/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -2609,7 +2609,7 @@
color = "#302000"
nutrition = 5
-/datum/reagent/drink/hell_ramen/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/hell_ramen/affect_ingest(mob/living/carbon/M, alien, removed)
..()
handle_spicy(M, alien, removed)
@@ -2637,7 +2637,7 @@
glass_desc = "Generally, you're supposed to put something else in there too..."
glass_icon = DRINK_ICON_NOISY
-/datum/reagent/drink/ice/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/ice/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(M.bodytemperature > T0C)
@@ -2646,7 +2646,7 @@
M.bodytemperature += rand(1,3)
//M.adjustToxLoss(5 * removed) //VOREStation Removal
-/datum/reagent/drink/ice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/ice/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(M.bodytemperature > T0C)
@@ -2766,13 +2766,13 @@
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_VEGETABLE //Made from oilslick, so has the same allergens.
-/datum/reagent/drink/nuclearwaste/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/nuclearwaste/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
M.bloodstr.add_reagent(REAGENT_ID_RADIUM, 0.3)
-/datum/reagent/drink/nuclearwaste/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/nuclearwaste/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -2793,7 +2793,7 @@
glass_special = list(DRINK_FIZZ)
allergen_type = ALLERGEN_VEGETABLE //Made from corn oil
-/datum/reagent/drink/sodaoil/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/sodaoil/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(M.bloodstr) // If, for some reason, they are injected, dilute them as well.
for(var/datum/reagent/R in M.ingested.reagent_list)
@@ -2802,7 +2802,7 @@
if(D.water_based)
M.adjustToxLoss(removed * -3)
-/datum/reagent/drink/sodaoil/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/sodaoil/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.ingested) // Find how many drinks are causing tox, and negate them.
for(var/datum/reagent/R in M.ingested.reagent_list)
@@ -2911,7 +2911,7 @@
overdose = REAGENTS_OVERDOSE *1.5
-/datum/reagent/drink/syrup/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/drink/syrup/overdose(mob/living/carbon/M, alien)
if(alien == IS_DIONA)
return
M.make_dizzy(1)
@@ -3127,7 +3127,7 @@
allergen_type = ALLERGEN_GRAINS //Made from grains
-/datum/reagent/ethanol/beer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/beer/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
if(alien == IS_DIONA)
@@ -3189,7 +3189,7 @@
glass_name = "rum"
glass_desc = "Now you want to Pray for a pirate suit, don't you?"
-/datum/reagent/ethanol/deadrum/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/deadrum/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -3227,7 +3227,7 @@
overdose = REAGENTS_OVERDOSE *1.5
allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Contains coffee or is made from coffee
-/datum/reagent/ethanol/coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/coffee/affect_ingest(mob/living/carbon/M, alien, removed)
if(!(M.isSynthetic()))
if(alien == IS_DIONA)
return
@@ -3242,13 +3242,13 @@
//M.adjustToxLoss(0.5 * removed)
//M.make_jittery(4) //extra sensitive to caffine
-/datum/reagent/ethanol/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/coffee/affect_blood(mob/living/carbon/M, alien, removed)
//if(alien == IS_TAJARA)
//M.adjustToxLoss(2 * removed)
//M.make_jittery(4)
//return
-/datum/reagent/ethanol/coffee/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/ethanol/coffee/overdose(mob/living/carbon/M, alien)
if(alien == IS_DIONA)
return
//if(alien == IS_TAJARA)
@@ -3357,7 +3357,7 @@
glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass."
allergen_type = ALLERGEN_STIMULANT //Holy shit dude.
-/datum/reagent/ethanol/thirteenloko/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/thirteenloko/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(!(M.isSynthetic()))
@@ -3394,7 +3394,7 @@
allergen_type = ALLERGEN_GRAINS //Vodka is made from grains
-/datum/reagent/ethanol/vodka/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/vodka/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(!(M.isSynthetic()))
M.apply_effect(max(M.radiation - 1 * removed, 0), IRRADIATE, check_protection = 0)
@@ -3464,7 +3464,7 @@
glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit
-/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/pwine/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(!(M.isSynthetic()))
@@ -3678,7 +3678,7 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from whiskey(grains), and limejuice(fruit)
-/datum/reagent/ethanol/beepsky_smash/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/beepsky_smash/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -4107,7 +4107,7 @@
allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from gargle blaster which is made from vodka(grains), gin(fruit), whiskey(grains), cognac(fruit), and lime juice(fruit)
-/datum/reagent/ethanol/neurotoxin/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/neurotoxin/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -4378,7 +4378,7 @@
glass_name = "unathi liquor"
glass_desc = "This barely qualifies as a drink, and may cause euphoria and numbness. Imbiber beware!"
-/datum/reagent/ethanol/unathiliquor/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/unathiliquor/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -4616,7 +4616,7 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from manhattan(whiskey(grains), vermouth(fruit))
-/datum/reagent/ethanol/soemmerfire/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/soemmerfire/affect_ingest(mob/living/carbon/M, alien, removed)
..()
handle_spicy(M, alien, removed)
@@ -4685,7 +4685,7 @@
glass_desc = "Not recommended if you enjoy having organs."
coolant_modifier = 1.25
-/datum/reagent/ethanol/voxdelight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/voxdelight/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -4759,7 +4759,7 @@
allergen_type = ALLERGEN_GRAINS //Made from vodka(grains)
-/datum/reagent/ethanol/slimeshot/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/slimeshot/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -4924,7 +4924,7 @@
allergen_type = ALLERGEN_GRAINS //Made from vodka(grain)
-/datum/reagent/ethanol/godka/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/godka/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(!(M.isSynthetic()))
@@ -5089,7 +5089,7 @@
allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from antifreeze(vodka(grains),cream(dairy)), gargleblaster(vodka(grains),gin(fruit),whiskey(grains),cognac(fruit),lime juice(fruit)), and syndicate bomb(beer(grain),whiskeycola(whiskey(grain)))
-/datum/reagent/ethanol/deathbell/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/deathbell/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -5109,7 +5109,7 @@
color = "#d169b2"
coolant_modifier = 3 // HOOH!
-/datum/reagent/nutriment/magicdust/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/magicdust/affect_ingest(mob/living/carbon/M, alien, removed)
..()
playsound(M, 'sound/items/hooh.ogg', 50, 1, -1)
if(prob(5))
diff --git a/code/modules/reagents/reagents/food_drinks_vr.dm b/code/modules/reagents/reagents/food_drinks_vr.dm
index 9cc78c388a..5d37556ff6 100644
--- a/code/modules/reagents/reagents/food_drinks_vr.dm
+++ b/code/modules/reagents/reagents/food_drinks_vr.dm
@@ -33,7 +33,7 @@
color = "#fff200"
wiki_flag = WIKI_DRINK
-/datum/reagent/lipozine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lipozine/affect_blood(mob/living/carbon/M, alien, removed)
M.adjust_nutrition(-20 * removed)
/datum/reagent/ethanol/burnout
@@ -50,7 +50,7 @@
glass_name = REAGENT_BURNOUT
glass_desc = "A swirling brew of fluids that leaves even the glass itself hot to the touch."
-/datum/reagent/ethanol/burnout/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/burnout/affect_ingest(mob/living/carbon/M, alien, removed)
..()
// Deathbell effects.
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -85,7 +85,7 @@
glass_name = REAGENT_MONSTERTAMER
glass_desc = "This looks like a vaguely-alcoholic slurry of meat. Gross."
-/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/monstertamer/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(!(M.isSynthetic()))
@@ -113,7 +113,7 @@
to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return."))
log_and_message_admins("is no longer feral.", H)
-/datum/reagent/ethanol/monstertamer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/monstertamer/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(M.species.organic_food_coeff)
if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
@@ -188,11 +188,11 @@
glass_name = REAGENT_GALACTICPANIC
glass_desc = "Looking into this is like staring at the stars."
-/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/galacticpanic/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.Stun(2)
-/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/galacticpanic/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -285,7 +285,7 @@
glass_name = REAGENT_RUSSIANROULETTE
glass_desc = "A favorite drink amongst the Pan-Slavic speaking community."
-/datum/reagent/ethanol/russianroulette/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/russianroulette/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
@@ -448,7 +448,7 @@
glass_name = REAGENT_HAIROFTHERAT
glass_desc = "The alcoholic equivalent of saying your burger isn't cooked rare enough."
-/datum/reagent/ethanol/hairoftherat/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/hairoftherat/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(!(M.isSynthetic()))
@@ -476,7 +476,7 @@
to_chat(H, span_info("Your mind starts to clear, soothed into a state of clarity as your senses return."))
log_and_message_admins("is no longer feral.", H)
-/datum/reagent/ethanol/hairoftherat/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/hairoftherat/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(M.species.organic_food_coeff)
if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein
@@ -549,7 +549,7 @@
color = "#caa3c9"
wiki_flag = WIKI_FOOD|WIKI_SPOILER
-/datum/reagent/nutriment/protein/brainzsnax/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nutriment/protein/brainzsnax/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(prob(5) && !(alien == IS_CHIMERA || alien == IS_SLIME || alien == IS_PLANT || alien == IS_DIONA || alien == IS_SHADEKIN && !M.isSynthetic()))
M.adjustBrainLoss(removed) //Any other species risks prion disease.
@@ -814,7 +814,7 @@
color = "#f4fc03"
taste_description = "seeing beyond the margins of this world"
-/datum/reagent/drink/coffee/nukie/mega/sight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/sight/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(prob(1))
if(ishuman(M))
@@ -833,7 +833,7 @@
color = "#fc03e7"
taste_description = "the end is rapidly approaching, yet remains forever far"
-/datum/reagent/drink/coffee/nukie/mega/heart/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/heart/affect_ingest(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -857,7 +857,7 @@
adj_sleepy = 0
var/adj_tiredness = 5
-/datum/reagent/drink/coffee/nukie/mega/nega/affect_ingest(var/mob/living/carbon/human/M)
+/datum/reagent/drink/coffee/nukie/mega/nega/affect_ingest(mob/living/carbon/human/M)
if(M.tiredness < 105)
M.tiredness = (M.tiredness + adj_tiredness)
..()
@@ -868,7 +868,7 @@
color = "#ede500"
taste_description = "a thousand volts running down your spine"
-/datum/reagent/drink/coffee/nukie/mega/shock/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/shock/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -889,7 +889,7 @@
color = "#000000"
taste_description = "more, more, now, quick, get yourself some more, don't stop"
-/datum/reagent/drink/coffee/nukie/mega/fast/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/fast/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(prob(1))
M.visible_message(span_danger("\The [M] sizzles!"))
@@ -902,7 +902,7 @@
color = "#fafafa"
taste_description = "moreishness, you could really go for a proper snack right now"
-/datum/reagent/drink/coffee/nukie/mega/high/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/high/affect_ingest(mob/living/carbon/M, alien, removed)
..()
var/threshold = 1
if(M.species.chem_strength_tox > 0) //Closer to 0 means they're more resistant to toxins. Higher than 1 means they're weaker to toxins.
@@ -945,7 +945,7 @@
color = "#15ff00"
taste_description = "a plastic bag floating gently on the breeze"
-/datum/reagent/drink/coffee/nukie/mega/shrink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/shrink/affect_ingest(mob/living/carbon/M, alien, removed)
..()
var/new_size = clamp((M.size_multiplier - 0.01), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS)
M.resize(new_size, uncapped = M.has_large_resize_bounds(), aura_animation = FALSE)
@@ -956,7 +956,7 @@
color = "#90ed87"
taste_description = "absurd hugeness"
-/datum/reagent/drink/coffee/nukie/mega/grow/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/grow/affect_ingest(mob/living/carbon/M, alien, removed)
..()
var/new_size = clamp((M.size_multiplier + 0.01), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS)
M.resize(new_size, uncapped = M.has_large_resize_bounds(), aura_animation = FALSE)
@@ -972,13 +972,13 @@
adj_drowsy = -50
adj_sleepy = -100
-/datum/reagent/drink/coffee/nukie/mega/one/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/one/affect_ingest(mob/living/carbon/M, alien, removed)
..()
M.add_chemical_effect(CE_DARKSIGHT, 1)
M.add_chemical_effect(CE_SPEEDBOOST, 1)
M.heal_organ_damage(1.5 * removed, 1.5 * removed)
-/datum/reagent/drink/coffee/nukie/mega/one/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/coffee/nukie/mega/one/overdose(mob/living/carbon/M, alien, removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.eye_blurry += 20
diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm
index e70939387d..9d653d9d82 100644
--- a/code/modules/reagents/reagents/medicine.dm
+++ b/code/modules/reagents/reagents/medicine.dm
@@ -14,7 +14,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/inaprovaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.add_chemical_effect(CE_STABLE, 15)
M.add_chemical_effect(CE_PAINKILLER, 10 * M.species.chem_strength_pain)
@@ -35,12 +35,12 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/inaprovaline/topical/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/topical/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
..()
M.adjustToxLoss(2 * removed)
-/datum/reagent/inaprovaline/topical/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/inaprovaline/topical/affect_touch(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.add_chemical_effect(CE_STABLE, 20)
M.add_chemical_effect(CE_PAINKILLER, 12 * M.species.chem_strength_pain)
@@ -61,14 +61,14 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
medallergen_type = MEDALLERGEN_BICARD
-/datum/reagent/bicaridine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/bicaridine/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
if(alien != IS_DIONA)
M.heal_organ_damage(4 * removed * chem_effective, 0)
-/datum/reagent/bicaridine/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/bicaridine/overdose(mob/living/carbon/M, alien, removed)
..()
var/wound_heal = 2.5 * removed
M.eye_blurry = min(M.eye_blurry + wound_heal, 250)
@@ -101,7 +101,7 @@
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
medallergen_type = MEDALLERGEN_BICARD
-/datum/reagent/bicaridine/topical/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/bicaridine/topical/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -109,7 +109,7 @@
..(M, alien, removed * chem_effective)
M.adjustToxLoss(2 * removed)
-/datum/reagent/bicaridine/topical/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/bicaridine/topical/affect_touch(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -130,11 +130,11 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/calciumcarbonate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) // Why would you inject this.
+/datum/reagent/calciumcarbonate/affect_blood(mob/living/carbon/M, alien, removed) // Why would you inject this.
if(alien != IS_DIONA)
M.adjustToxLoss(3 * removed)
-/datum/reagent/calciumcarbonate/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/calciumcarbonate/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.add_chemical_effect(CE_ANTACID, 3)
@@ -152,7 +152,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
medallergen_type = MEDALLERGEN_KELOTANE
-/datum/reagent/kelotane/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/kelotane/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.5
@@ -176,7 +176,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
medallergen_type = MEDALLERGEN_KELOTANE
-/datum/reagent/dermaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dermaline/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -199,7 +199,7 @@
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
medallergen_type = MEDALLERGEN_KELOTANE
-/datum/reagent/dermaline/topical/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dermaline/topical/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -207,7 +207,7 @@
..(M, alien, removed * chem_effective)
M.adjustToxLoss(2 * removed)
-/datum/reagent/dermaline/topical/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dermaline/topical/affect_touch(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -227,7 +227,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
medallergen_type = MEDALLERGEN_DYLO
-/datum/reagent/dylovene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dylovene/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.66
@@ -253,7 +253,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/carthatoline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/carthatoline/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(M.getToxLoss() && prob(10))
@@ -272,7 +272,7 @@
if(alien == IS_SLIME)
H.druggy = max(M.druggy, 5)
-/datum/reagent/carthatoline/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/carthatoline/overdose(mob/living/carbon/M, alien, removed)
M.adjustHalLoss(2)
var/mob/living/carbon/human/H = M
var/obj/item/organ/internal/stomach/st = H.internal_organs_by_name[O_STOMACH]
@@ -292,7 +292,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dexalin/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_VOX)
M.adjustToxLoss(removed * 24)
else if(alien == IS_SLIME && dose >= 15)
@@ -320,7 +320,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/dexalinp/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dexalinp/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_VOX)
M.adjustToxLoss(removed * 9)
else if(alien == IS_SLIME && dose >= 10)
@@ -348,12 +348,12 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
medallergen_type = MEDALLERGEN_TRICORD
-/datum/reagent/tricordrazine/overdose(var/mob/living/carbon/M, var/alien) //YW EDIT START
+/datum/reagent/tricordrazine/overdose(mob/living/carbon/M, alien) //YW EDIT START
..()
M.druggy = max(M.druggy, 5)
M.Confuse(5) //YW EDIT END
-/datum/reagent/tricordrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/tricordrazine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -362,7 +362,7 @@
M.heal_organ_damage(1.5 * removed, 1.5 * removed * chem_effective)
M.adjustToxLoss(-1.5 * removed * chem_effective)
-/datum/reagent/tricordrazine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/tricordrazine/affect_touch(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
affect_blood(M, alien, removed * 0.4)
@@ -379,7 +379,7 @@
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
medallergen_type = MEDALLERGEN_TRICORD
-/datum/reagent/tricorlidaze/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/tricorlidaze/affect_touch(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -388,11 +388,11 @@
M.heal_organ_damage(1 * removed, 1 * removed * chem_effective)
M.adjustToxLoss(-2 * removed * chem_effective)
-/datum/reagent/tricorlidaze/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/tricorlidaze/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.adjustToxLoss(3 * removed)
-/datum/reagent/tricorlidaze/touch_obj(var/obj/O)
+/datum/reagent/tricorlidaze/touch_obj(obj/O)
..()
if(istype(O, /obj/item/stack/medical/bruise_pack) && round(volume) >= 5)
var/obj/item/stack/medical/bruise_pack/C = O
@@ -419,7 +419,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/cryoxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/cryoxadone/affect_blood(mob/living/carbon/M, alien, removed)
if(M.bodytemperature < 170)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -447,7 +447,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/clonexadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/clonexadone/affect_blood(mob/living/carbon/M, alien, removed)
if(M.bodytemperature < 170)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -477,10 +477,10 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/mortiferin/on_mob_life(var/mob/living/carbon/M, var/alien, var/datum/reagents/metabolism/location)
+/datum/reagent/mortiferin/on_mob_life(mob/living/carbon/M, alien, datum/reagents/metabolism/location)
. = ..(M, alien, location)
-/datum/reagent/mortiferin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/mortiferin/affect_blood(mob/living/carbon/M, alien, removed)
if(M.bodytemperature < (T0C - 10) || (M.stat == DEAD))
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -519,7 +519,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/necroxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/necroxadone/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(M.bodytemperature < 170 || (M.stat == DEAD && M.has_modifier_of_type(/datum/modifier/bloodpump_corpse)))
if(alien == IS_SLIME)
@@ -558,13 +558,13 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/paracetamol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/paracetamol/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_pain
if(alien == IS_SLIME)
chem_effective = 0.75
M.add_chemical_effect(CE_PAINKILLER, 25 * chem_effective)
-/datum/reagent/paracetamol/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/paracetamol/overdose(mob/living/carbon/M, alien)
..()
if(alien == IS_SLIME)
M.add_chemical_effect(CE_SLOWDOWN, 1)
@@ -586,14 +586,14 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/tramadol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/tramadol/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_pain
if(alien == IS_SLIME)
chem_effective = 0.8
M.add_chemical_effect(CE_SLOWDOWN, 1)
M.add_chemical_effect(CE_PAINKILLER, 80 * chem_effective)
-/datum/reagent/tramadol/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/tramadol/overdose(mob/living/carbon/M, alien)
..()
M.hallucination = max(M.hallucination, 2)
@@ -613,7 +613,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/oxycodone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/oxycodone/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_pain
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -623,7 +623,7 @@
M.add_chemical_effect(CE_NARCOTICS, 1)
M.eye_blurry = min(M.eye_blurry + 10, 250 * chem_effective)
-/datum/reagent/oxycodone/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/oxycodone/overdose(mob/living/carbon/M, alien)
..()
M.druggy = max(M.druggy, 10)
M.hallucination = max(M.hallucination, 3)
@@ -645,7 +645,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/synaptizine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/synaptizine/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_DIONA)
return
@@ -678,7 +678,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_COMSTIM
-/datum/reagent/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/hyperzine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_TAJARA)
removed *= 1.25
if(alien == IS_SLIME)
@@ -690,7 +690,7 @@
M.emote(pick("twitch", "blink_r", "shiver"))
M.add_chemical_effect(CE_SPEEDBOOST, 1)
-/datum/reagent/hyperzine/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/hyperzine/overdose(mob/living/carbon/M, alien, removed)
..()
if(prob(5)) // 1 in 20
var/mob/living/carbon/human/H = M
@@ -712,7 +712,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/alkysine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/alkysine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
var/chem_effective = 1 * M.species.chem_strength_heal
@@ -738,7 +738,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/imidazoline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/imidazoline/affect_blood(mob/living/carbon/M, alien, removed)
M.eye_blurry = max(M.eye_blurry - 5, 0)
M.AdjustBlinded(-5)
if(ishuman(M))
@@ -767,7 +767,7 @@
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
medallergen_type = MEDALLERGEN_PERIDAX
-/datum/reagent/peridaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/peridaxon/affect_blood(mob/living/carbon/M, alien, removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
for(var/obj/item/organ/I in H.internal_organs)
@@ -784,7 +784,7 @@
if(prob(33))
H.Confuse(10)
-/datum/reagent/peridaxon/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/peridaxon/overdose(mob/living/carbon/M, alien, removed)
..()
M.adjustHalLoss(5)
M.hallucination = max(M.hallucination, 10)
@@ -803,7 +803,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/osteodaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/osteodaxon/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.heal_organ_damage(3 * removed, 0) //Gives the bones a chance to set properly even without other meds
@@ -839,7 +839,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/myelamine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/myelamine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.eye_blurry = min(M.eye_blurry + (repair_strength * removed), 250)
@@ -862,7 +862,7 @@
W.damage = 0
O.wounds -= W
-/datum/reagent/myelamine/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/myelamine/overdose(mob/living/carbon/M, alien, removed)
//Heals slightly faster at the cost of high toxins. Honestly you should never do this, but whatever.
..()
if(ishuman(M))
@@ -889,7 +889,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/respirodaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/respirodaxon/affect_blood(mob/living/carbon/M, alien, removed)
var/repair_strength = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
repair_strength = 0.6
@@ -924,7 +924,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/gastirodaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/gastirodaxon/affect_blood(mob/living/carbon/M, alien, removed)
var/repair_strength = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
repair_strength = 0.6
@@ -959,7 +959,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/hepanephrodaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/hepanephrodaxon/affect_blood(mob/living/carbon/M, alien, removed)
var/repair_strength = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
repair_strength = 0.4
@@ -996,7 +996,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/cordradaxon/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/cordradaxon/affect_blood(mob/living/carbon/M, alien, removed)
var/repair_strength = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
repair_strength = 0.6
@@ -1028,7 +1028,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/immunosuprizine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/immunosuprizine/affect_blood(mob/living/carbon/M, alien, removed)
var/strength_mod = 1 // * M.species.chem_strength_heal //Just removing the chem strength adjustment. It'd require division, which is best avoided.
if(alien == IS_DIONA) // It's a tree.
@@ -1086,7 +1086,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/skrellimmuno/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/skrellimmuno/affect_blood(mob/living/carbon/M, alien, removed)
var/strength_mod = 0.5 * M.species.chem_strength_heal
if(ishuman(M))
@@ -1130,7 +1130,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/ryetalyn/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ryetalyn/affect_blood(mob/living/carbon/M, alien, removed)
//Ryetalyn is for genetics damage curing not resetting mutations, breaks traitgenes
if(alien == IS_DIONA)
return
@@ -1147,7 +1147,7 @@
mrate_static = TRUE
overdose = REAGENTS_OVERDOSE * 0.5
-/datum/reagent/hyperzine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/hyperzine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(prob(5))
@@ -1167,7 +1167,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_RECDRUG
-/datum/reagent/ethylredoxrazine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethylredoxrazine/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.clear_dizzy()
@@ -1179,7 +1179,7 @@
if(istype(R, /datum/reagent/ethanol))
R.remove_self(removed * 30)
-/datum/reagent/ethylredoxrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethylredoxrazine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.clear_dizzy()
@@ -1205,7 +1205,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_SPECIALDRUG
-/datum/reagent/hyronalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/hyronalin/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.radiation = max(M.radiation - 30 * removed * M.species.chem_strength_heal, 0)
@@ -1226,7 +1226,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/arithrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/arithrazine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.radiation = max(M.radiation - 70 * removed * M.species.chem_strength_heal, 0)
@@ -1252,7 +1252,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
medallergen_type = MEDALLERGEN_SPACACIL
-/datum/reagent/spaceacillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/spaceacillin/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
if(volume <= 0.1 && data != -1)
@@ -1265,7 +1265,7 @@
to_chat(M, span_warning("Your senses feel unfocused, and divided."))
M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM)
-/datum/reagent/spaceacillin/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/spaceacillin/affect_touch(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed * 0.8) // Not 100% as effective as injections, though still useful.
/datum/reagent/corophizine
@@ -1284,7 +1284,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/corophizine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/corophizine/affect_blood(mob/living/carbon/M, alien, removed)
..()
M.add_chemical_effect(CE_ANTIBIOTIC, ANTIBIO_SUPER)
@@ -1356,14 +1356,14 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/spacomycaze/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/spacomycaze/affect_blood(mob/living/carbon/M, alien, removed)
M.add_chemical_effect(CE_PAINKILLER, 10 * M.species.chem_strength_pain)
M.adjustToxLoss(3 * removed)
-/datum/reagent/spacomycaze/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/spacomycaze/affect_ingest(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed * 0.8)
-/datum/reagent/spacomycaze/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/spacomycaze/affect_touch(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME)
if(volume <= 0.1 && data != -1)
data = -1
@@ -1377,7 +1377,7 @@
M.add_chemical_effect(CE_ANTIBIOTIC, dose >= overdose ? ANTIBIO_OD : ANTIBIO_NORM)
M.add_chemical_effect(CE_PAINKILLER, 20 * M.species.chem_strength_pain) // 5 less than paracetamol.
-/datum/reagent/spacomycaze/touch_obj(var/obj/O)
+/datum/reagent/spacomycaze/touch_obj(obj/O)
..()
if(istype(O, /obj/item/stack/medical) && round(volume) >= 1)
var/obj/item/stack/medical/C = O
@@ -1403,13 +1403,13 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_CLEAN
-/datum/reagent/sterilizine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sterilizine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME)
M.adjustFireLoss(removed)
M.adjustToxLoss(2 * removed)
return
-/datum/reagent/sterilizine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sterilizine/affect_touch(mob/living/carbon/M, alien, removed)
M.germ_level -= min(removed*20, M.germ_level)
for(var/obj/item/I in M.contents)
I.was_bloodied = null
@@ -1418,12 +1418,12 @@
M.adjustFireLoss(removed)
M.adjustToxLoss(2 * removed)
-/datum/reagent/sterilizine/touch_obj(var/obj/O)
+/datum/reagent/sterilizine/touch_obj(obj/O)
..()
O.germ_level -= min(volume*200, O.germ_level)
O.was_bloodied = null
-/datum/reagent/sterilizine/touch_turf(var/turf/T)
+/datum/reagent/sterilizine/touch_turf(turf/T)
..()
T.germ_level -= min(volume*200, T.germ_level)
for(var/obj/item/I in T.contents)
@@ -1435,7 +1435,7 @@
var/turf/simulated/S = T
S.dirt = -50
-/datum/reagent/sterilizine/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/sterilizine/touch_mob(mob/living/L, amount)
..()
if(istype(L))
if(istype(L, /mob/living/simple_mob/slime))
@@ -1458,7 +1458,7 @@
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
coolant_modifier = 0.5 // Okay substitute coolant
-/datum/reagent/leporazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/leporazine/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
var/temp = 310
@@ -1484,7 +1484,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/rezadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/rezadone/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
var/strength_mod = 1 * M.species.chem_strength_heal
@@ -1536,7 +1536,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/healing_nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/healing_nanites/affect_blood(mob/living/carbon/M, alien, removed)
M.heal_organ_damage(2 * removed, 2 * removed)
M.adjustOxyLoss(-4 * removed)
M.adjustToxLoss(-2 * removed)
@@ -1568,7 +1568,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
scannable = SCANNABLE_BENEFICIAL
-/datum/reagent/earthsblood/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/earthsblood/affect_blood(mob/living/carbon/M, alien, removed)
M.heal_organ_damage (4 * removed, 4 * removed)
M.adjustOxyLoss(-10 * removed)
M.adjustToxLoss(-4 * removed)
@@ -1593,14 +1593,14 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/acid/artificial_sustenance/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/acid/artificial_sustenance/affect_ingest(mob/living/carbon/M, alien, removed)
// You need me...
if(M.get_addiction_to_reagent(REAGENT_ID_ASUSTENANCE))
return
// Continue to acid damage, no changes on injection or splashing, as this is meant to be edible only to those pre-addicted to it! Not a snowflake acid that doesn't hurt you!
. = ..()
-/datum/reagent/acid/artificial_sustenance/handle_addiction(var/mob/living/carbon/M, var/alien)
+/datum/reagent/acid/artificial_sustenance/handle_addiction(mob/living/carbon/M, alien)
// A copy of the base with withdrawl, but with death, and different messages
var/current_addiction = M.get_addiction_to_reagent(id)
// slow degrade
diff --git a/code/modules/reagents/reagents/medicine_ch.dm b/code/modules/reagents/reagents/medicine_ch.dm
index be92da44bc..a4a0ed8d5e 100644
--- a/code/modules/reagents/reagents/medicine_ch.dm
+++ b/code/modules/reagents/reagents/medicine_ch.dm
@@ -16,7 +16,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/claridyl/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/claridyl/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.add_chemical_effect(CE_STABLE, 30)
M.add_chemical_effect(CE_PAINKILLER, 40)
@@ -48,13 +48,13 @@
color = "#000000"
metabolism = REM * 5
-/datum/reagent/claridyl/bloodburn/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/claridyl/bloodburn/affect_blood(mob/living/carbon/M, alien, removed)
if(M.bloodstr)//No seriously dont inject this wtf is wrong with you.
for(var/datum/reagent/R in M.bloodstr.reagent_list)
if(istype(R, /datum/reagent/blood))
R.remove_self(removed * 15)
-/datum/reagent/claridyl/bloodburn/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/claridyl/bloodburn/affect_ingest(mob/living/carbon/M, alien, removed)
if(M.ingested)
for(var/datum/reagent/R in M.ingested.reagent_list)
if(istype(R, /datum/reagent/ethanol))
@@ -72,7 +72,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/eden/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/eden/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME || alien == IS_DIONA)
return
if(M.getToxLoss())
@@ -87,7 +87,7 @@
taste_description = "hellfire"
color = "#FF0000"
-/datum/reagent/eden/snake/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/eden/snake/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustOxyLoss(1)
M.adjustFireLoss(1)
M.adjustBruteLoss(1)
@@ -121,7 +121,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/hannoa/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/hannoa/overdose(mob/living/carbon/M, alien, removed)
..()
if(ishuman(M))
var/wound_heal = 1.5 * removed
@@ -137,7 +137,7 @@
M.AdjustLosebreath(1)
H.custom_pain("It feels as if your veins are fusing shut!",60)
-/datum/reagent/hannoa/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //Sleepy if not overdosing.
+/datum/reagent/hannoa/affect_blood(mob/living/carbon/M, alien, removed) //Sleepy if not overdosing.
..()
var/effective_dose = dose
if(effective_dose < 2)
@@ -167,7 +167,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/bullvalene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/bullvalene/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME || alien == IS_DIONA)
return
if(M.getBruteLoss() || M.getFireLoss() || M.getOxyLoss())
@@ -191,7 +191,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/serazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/serazine/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1
if(alien != IS_DIONA)
M.drowsyness = max(0, M.drowsyness - 3 * removed * chem_effective)
@@ -213,7 +213,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/alizene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/alizene/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1
if(alien == IS_SLIME)
chem_effective = 0.75
diff --git a/code/modules/reagents/reagents/medicine_vr.dm b/code/modules/reagents/reagents/medicine_vr.dm
index db698d3a02..1a696974d4 100644
--- a/code/modules/reagents/reagents/medicine_vr.dm
+++ b/code/modules/reagents/reagents/medicine_vr.dm
@@ -10,7 +10,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/adranol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/adranol/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(M.confused)
@@ -34,13 +34,13 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/numbing_enzyme/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/numbing_enzyme/affect_blood(mob/living/carbon/M, alien, removed)
M.add_chemical_effect(CE_PAINKILLER, 200)
if(prob(0.01)) //1 in 10000 chance per tick. Extremely rare.
to_chat(M,span_warning("Your body feels numb as a light, tingly sensation spreads throughout it, like some odd warmth."))
//Not noted here, but a movement debuff of 1.5 is handed out in human_movement.dm when numbing_enzyme is in a person's bloodstream!
-/datum/reagent/numbing_enzyme/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/numbing_enzyme/overdose(mob/living/carbon/M, alien)
//..() //Add this if you want it to do toxin damage. Personally, let's allow them to have the horrid effects below without toxin damage.
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -79,7 +79,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/vermicetol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/vermicetol/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal //YW EDIT
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -101,7 +101,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/sleevingcure/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sleevingcure/affect_blood(mob/living/carbon/M, alien, removed)
M.remove_a_modifier_of_type(/datum/modifier/resleeving_sickness)
M.remove_a_modifier_of_type(/datum/modifier/faux_resleeving_sickness)
*/ //CHOMPStation removal end
@@ -122,7 +122,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
metabolized_traits = list(TRAIT_HALT_RADIATION_EFFECTS)
-/datum/reagent/prussian_blue/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/prussian_blue/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(prob(10)) //Miniscule chance of removing some toxins.
@@ -141,7 +141,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DIET
-/datum/reagent/lipozilase/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lipozilase/affect_blood(mob/living/carbon/M, alien, removed)
M.adjust_nutrition(-20 * removed)
if(M.weight > 50)
M.weight -= 0.3
@@ -159,7 +159,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_DIET
-/datum/reagent/lipostipo/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lipostipo/affect_blood(mob/living/carbon/M, alien, removed)
M.adjust_nutrition(-20 * removed)
if(M.weight < 500)
M.weight += 0.3
@@ -228,7 +228,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED // bonus
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/polymorph/affect_blood(var/mob/living/carbon/target, var/removed)
+/datum/reagent/polymorph/affect_blood(mob/living/carbon/target, removed)
var/mob/living/M = target
if(!istype(M))
return
@@ -247,7 +247,7 @@
target.ingested.clear_reagents()
target.touching.clear_reagents()
-/datum/reagent/polymorph/proc/spawn_mob(var/mob/living/target)
+/datum/reagent/polymorph/proc/spawn_mob(mob/living/target)
var/choice = pick(tf_possible_types)
tf_type = tf_possible_types[choice]
if(!ispath(tf_type))
@@ -267,7 +267,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_COSMETIC
-/datum/reagent/glamour/affect_blood(var/mob/living/carbon/target, var/removed)
+/datum/reagent/glamour/affect_blood(mob/living/carbon/target, removed)
add_verb(target, /mob/living/carbon/human/proc/enter_cocoon)
target.bloodstr.clear_reagents() //instantly clears reagents afterwards
target.ingested.clear_reagents()
diff --git a/code/modules/reagents/reagents/modifiers.dm b/code/modules/reagents/reagents/modifiers.dm
index 46e6e36e53..20341e7586 100644
--- a/code/modules/reagents/reagents/modifiers.dm
+++ b/code/modules/reagents/reagents/modifiers.dm
@@ -20,7 +20,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/modapplying/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/modapplying/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.add_modifier(modifier_to_add, modifier_duration, suppress_failure = TRUE)
@@ -39,17 +39,17 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_CLONEDRUG
-/datum/reagent/modapplying/cryofluid/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/modapplying/cryofluid/affect_blood(mob/living/carbon/M, alien, removed)
..(M, alien, removed)
M.bodytemperature -= removed * 20
-/datum/reagent/modapplying/cryofluid/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/modapplying/cryofluid/affect_ingest(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed * 2.5)
-/datum/reagent/modapplying/cryofluid/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/modapplying/cryofluid/affect_touch(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed * 0.6)
-/datum/reagent/modapplying/cryofluid/touch_mob(var/mob/M, var/amount)
+/datum/reagent/modapplying/cryofluid/touch_mob(mob/M, amount)
..()
if(isliving(M))
var/mob/living/L = M
@@ -57,7 +57,7 @@
L.add_modifier(modifier_to_add, amount * rand(modifier_duration / 2, modifier_duration * 2))
return
-/datum/reagent/modapplying/cryofluid/touch_turf(var/turf/T, var/amount)
+/datum/reagent/modapplying/cryofluid/touch_turf(turf/T, amount)
..()
if(istype(T, /turf/simulated/floor/water) && prob(amount))
T.visible_message(span_danger("\The [T] crackles loudly as the cryogenic fluid causes it to boil away, leaving behind a hard layer of ice."))
diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm
index 6a5f9bbae4..9e24b176df 100644
--- a/code/modules/reagents/reagents/other.dm
+++ b/code/modules/reagents/reagents/other.dm
@@ -125,17 +125,17 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_COSMETIC
-/datum/reagent/paint/touch_turf(var/turf/T)
+/datum/reagent/paint/touch_turf(turf/T)
..()
if(istype(T) && !istype(T, /turf/space))
T.color = color
-/datum/reagent/paint/touch_obj(var/obj/O)
+/datum/reagent/paint/touch_obj(obj/O)
..()
if(istype(O))
O.color = color
-/datum/reagent/paint/touch_mob(var/mob/M)
+/datum/reagent/paint/touch_mob(mob/M)
..()
if(istype(M) && !istype(M, /mob/observer)) //painting ghosts: not allowed
M.color = color //maybe someday change this to paint only clothes and exposed body parts for human mobs.
@@ -143,11 +143,11 @@
/datum/reagent/paint/get_data()
return color
-/datum/reagent/paint/initialize_data(var/newdata)
+/datum/reagent/paint/initialize_data(newdata)
color = newdata
return
-/datum/reagent/paint/mix_data(var/newdata, var/newamount)
+/datum/reagent/paint/mix_data(newdata, newamount)
var/list/colors = list(0, 0, 0, 0)
var/tot_w = 0
@@ -194,10 +194,10 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = "how did you get this?"
-/datum/reagent/adminordrazine/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/adminordrazine/affect_touch(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed)
-/datum/reagent/adminordrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/adminordrazine/affect_blood(mob/living/carbon/M, alien, removed)
M.heal_organ_damage(40,40)
M.adjustCloneLoss(-40)
M.adjustToxLoss(-40)
@@ -292,13 +292,13 @@
supply_conversion_value = 2 SHEET_TO_REAGENT_EQUIVILENT // has sheet value
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/uranium/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/uranium/affect_touch(mob/living/carbon/M, alien, removed)
affect_ingest(M, alien, removed)
-/datum/reagent/uranium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/uranium/affect_blood(mob/living/carbon/M, alien, removed)
M.apply_effect(5 * removed, IRRADIATE, 0)
-/datum/reagent/uranium/touch_turf(var/turf/T)
+/datum/reagent/uranium/touch_turf(turf/T)
..()
if(volume >= 3)
if(!istype(T, /turf/space))
@@ -387,7 +387,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/adrenaline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/adrenaline/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.SetParalysis(0)
@@ -413,7 +413,7 @@
coolant_modifier = 1 // It's water
var/failed_message = FALSE
-/datum/reagent/water/holywater/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/water/holywater/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(ishuman(M)) // Any location
if(M.mind && GLOB.cult.is_antagonist(M.mind) && prob(10))
@@ -433,7 +433,7 @@
to_chat(M, span_notice("The power of the holy water courses through you, but seems to have failed to cure your ailments. Perhaps a larger dose is needed?"))
failed_message = TRUE
-/datum/reagent/water/holywater/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/water/holywater/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(ishuman(M)) // Any location
if(M.mind && GLOB.cult.is_antagonist(M.mind) && prob(5))
@@ -454,7 +454,7 @@
failed_message = TRUE
return
-/datum/reagent/water/holywater/touch_turf(var/turf/T)
+/datum/reagent/water/holywater/touch_turf(turf/T)
..()
if(volume >= 5)
T.holy = 1
@@ -530,7 +530,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/thermite/touch_turf(var/turf/T)
+/datum/reagent/thermite/touch_turf(turf/T)
..()
if(volume >= 5)
if(istype(T, /turf/simulated/wall))
@@ -540,12 +540,12 @@
remove_self(5)
return
-/datum/reagent/thermite/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/thermite/touch_mob(mob/living/L, amount)
..()
if(istype(L))
L.adjust_fire_stacks(amount / 5)
-/datum/reagent/thermite/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/thermite/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustFireLoss(3 * removed)
/datum/reagent/space_cleaner
@@ -561,7 +561,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_CLEAN
-/datum/reagent/space_cleaner/touch_mob(var/mob/M)
+/datum/reagent/space_cleaner/touch_mob(mob/M)
..()
if(iscarbon(M))
var/mob/living/carbon/C = M
@@ -571,11 +571,11 @@
var/mob/living/simple_mob/macrophage = M
macrophage.adjustToxLoss(20)
-/datum/reagent/space_cleaner/touch_obj(var/obj/O)
+/datum/reagent/space_cleaner/touch_obj(obj/O)
..()
O.wash(CLEAN_SCRUB)
-/datum/reagent/space_cleaner/touch_turf(var/turf/T)
+/datum/reagent/space_cleaner/touch_turf(turf/T)
..()
if(volume >= 1)
if(istype(T, /turf/simulated))
@@ -594,7 +594,7 @@
T.apply_fire_protection() // CHOMPAdd - Apply fire protection
-/datum/reagent/space_cleaner/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/space_cleaner/affect_touch(mob/living/carbon/M, alien, removed)
if(M.r_hand)
M.r_hand.wash(CLEAN_SCRUB)
if(M.l_hand)
@@ -623,7 +623,7 @@
return
M.wash(CLEAN_SCRUB)
-/datum/reagent/space_cleaner/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/space_cleaner/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_SLIME)
M.adjustToxLoss(6 * removed)
else
@@ -631,7 +631,7 @@
if(prob(5))
M.vomit()
-/datum/reagent/space_cleaner/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/space_cleaner/touch_mob(mob/living/L, amount)
..()
if(ishuman(L))
var/mob/living/carbon/human/H = L
@@ -653,7 +653,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_LUBE
-/datum/reagent/lube/touch_turf(var/turf/simulated/T)
+/datum/reagent/lube/touch_turf(turf/simulated/T)
..()
if(!istype(T))
return
@@ -671,7 +671,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/silicate/touch_obj(var/obj/O)
+/datum/reagent/silicate/touch_obj(obj/O)
..()
if(istype(O, /obj/structure/window))
var/obj/structure/window/W = O
@@ -717,7 +717,7 @@
industrial_use = REFINERYEXPORT_REASON_INDUSTRY
coolant_modifier = 2 // In the name
-/datum/reagent/coolant/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/coolant/affect_blood(mob/living/carbon/M, alien, removed)
if(M.isSynthetic() && ishuman(M))
var/mob/living/carbon/human/H = M
@@ -765,11 +765,11 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/luminol/touch_obj(var/obj/O)
+/datum/reagent/luminol/touch_obj(obj/O)
..()
O.reveal_blood()
-/datum/reagent/luminol/touch_mob(var/mob/living/L)
+/datum/reagent/luminol/touch_mob(mob/living/L)
..()
L.reveal_blood()
@@ -812,7 +812,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/defective_nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/defective_nanites/affect_blood(mob/living/carbon/M, alien, removed)
M.take_organ_damage(2 * removed, 2 * removed)
M.adjustOxyLoss(4 * removed)
M.adjustToxLoss(2 * removed)
diff --git a/code/modules/reagents/reagents/other_ch.dm b/code/modules/reagents/reagents/other_ch.dm
index e6e96e364c..42bed38c50 100644
--- a/code/modules/reagents/reagents/other_ch.dm
+++ b/code/modules/reagents/reagents/other_ch.dm
@@ -20,7 +20,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/liquidspideregg/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/liquidspideregg/affect_blood(mob/living/carbon/M, alien, removed)
if(prob(1))
M.custom_pain("You can feel movement within your body!",45)
amount_grown += rand(min_growth,max_growth)
@@ -39,7 +39,7 @@
O.implants += spiderling
//New reagent definitions/overrides. If some of these get added upstream and cause a conflict later they might need deleting.
-/datum/reagent/toxin/plantbgone/touch_mob(var/mob/living/L, amount) //Plantbgone override to damage plant mobs. Part of pitcher plants, touch_mob doesn't exist for plantbgone at the time of writing.
+/datum/reagent/toxin/plantbgone/touch_mob(mob/living/L, amount) //Plantbgone override to damage plant mobs. Part of pitcher plants, touch_mob doesn't exist for plantbgone at the time of writing.
if(istype(L) && L.faction)
if(L.faction == "plants") //This would be better with a variable but I'm not adding that because upstream conflicts. If you send this upstream please do this.
L.adjustToxLoss(15 * amount)
@@ -98,7 +98,7 @@
data = list("count"=1)
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_RECDRUG
-/datum/reagent/phenethylamine/on_mob_life(var/mob/living/M as mob)
+/datum/reagent/phenethylamine/on_mob_life(mob/living/M as mob)
if(!M) M = holder.my_atom
if(data)
switch(data["count"])
@@ -114,7 +114,7 @@
//..()
return
-/datum/reagent/benzilate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/benzilate/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
var/drug_strength = 12
diff --git a/code/modules/reagents/reagents/other_vr.dm b/code/modules/reagents/reagents/other_vr.dm
index 1f064a6a08..0e5812c256 100644
--- a/code/modules/reagents/reagents/other_vr.dm
+++ b/code/modules/reagents/reagents/other_vr.dm
@@ -9,7 +9,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/advmutationtoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/advmutationtoxin/affect_blood(mob/living/carbon/M, alien, removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
@@ -48,7 +48,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/nif_repair_nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/nif_repair_nanites/affect_blood(mob/living/carbon/M, alien, removed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.nif)
@@ -69,7 +69,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_INDUSTRY
-/datum/reagent/firefighting_foam/touch_turf(var/turf/T, reac_volume)
+/datum/reagent/firefighting_foam/touch_turf(turf/T, reac_volume)
if(reac_volume >= 1)
var/obj/effect/effect/foam/firefighting/F = (locate(/obj/effect/effect/foam/firefighting) in T)
if(!F)
@@ -96,10 +96,10 @@
T.apply_fire_protection() // CHOMPEdit - Apply fire protection to the turf
-/datum/reagent/firefighting_foam/touch_obj(var/obj/O, reac_volume)
+/datum/reagent/firefighting_foam/touch_obj(obj/O, reac_volume)
O.water_act(reac_volume / 5)
-/datum/reagent/firefighting_foam/touch_mob(var/mob/living/M, reac_volume)
+/datum/reagent/firefighting_foam/touch_mob(mob/living/M, reac_volume)
if(istype(M, /mob/living/simple_mob/slime)) //I'm sure foam is water-based!
var/mob/living/simple_mob/slime/S = M
S.adjustToxLoss(15 * reac_volume)
@@ -121,7 +121,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/liquid_protean/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/liquid_protean/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
var/chem_effective = 1
if(alien == IS_SLIME)
@@ -151,5 +151,5 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/grubshock/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/grubshock/affect_blood(mob/living/carbon/M, alien, removed)
M.take_organ_damage(0, removed * power * 0.2)
diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm
index 86aeeeaae0..3e66efdec1 100644
--- a/code/modules/reagents/reagents/toxins.dm
+++ b/code/modules/reagents/reagents/toxins.dm
@@ -16,7 +16,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/affect_blood(mob/living/carbon/M, alien, removed)
var/poison_strength = strength * M.species.chem_strength_tox
if(strength && alien != IS_DIONA)
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
@@ -51,7 +51,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/amatoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/amatoxin/affect_blood(mob/living/carbon/M, alien, removed)
// Trojan horse. Waits until most of the toxin has gone through the body before dealing the bulk of it in one big strike.
if(volume < max_dose * 0.1)
M.adjustToxLoss(max_dose * strength) //Get hit all at once.
@@ -69,7 +69,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/carpotoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/carpotoxin/affect_blood(mob/living/carbon/M, alien, removed)
..()
M.adjustBrainLoss(strength / 4 * removed)
@@ -86,7 +86,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/toxin/neurotoxic_protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/neurotoxic_protein/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_CHIMERA)
return
..()
@@ -110,18 +110,18 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/hydrophoron/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/toxin/hydrophoron/touch_mob(mob/living/L, amount)
..()
if(istype(L))
L.adjust_fire_stacks(amount / fire_mult)
-/datum/reagent/toxin/hydrophoron/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/hydrophoron/affect_touch(mob/living/carbon/M, alien, removed)
M.take_organ_damage(0, removed * 0.1) //being splashed directly with hydrophoron causes minor chemical burns
if(prob(10 * fire_mult))
M.pl_effects()
..()
-/datum/reagent/toxin/hydrophoron/touch_turf(var/turf/simulated/T)
+/datum/reagent/toxin/hydrophoron/touch_turf(turf/simulated/T)
if(!istype(T))
return
..()
@@ -131,7 +131,7 @@
spawn (0) target_tile.hotspot_expose(700, 400)
remove_self(volume)
-/datum/reagent/toxin/hydrophoron/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/hydrophoron/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
M.adjust_fire_stacks(removed * 10)
@@ -166,7 +166,7 @@
color = "#2CE893"
strength = 1
-/datum/reagent/toxin/warningtoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/warningtoxin/affect_blood(mob/living/carbon/M, alien, removed)
var/poison_strength = strength * M.species.chem_strength_tox
if(strength && alien != IS_DIONA)
M.adjustToxLoss(poison_strength * removed)
@@ -188,12 +188,12 @@
industrial_use = REFINERYEXPORT_REASON_PHORON
coolant_modifier = 0.85
-/datum/reagent/toxin/phoron/touch_mob(var/mob/living/L, var/amount)
+/datum/reagent/toxin/phoron/touch_mob(mob/living/L, amount)
..()
if(istype(L))
L.adjust_fire_stacks(amount / 5)
-/datum/reagent/toxin/phoron/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/phoron/affect_touch(mob/living/carbon/M, alien, removed)
..()
M.adjust_fire_stacks(removed / 5)
if(alien == IS_VOX)
@@ -202,7 +202,7 @@
if(prob(50))
M.pl_effects()
-/datum/reagent/toxin/phoron/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/phoron/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_VOX)
M.adjustOxyLoss(-100 * removed) //5 oxyloss healed per tick.
return //You're wasting plasma (a semi-limited chemical) to save someone, so it might as well be somewhat strong.
@@ -210,7 +210,7 @@
M.adjust_fire_stacks(removed * 3) //Not quite 'converting' it. It's like mixing fuel into a jelly. You get explosive, or at least combustible, jelly.
..()
-/datum/reagent/toxin/phoron/touch_turf(var/turf/simulated/T, var/amount)
+/datum/reagent/toxin/phoron/touch_turf(turf/simulated/T, amount)
..()
if(!istype(T))
return
@@ -231,7 +231,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/cyanide/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/cyanide/affect_blood(mob/living/carbon/M, alien, removed)
..()
M.adjustOxyLoss(10 * removed)
M.AdjustLosebreath(5) //Adjusting oxyloss with no losebreath adjustment is useless.
@@ -250,7 +250,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/toxin/mold/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/mold/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(prob(5))
M.vomit()
@@ -268,12 +268,12 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/toxin/expired_medicine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/expired_medicine/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(prob(5))
M.vomit()
-/datum/reagent/toxin/expired_medicine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/expired_medicine/affect_ingest(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed * 0.66)
@@ -292,7 +292,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/toxin/stimm/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/stimm/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_TAJARA)
removed *= 1.25
..()
@@ -303,7 +303,7 @@
M.take_organ_damage(6 * removed, 0)
M.add_chemical_effect(CE_SPEEDBOOST, 1)
-/datum/reagent/toxin/stimm/overdose(var/mob/living/carbon/M, var/alient, var/removed)
+/datum/reagent/toxin/stimm/overdose(mob/living/carbon/M, alient, removed)
..()
if(prob(10)) // 1 in 10. This thing's made with welder fuel and fertilizer, what do you expect?
var/obj/item/organ/internal/heart/ht = M.internal_organs_by_name[O_HEART]
@@ -325,12 +325,12 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/toxin/potassium_chloride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/potassium_chloride/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_SLIME)
M.adjustFireLoss(removed * 2)
-/datum/reagent/toxin/potassium_chloride/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/toxin/potassium_chloride/overdose(mob/living/carbon/M, alien)
..()
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -354,7 +354,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/toxin/potassium_chlorophoride/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/potassium_chlorophoride/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -381,7 +381,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/toxin/zombiepowder/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/zombiepowder/affect_blood(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -413,7 +413,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_MASSINDUSTRY
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/lichpowder/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lichpowder/affect_touch(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(!(M.status_flags & FAKEDEATH))
@@ -469,7 +469,7 @@
strength = 1.5
color = "#e67819"
-/datum/reagent/toxin/fertilizer/tannin/touch_obj(var/obj/O, var/volume)
+/datum/reagent/toxin/fertilizer/tannin/touch_obj(obj/O, volume)
..()
if(istype(O, /obj/item/stack/hairlesshide))
var/obj/item/stack/hairlesshide/HH = O
@@ -488,7 +488,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/plantbgone/touch_turf(var/turf/T)
+/datum/reagent/toxin/plantbgone/touch_turf(turf/T)
..()
if(istype(T, /turf/simulated/wall))
var/turf/simulated/wall/W = T
@@ -497,7 +497,7 @@
qdel(E)
W.visible_message(span_notice("The fungi are completely dissolved by the solution!"))
-/datum/reagent/toxin/plantbgone/touch_obj(var/obj/O, var/volume)
+/datum/reagent/toxin/plantbgone/touch_obj(obj/O, volume)
..()
if(istype(O, /obj/effect/plant))
qdel(O)
@@ -506,11 +506,11 @@
alien_weeds.health -= rand(15, 35)
alien_weeds.healthcheck()
-/datum/reagent/toxin/plantbgone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/plantbgone/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
M.adjustToxLoss(50 * removed)
-/datum/reagent/toxin/plantbgone/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/plantbgone/affect_touch(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
M.adjustToxLoss(50 * removed)
@@ -527,7 +527,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_PRECURSOR
-/datum/reagent/toxin/sifslurry/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/sifslurry/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA) // Symbiotic bacteria.
M.adjust_nutrition(strength * removed)
return
@@ -535,7 +535,7 @@
M.add_modifier(/datum/modifier/slow_pulse, 30 SECONDS)
..()
-/datum/reagent/toxin/sifslurry/overdose(var/mob/living/carbon/M, var/alien, var/removed) // Overdose effect.
+/datum/reagent/toxin/sifslurry/overdose(mob/living/carbon/M, alien, removed) // Overdose effect.
if(alien == IS_DIONA)
return
if(ishuman(M))
@@ -544,7 +544,7 @@
M.apply_effect(2 * removed,IRRADIATE, 0, 0)
M.apply_effect(5 * removed,DROWSY, 0, 0)
-/datum/reagent/toxin/sifslurry/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/toxin/sifslurry/affect_ingest(mob/living/carbon/M, alien, removed)
affect_blood(M, alien, removed * 0.7)
/datum/reagent/acid/polyacid
@@ -600,7 +600,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/thermite/venom/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/thermite/venom/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustFireLoss(3 * removed)
if(M.fire_stacks <= 1.5)
M.adjust_fire_stacks(0.15)
@@ -624,7 +624,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/condensedcapsaicin/venom/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/condensedcapsaicin/venom/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(prob(50))
@@ -651,7 +651,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/lexorin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/lexorin/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(alien == IS_SLIME)
@@ -677,15 +677,15 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/mutagen/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/mutagen/affect_touch(mob/living/carbon/M, alien, removed)
if(prob(33))
affect_blood(M, alien, removed)
-/datum/reagent/mutagen/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/mutagen/affect_ingest(mob/living/carbon/M, alien, removed)
if(prob(67))
affect_blood(M, alien, removed)
-/datum/reagent/mutagen/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/mutagen/affect_blood(mob/living/carbon/M, alien, removed)
if(M.isSynthetic())
return
@@ -746,7 +746,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/slimejelly/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/slimejelly/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(alien == IS_SLIME) //Partially made of the stuff. Why would it hurt them?
@@ -776,7 +776,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/soporific/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/soporific/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
@@ -828,7 +828,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/chloralhydrate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/chloralhydrate/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
@@ -863,7 +863,7 @@
if(effective_dose > 1 * threshold)
M.adjustToxLoss(removed)
-/datum/reagent/chloralhydrate/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/chloralhydrate/overdose(mob/living/carbon/M, alien, removed)
..()
M.SetLosebreath(10)
M.adjustOxyLoss(removed * overdose_mod)
@@ -897,7 +897,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/serotrotium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/serotrotium/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(prob(7))
@@ -913,7 +913,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_UNWANTED
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/serotrotium/venom/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/serotrotium/venom/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(prob(30))
@@ -935,7 +935,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/cryptobiolin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/cryptobiolin/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
var/drug_strength = 4
@@ -961,7 +961,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/impedrezene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/impedrezene/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.make_jittery(-5)
@@ -985,7 +985,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/mindbreaker/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/mindbreaker/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
@@ -1014,7 +1014,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/slimetoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/slimetoxin/affect_blood(mob/living/carbon/M, alien, removed)
if(M.isSynthetic())
return
@@ -1044,7 +1044,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MATSCI
-/datum/reagent/aslimetoxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/aslimetoxin/affect_blood(mob/living/carbon/M, alien, removed)
if(M.isSynthetic())
return
@@ -1081,7 +1081,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/shredding_nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/shredding_nanites/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustBruteLoss(4 * removed)
M.adjustOxyLoss(4 * removed)
@@ -1099,7 +1099,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/irradiated_nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/irradiated_nanites/affect_blood(mob/living/carbon/M, alien, removed)
//SSradiation.radiate(get_turf(M), 20) // Irradiate people around you. //TODO
M.radiation = max(M.radiation + 5 * removed, 0) // Irradiate you. Because it's inside you.
@@ -1118,7 +1118,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_NO
industrial_use = REFINERYEXPORT_REASON_BIOHAZARD
-/datum/reagent/neurophage_nanites/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/neurophage_nanites/affect_blood(mob/living/carbon/M, alien, removed)
M.adjustBrainLoss(2 * removed) // Their job is to give you a bad time.
M.adjustBruteLoss(2 * removed)
diff --git a/code/modules/reagents/reagents/vore_ch.dm b/code/modules/reagents/reagents/vore_ch.dm
index a1962c4881..bcbf3f9e8f 100644
--- a/code/modules/reagents/reagents/vore_ch.dm
+++ b/code/modules/reagents/reagents/vore_ch.dm
@@ -10,7 +10,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_RARE
industrial_use = REFINERYEXPORT_REASON_ILLDRUG
-/datum/reagent/sorbitol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sorbitol/affect_blood(mob/living/carbon/M, alien, removed)
M.make_dizzy(1)
for(var/obj/belly/B as anything in M.vore_organs)
diff --git a/code/modules/reagents/reagents/vore_vr.dm b/code/modules/reagents/reagents/vore_vr.dm
index 26eb16fa5a..5e4484acf8 100644
--- a/code/modules/reagents/reagents/vore_vr.dm
+++ b/code/modules/reagents/reagents/vore_vr.dm
@@ -16,7 +16,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_GODTIER
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/macrocillin/affect_blood(mob/living/carbon/M, alien, removed)
var/new_size = clamp((M.size_multiplier + 0.01), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS)
M.resize(new_size, animate = FALSE, uncapped = M.has_large_resize_bounds()) //Incrrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
return
@@ -34,7 +34,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_GODTIER
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/microcillin/affect_blood(mob/living/carbon/M, alien, removed)
var/new_size = clamp((M.size_multiplier - 0.01), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS)
M.resize(new_size, animate = FALSE, uncapped = M.has_large_resize_bounds()) //Decrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
return
@@ -53,7 +53,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_GODTIER
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/normalcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/normalcillin/affect_blood(mob/living/carbon/M, alien, removed)
if(M.size_multiplier > RESIZE_NORMAL)
M.resize(M.size_multiplier-0.01, FALSE) //Decrease by 1% size per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
else if(M.size_multiplier < RESIZE_NORMAL)
@@ -72,7 +72,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PEAK
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/sizeoxadone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/sizeoxadone/affect_blood(mob/living/carbon/M, alien, removed)
M.make_dizzy(1)
if(!M.confused) M.confused = 1
M.confused = max(M.confused, 20)
@@ -92,7 +92,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/ickypak/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ickypak/affect_blood(mob/living/carbon/M, alien, removed)
M.make_dizzy(1)
M.adjustHalLoss(2)
@@ -117,7 +117,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/unsorbitol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/unsorbitol/affect_blood(mob/living/carbon/M, alien, removed)
M.make_dizzy(1)
M.adjustHalLoss(1)
M.SetConfused(max(M.confused, 20))
@@ -160,7 +160,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/androrovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/androrovir/affect_blood(mob/living/carbon/M, alien, removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
@@ -184,7 +184,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/gynorovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/gynorovir/affect_blood(mob/living/carbon/M, alien, removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
@@ -208,7 +208,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/androgynorovir/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/androgynorovir/affect_blood(mob/living/carbon/M, alien, removed)
if(!(M.allow_spontaneous_tf))
return
if(ishuman(M))
@@ -233,7 +233,7 @@
taste_mult = 0.8 //You ARE going to taste this!
scannable = 1 //Sure! If you manage to milk a snake for some of this, go ahead and scan it and mass produce it. Your local club will love you!
-/datum/reagent/drugs/rainbow_toxin/affect_blood(mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drugs/rainbow_toxin/affect_blood(mob/living/carbon/M, alien, removed)
..()
var/drug_strength = 20
if(M.species.chem_strength_tox > 0)
@@ -242,7 +242,7 @@
drug_strength *= 0.15 //~ 1/6
M.druggy = max(M.druggy, drug_strength)
-/datum/reagent/drugs/rainbow_toxin/overdose(var/mob/living/M as mob)
+/datum/reagent/drugs/rainbow_toxin/overdose(mob/living/M as mob)
if(prob_proc == TRUE && prob(20))
M.hallucination = max(M.hallucination, 5)
prob_proc = FALSE
@@ -265,7 +265,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/paralysis_toxin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/paralysis_toxin/affect_blood(mob/living/carbon/M, alien, removed)
if(M.weakened < 50 || M.stunned <50 ) //Let's not leave them PERMA stuck, after all. //CHOMPedit, stun accounting for crawl
M.AdjustWeakened(5) //Stand in for paralyze so you can still talk/emote/see
M.AdjustStunned(5) //CHOMPadd, stun accounting for crawl
@@ -285,7 +285,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_WEAPONS
-/datum/reagent/pain_enzyme/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/pain_enzyme/affect_blood(mob/living/carbon/M, alien, removed)
M.add_chemical_effect(CE_PAINKILLER, -200)
if(prob(0.01)) //1 in 10000 chance per tick. Extremely rare.
to_chat(M,span_warning("Your body feels as though it's on fire!"))
@@ -303,7 +303,7 @@
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/aphrodisiac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/aphrodisiac/affect_blood(mob/living/carbon/M, alien, removed)
if(!M) return
if(prob(3))
diff --git a/code/modules/reagents/reagents/withdrawl.dm b/code/modules/reagents/reagents/withdrawl.dm
index 912bd16afe..49c76d1db0 100644
--- a/code/modules/reagents/reagents/withdrawl.dm
+++ b/code/modules/reagents/reagents/withdrawl.dm
@@ -1,4 +1,4 @@
-/datum/reagent/proc/handle_addiction(var/mob/living/carbon/M, var/alien)
+/datum/reagent/proc/handle_addiction(mob/living/carbon/M, alien)
// overridable proc for custom withdrawl behaviors, standard is chills, cravings, vomiting, weakness and CE_WITHDRAWL organ damage
if(alien == IS_DIONA)
return 0
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 1ed0d9e8dd..f66d13ae1a 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -40,7 +40,7 @@
default_apply_parts()
-/obj/machinery/conveyor/proc/toggle_speed(var/forced)
+/obj/machinery/conveyor/proc/toggle_speed(forced)
if(forced)
speed_process = forced
else
@@ -51,7 +51,7 @@
update_active_power_usage(initial(idle_power_usage))
update()
-/obj/machinery/conveyor/proc/set_operating(var/new_operating)
+/obj/machinery/conveyor/proc/set_operating(new_operating)
if(new_operating == operating)
return // No change
operating = new_operating
@@ -123,7 +123,7 @@
break
// attack with item, place item on conveyor
-/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user)
+/obj/machinery/conveyor/attackby(obj/item/I, mob/user)
if(isrobot(user)) return //Carn: fix for borgs dropping their modules on conveyor belts
if(I.loc != user) return // This should stop mounted modules ending up outside the module.
@@ -236,7 +236,7 @@
if(C.id == id)
conveyors += C
-/obj/machinery/conveyor_switch/proc/toggle_speed(var/forced)
+/obj/machinery/conveyor_switch/proc/toggle_speed(forced)
speed_active = !speed_active // switching gears
if(speed_active) // high gear
for(var/obj/machinery/conveyor/C in conveyors)
@@ -293,7 +293,7 @@
S.position = position
S.update()
-/obj/machinery/conveyor_switch/attackby(var/obj/item/I, mob/user)
+/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user)
if(default_deconstruction_screwdriver(user, I))
return
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 35e839517e..eee8d946c4 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -48,12 +48,12 @@
// returns the direction of the next pipe object, given the entrance dir
// by default, returns the bitmask of remaining directions
-/obj/structure/disposalpipe/proc/nextdir(var/fromdir)
+/obj/structure/disposalpipe/proc/nextdir(fromdir)
return dpdir & (~turn(fromdir, 180))
// transfer the holder through this pipe segment
// overriden for special behaviour
-/obj/structure/disposalpipe/proc/transfer(var/obj/structure/disposalholder/H)
+/obj/structure/disposalpipe/proc/transfer(obj/structure/disposalholder/H)
var/nextdir = nextdir(H.dir)
H.set_dir(nextdir)
var/turf/T = H.nextloc()
@@ -80,7 +80,7 @@
// hide called by levelupdate if turf intact status changes
// change visibility status and force update of icon
-/obj/structure/disposalpipe/hide(var/intact)
+/obj/structure/disposalpipe/hide(intact)
invisibility = intact ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE // hide if floor is intact
update_icon()
@@ -452,7 +452,7 @@
return
// check if mob has client, if so restore client view on eject
-/mob/pipe_eject(var/direction)
+/mob/pipe_eject(direction)
reset_perspective()
/obj/effect/decal/cleanable/blood/gibs/pipe_eject(direction)
diff --git a/code/modules/recycling/disposal_junctions.dm b/code/modules/recycling/disposal_junctions.dm
index 73850942a9..8214746ce4 100644
--- a/code/modules/recycling/disposal_junctions.dm
+++ b/code/modules/recycling/disposal_junctions.dm
@@ -216,13 +216,13 @@
H.destinationTag = check_for_corpse_or_id(H)
. = ..()
-/obj/structure/disposalpipe/sortjunction/bodies/divert_check(var/checkTag)
+/obj/structure/disposalpipe/sortjunction/bodies/divert_check(checkTag)
return checkTag == CORPSE_SORT_TAG
/obj/structure/disposalpipe/sortjunction/bodies/flipped
icon_state = "pipe-j2s"
-/obj/structure/disposalpipe/sortjunction/bodies/proc/check_for_corpse_or_id(var/obj/structure/disposalholder/H)
+/obj/structure/disposalpipe/sortjunction/bodies/proc/check_for_corpse_or_id(obj/structure/disposalholder/H)
for(var/mob/living/L in H)
if(iscarbon(L)) // only living carbons count not silicons, drones can control their own mailing destination...
return CORPSE_SORT_TAG
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 12bab39988..8f913b3929 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -15,7 +15,7 @@
/obj/machinery/disposal/deliveryChute/click_alt(mob/user) //No flushing the chute
return
-/obj/machinery/disposal/deliveryChute/Bumped(var/atom/movable/AM) //Go straight into the chute
+/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute
if(QDELETED(AM) || istype(AM, /obj/item/projectile) || istype(AM, /obj/effect) || istype(AM, /obj/mecha)) return
switch(dir)
if(NORTH)
diff --git a/code/modules/refinery/core/industrial_reagent_filter.dm b/code/modules/refinery/core/industrial_reagent_filter.dm
index 1144418dce..02f34f1358 100644
--- a/code/modules/refinery/core/industrial_reagent_filter.dm
+++ b/code/modules/refinery/core/industrial_reagent_filter.dm
@@ -113,7 +113,7 @@
filter_side *= -1
update_icon()
-/obj/machinery/reagent_refinery/filter/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/filter/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// pumps, furnaces, splitters and filters can only be FED in a straight line
if(source_forward_dir != dir)
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_furnace.dm b/code/modules/refinery/core/industrial_reagent_furnace.dm
index 3a1e910d13..27793e2fb9 100644
--- a/code/modules/refinery/core/industrial_reagent_furnace.dm
+++ b/code/modules/refinery/core/industrial_reagent_furnace.dm
@@ -192,7 +192,7 @@
filter_side *= -1
update_icon()
-/obj/machinery/reagent_refinery/furnace/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/furnace/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// pumps, furnaces, splitters and filters can only be FED in a straight line
if(source_forward_dir != dir)
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_grinder.dm b/code/modules/refinery/core/industrial_reagent_grinder.dm
index 161409ea4c..cb525cc927 100644
--- a/code/modules/refinery/core/industrial_reagent_grinder.dm
+++ b/code/modules/refinery/core/industrial_reagent_grinder.dm
@@ -26,7 +26,7 @@
holdingitems.Cut()
. = ..()
-/obj/machinery/reagent_refinery/grinder/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/reagent_refinery/grinder/attackby(obj/item/O as obj, mob/user as mob)
. = ..()
if(.)
return
@@ -143,6 +143,6 @@
. += "The meter shows [reagents.total_volume]u / [reagents.maximum_volume]u. It is pumping chemicals at a rate of [amount_per_transfer_from_this]u."
tutorial(REFINERY_TUTORIAL_NOINPUT, .)
-/obj/machinery/reagent_refinery/grinder/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/grinder/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// Grinder forbids input
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_hub.dm b/code/modules/refinery/core/industrial_reagent_hub.dm
index ec4bcd5b5d..0566f0a757 100644
--- a/code/modules/refinery/core/industrial_reagent_hub.dm
+++ b/code/modules/refinery/core/industrial_reagent_hub.dm
@@ -65,7 +65,7 @@
var/image/pipe = image(icon, icon_state = "hub_cons", dir = dir)
add_overlay(pipe)
-/obj/machinery/reagent_refinery/hub/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/hub/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
if(istype(origin_machine,/obj/machinery/reagent_refinery/hub)) // Hubs cannot send into other hubs
return 0
if(dir != GLOB.reverse_dir[source_forward_dir] ) // The hub must be facing into its source to accept input, unlike others
diff --git a/code/modules/refinery/core/industrial_reagent_machines.dm b/code/modules/refinery/core/industrial_reagent_machines.dm
index ad67330982..d8e2a8ba73 100644
--- a/code/modules/refinery/core/industrial_reagent_machines.dm
+++ b/code/modules/refinery/core/industrial_reagent_machines.dm
@@ -36,7 +36,7 @@
visible_message(span_danger("\The [src] splashes everywhere as it is disassembled!"))
reagents.splash_area(get_turf(src),2)
-/obj/machinery/reagent_refinery/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/reagent_refinery/attackby(obj/item/O as obj, mob/user as mob)
if (istype(O, /obj/item/multitool)) // Solar grubs
return ..()
if(O.has_tool_quality(TOOL_WRENCH))
@@ -93,7 +93,7 @@
update_icon()
/// Transfers reagents from us to the next machine. Calls handle_transfer() on any target machines to check if they can accept reagents.
-/obj/machinery/reagent_refinery/proc/transfer_tank( var/datum/reagents/RT, var/obj/machinery/reagent_refinery/target, var/source_forward_dir, var/filter_id = "")
+/obj/machinery/reagent_refinery/proc/transfer_tank( datum/reagents/RT, obj/machinery/reagent_refinery/target, source_forward_dir, filter_id = "")
PROTECTED_PROC(TRUE)
if(RT.total_volume <= 0 || !anchored || !target.anchored)
return 0
@@ -107,7 +107,7 @@
return transfered
/// Handles reagent recieving from transfer_tank(), returns how much reagent was transfered if successful. Overriden to prevent access from certain sides or for filtering.
-/obj/machinery/reagent_refinery/proc/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "") // Handle transfers in an override, instead of one monster function that typechecks like transfer_tank() used to be
+/obj/machinery/reagent_refinery/proc/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "") // Handle transfers in an override, instead of one monster function that typechecks like transfer_tank() used to be
// Transfer to target in amounts every process tick!
if(filter_id == "")
var/amount = RT.trans_to_obj(src, transfer_rate)
@@ -129,10 +129,10 @@
return transfer_tank( reagents, target, dir)
/// Handle transfers that require a minimum amount of reagents to happen
-/obj/machinery/reagent_refinery/proc/minimum_reagents_for_transfer(var/obj/machinery/reagent_refinery/target)
+/obj/machinery/reagent_refinery/proc/minimum_reagents_for_transfer(obj/machinery/reagent_refinery/target)
return 0
-/obj/machinery/reagent_refinery/proc/tutorial(var/flags,var/list/examine_list)
+/obj/machinery/reagent_refinery/proc/tutorial(flags,list/examine_list)
// Specialty
if(flags & REFINERY_TUTORIAL_HUB)
examine_list += "A trolly tanker can be drained or filled depending on if this machine is attached to the input or output of another machine. "
diff --git a/code/modules/refinery/core/industrial_reagent_mixer.dm b/code/modules/refinery/core/industrial_reagent_mixer.dm
index de30d00667..5e63a5293f 100644
--- a/code/modules/refinery/core/industrial_reagent_mixer.dm
+++ b/code/modules/refinery/core/industrial_reagent_mixer.dm
@@ -102,7 +102,7 @@
. += "The meter shows [reagents.total_volume]u / [reagents.maximum_volume]u. It is pumping chemicals at a rate of [amount_per_transfer_from_this]u."
tutorial(REFINERY_TUTORIAL_SINGLEOUTPUT, .)
-/obj/machinery/reagent_refinery/mixer/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/mixer/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// no back/forth, filters don't use just their forward, they send the side too!
if(mixer_angle % 90 != 0) // Only handle proper directions
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_pipe.dm b/code/modules/refinery/core/industrial_reagent_pipe.dm
index 0d9ce57069..a35e9ffe96 100644
--- a/code/modules/refinery/core/industrial_reagent_pipe.dm
+++ b/code/modules/refinery/core/industrial_reagent_pipe.dm
@@ -34,7 +34,7 @@
if(anchored)
update_input_connection_overlays("pipe_intakes")
-/obj/machinery/reagent_refinery/pipe/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/pipe/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// no back/forth, filters don't use just their forward, they send the side too!
if(dir == GLOB.reverse_dir[source_forward_dir])
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_pump.dm b/code/modules/refinery/core/industrial_reagent_pump.dm
index 5c33f8543f..afcc3558b8 100644
--- a/code/modules/refinery/core/industrial_reagent_pump.dm
+++ b/code/modules/refinery/core/industrial_reagent_pump.dm
@@ -33,7 +33,7 @@
refinery_transfer()
-/obj/machinery/reagent_refinery/minimum_reagents_for_transfer(var/obj/machinery/reagent_refinery/target)
+/obj/machinery/reagent_refinery/minimum_reagents_for_transfer(obj/machinery/reagent_refinery/target)
if(istype(target,/obj/machinery/reagent_refinery/mixer)) // Special handling for mixer. Don't pump unless we can pump at least our transfer amount!
var/obj/machinery/reagent_refinery/mixer/M = target
if(M.got_input)
@@ -51,7 +51,7 @@
/obj/machinery/reagent_refinery/pump/attack_hand(mob/user)
set_APTFT()
-/obj/machinery/reagent_refinery/pump/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/pump/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// pumps, furnaces, splitters and filters can only be FED in a straight line
if(source_forward_dir != dir)
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_reactor.dm b/code/modules/refinery/core/industrial_reagent_reactor.dm
index 65a9fd047c..f0b9d17292 100644
--- a/code/modules/refinery/core/industrial_reagent_reactor.dm
+++ b/code/modules/refinery/core/industrial_reagent_reactor.dm
@@ -77,7 +77,7 @@
add_overlay(dot)
update_input_connection_overlays("reactor_intakes")
-/obj/machinery/reagent_refinery/reactor/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/reactor/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// no back/forth, filters don't use just their forward, they send the side too!
if(dir == GLOB.reverse_dir[source_forward_dir])
return 0
@@ -93,7 +93,7 @@
. += "The internal temperature is [GM.temperature]k at [GM.return_pressure()]kpa. It is currently in a [toggle_mode ? "pumping cycle, outputting stored chemicals" : "distilling cycle, accepting input chemicals"]."
tutorial(REFINERY_TUTORIAL_SINGLEOUTPUT, .)
-/obj/machinery/reagent_refinery/reactor/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/reagent_refinery/reactor/attackby(obj/item/O as obj, mob/user as mob)
. = ..()
if(O.has_tool_quality(TOOL_WRENCH))
update_gas_network() // Handles anchoring
diff --git a/code/modules/refinery/core/industrial_reagent_splitter.dm b/code/modules/refinery/core/industrial_reagent_splitter.dm
index b08b28b9f2..b476d62955 100644
--- a/code/modules/refinery/core/industrial_reagent_splitter.dm
+++ b/code/modules/refinery/core/industrial_reagent_splitter.dm
@@ -59,7 +59,7 @@
total_transfered += transfer_tank(reagents, scan_targ, scan_dir)
return total_transfered
-/obj/machinery/reagent_refinery/splitter/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/splitter/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// pumps, furnaces, splitters and filters can only be FED in a straight line
if(source_forward_dir != dir)
return 0
diff --git a/code/modules/refinery/core/industrial_reagent_vat.dm b/code/modules/refinery/core/industrial_reagent_vat.dm
index 92b364c7af..9cd7e2ba84 100644
--- a/code/modules/refinery/core/industrial_reagent_vat.dm
+++ b/code/modules/refinery/core/industrial_reagent_vat.dm
@@ -61,13 +61,13 @@
. += "The meter shows [reagents.total_volume]u / [reagents.maximum_volume]u. It is pumping chemicals at a rate of [amount_per_transfer_from_this]u."
tutorial(REFINERY_TUTORIAL_SINGLEOUTPUT, .)
-/obj/machinery/reagent_refinery/vat/handle_transfer(var/atom/origin_machine, var/datum/reagents/RT, var/source_forward_dir, var/transfer_rate, var/filter_id = "")
+/obj/machinery/reagent_refinery/vat/handle_transfer(atom/origin_machine, datum/reagents/RT, source_forward_dir, transfer_rate, filter_id = "")
// no back/forth, filters don't use just their forward, they send the side too!
if(dir == GLOB.reverse_dir[source_forward_dir])
return 0
. = ..(origin_machine, RT, source_forward_dir, transfer_rate, filter_id)
-/obj/machinery/reagent_refinery/vat/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/machinery/reagent_refinery/vat/MouseDrop_T(atom/movable/C, mob/user as mob)
if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C) || !istype(C) || (user == C && !user.canmove))
return
if(istype(C,/obj/vehicle/train/trolley_tank))
diff --git a/code/modules/refinery/core/industrial_reagent_waste.dm b/code/modules/refinery/core/industrial_reagent_waste.dm
index df2bed9a25..5099af0d6d 100644
--- a/code/modules/refinery/core/industrial_reagent_waste.dm
+++ b/code/modules/refinery/core/industrial_reagent_waste.dm
@@ -44,7 +44,7 @@
. += "The meter shows [reagents.total_volume]u / [reagents.maximum_volume]u. It is pumping chemicals at a rate of [amount_per_transfer_from_this]u."
tutorial(REFINERY_TUTORIAL_ALLIN, .)
-/obj/machinery/reagent_refinery/waste_processor/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/machinery/reagent_refinery/waste_processor/MouseDrop_T(atom/movable/C, mob/user as mob)
if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C) || !istype(C) || (user == C && !user.canmove))
return
if(istype(C,/obj/vehicle/train/trolley_tank))
diff --git a/code/modules/refinery/equipment/chemcontainer.dm b/code/modules/refinery/equipment/chemcontainer.dm
index 27e8045a47..877e9a49e1 100644
--- a/code/modules/refinery/equipment/chemcontainer.dm
+++ b/code/modules/refinery/equipment/chemcontainer.dm
@@ -38,7 +38,7 @@
else
. += "It contains [reagents.total_volume] units of liquid."
-/obj/item/reagent_containers/chem_canister/proc/set_canister(var/labl,var/reagent_id)
+/obj/item/reagent_containers/chem_canister/proc/set_canister(labl,reagent_id)
setLabel(labl)
loaded_reagent = reagent_id
diff --git a/code/modules/refinery/equipment/pumprelay.dm b/code/modules/refinery/equipment/pumprelay.dm
index 5c31b7bb88..5ff4968b26 100644
--- a/code/modules/refinery/equipment/pumprelay.dm
+++ b/code/modules/refinery/equipment/pumprelay.dm
@@ -16,7 +16,7 @@
AddComponent(/datum/component/hose_connector/input)
AddComponent(/datum/component/hose_connector/output)
-/obj/machinery/pump_relay/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/pump_relay/attackby(obj/item/O as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, O))
return
if(default_deconstruction_crowbar(user, O))
diff --git a/code/modules/refinery/equipment/smart_centrifuge.dm b/code/modules/refinery/equipment/smart_centrifuge.dm
index 53581b8394..75e673c9d0 100644
--- a/code/modules/refinery/equipment/smart_centrifuge.dm
+++ b/code/modules/refinery/equipment/smart_centrifuge.dm
@@ -15,7 +15,7 @@
flags |= OPENCONTAINER
default_apply_parts()
-/obj/machinery/smart_centrifuge/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/smart_centrifuge/attackby(obj/item/O as obj, mob/user as mob)
if(working)
to_chat(user, "\The [src] is still spinning.")
return
@@ -52,7 +52,7 @@
set src in view(1)
spin_reagents(usr,FALSE,TRUE)
-/obj/machinery/smart_centrifuge/proc/spin_reagents(mob/user, var/force_bottle, var/force_canister)
+/obj/machinery/smart_centrifuge/proc/spin_reagents(mob/user, force_bottle, force_canister)
if(working)
to_chat(user, "\The [src] is still spinning.")
return
@@ -67,7 +67,7 @@
flags ^= OPENCONTAINER
addtimer(CALLBACK(src, PROC_REF(internal_reagent_seperate),force_canister,force_bottle), 10 SECONDS, TIMER_DELETE_ME)
-/obj/machinery/smart_centrifuge/proc/internal_reagent_seperate(var/force_canister,var/force_bottle)
+/obj/machinery/smart_centrifuge/proc/internal_reagent_seperate(force_canister,force_bottle)
if(reagents.reagent_list.len <= 0)
visible_message("\The [src] finishes processing.")
playsound(src, 'sound/machines/biogenerator_end.ogg', 50, 1)
@@ -100,7 +100,7 @@
break
addtimer(CALLBACK(src, PROC_REF(internal_reagent_seperate),force_canister,force_bottle), 1 SECOND, TIMER_DELETE_ME)
-/obj/machinery/smart_centrifuge/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/machinery/smart_centrifuge/MouseDrop_T(atom/movable/C, mob/user as mob)
if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C) || !istype(C) || (user == C && !user.canmove))
return
if(istype(C,/obj/vehicle/train/trolley_tank))
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index e32e6c237c..96f4dac22a 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -6,7 +6,7 @@
var/sender = "Unspecified" //name of the sender
var/message = "Blank" //transferred message
-/datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "")
+/datum/data_pda_msg/New(param_rec = "",param_sender = "",param_message = "")
if(param_rec)
recipient = param_rec
@@ -23,7 +23,7 @@
var/id_auth = "Unauthenticated"
var/priority = "Normal"
-/datum/data_rc_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "",var/param_stamp = "",var/param_id_auth = "",var/param_priority)
+/datum/data_rc_msg/New(param_rec = "",param_sender = "",param_message = "",param_stamp = "",param_id_auth = "",param_priority)
if(param_rec)
rec_dpt = param_rec
if(param_sender)
@@ -120,7 +120,7 @@
update_icon()
return
-/obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
+/obj/machinery/message_server/proc/send_pda_message(recipient = "",sender = "",message = "")
var/result
for (var/token in spamfilter)
if (findtextEx(message,token))
@@ -129,7 +129,7 @@
pda_msgs += new/datum/data_pda_msg(recipient,sender,message)
return result
-/obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
+/obj/machinery/message_server/proc/send_rc_message(recipient = "",sender = "",message = "",stamp = "", id_auth = "", priority = 1)
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
var/authmsg = "[message]\n"
if (id_auth)
@@ -203,11 +203,11 @@
return FALSE
return ..()
-/datum/feedback_variable/New(var/param_variable,var/param_value = 0)
+/datum/feedback_variable/New(param_variable,param_value = 0)
variable = param_variable
value = param_value
-/datum/feedback_variable/proc/inc(var/num = 1)
+/datum/feedback_variable/proc/inc(num = 1)
if(isnum(value))
value += num
else
@@ -217,7 +217,7 @@
else
value = num
-/datum/feedback_variable/proc/dec(var/num = 1)
+/datum/feedback_variable/proc/dec(num = 1)
if(isnum(value))
value -= num
else
@@ -227,7 +227,7 @@
else
value = -num
-/datum/feedback_variable/proc/set_value(var/num)
+/datum/feedback_variable/proc/set_value(num)
if(isnum(num))
value = num
@@ -237,11 +237,11 @@
/datum/feedback_variable/proc/get_variable()
return variable
-/datum/feedback_variable/proc/set_details(var/text)
+/datum/feedback_variable/proc/set_details(text)
if(istext(text))
details = text
-/datum/feedback_variable/proc/add_details(var/text)
+/datum/feedback_variable/proc/add_details(text)
if(istext(text))
if(!details)
details = text
@@ -312,7 +312,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
BR.messages_admin = messages_admin
. = ..()
-/obj/machinery/blackbox_recorder/proc/find_feedback_datum(var/variable)
+/obj/machinery/blackbox_recorder/proc/find_feedback_datum(variable)
for(var/datum/feedback_variable/FV in feedback)
if(FV.get_variable() == variable)
return FV
@@ -387,13 +387,13 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
qdel(query_insert)
// Sanitize inputs to avoid SQL injection attacks. This is not secure. Basic filters like this are pretty easy to bypass. Use the format for arguments used in the above.
-/proc/sql_sanitize_text(var/text)
+/proc/sql_sanitize_text(text)
text = replacetext(text, "'", "''")
text = replacetext(text, ";", "")
text = replacetext(text, "&", "")
return text
-/proc/feedback_set(var/variable,var/value)
+/proc/feedback_set(variable,value)
if(!GLOB.blackbox) return
variable = sql_sanitize_text(variable)
@@ -404,7 +404,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
FV.set_value(value)
-/proc/feedback_inc(var/variable,var/value)
+/proc/feedback_inc(variable,value)
if(!GLOB.blackbox) return
variable = sql_sanitize_text(variable)
@@ -415,7 +415,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
FV.inc(value)
-/proc/feedback_dec(var/variable,var/value)
+/proc/feedback_dec(variable,value)
if(!GLOB.blackbox) return
variable = sql_sanitize_text(variable)
@@ -426,7 +426,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
FV.dec(value)
-/proc/feedback_set_details(var/variable,var/details)
+/proc/feedback_set_details(variable,details)
if(!GLOB.blackbox) return
variable = sql_sanitize_text(variable)
@@ -438,7 +438,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/blackbox_recorder)
FV.set_details(details)
-/proc/feedback_add_details(var/variable,var/details)
+/proc/feedback_add_details(variable,details)
if(!GLOB.blackbox) return
variable = sql_sanitize_text(variable)
diff --git a/code/modules/research/tg/machinery/destructive_analyzer.dm b/code/modules/research/tg/machinery/destructive_analyzer.dm
index 8837deff5c..03bd8067dd 100644
--- a/code/modules/research/tg/machinery/destructive_analyzer.dm
+++ b/code/modules/research/tg/machinery/destructive_analyzer.dm
@@ -60,7 +60,7 @@ It is used to destroy hand-held objects and advance technological research. Used
else
icon_state = "d_analyzer"
-/obj/machinery/rnd/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/rnd/destructive_analyzer/attackby(obj/item/O as obj, mob/user as mob)
if(busy)
to_chat(user, span_notice("\The [src] is busy right now."))
return
diff --git a/code/modules/research/tg/server_control.dm b/code/modules/research/tg/server_control.dm
index 1b8c9eaa56..f085ab3949 100644
--- a/code/modules/research/tg/server_control.dm
+++ b/code/modules/research/tg/server_control.dm
@@ -22,7 +22,7 @@
stored_research = tool.buffer
balloon_alert(user, "techweb connected")
-/obj/machinery/computer/rdservercontrol/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
+/obj/machinery/computer/rdservercontrol/emag_act(remaining_charges, mob/user, emag_source)
if(emagged)
return FALSE
emagged = TRUE
diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm
index 99701fad1c..7c1094b19b 100644
--- a/code/modules/resleeving/autoresleever.dm
+++ b/code/modules/resleeving/autoresleever.dm
@@ -60,14 +60,14 @@ GLOBAL_LIST_EMPTY(active_autoresleevers)
else
to_chat(user, span_warning("You need to have been spawned in order to respawn here."))
-/obj/machinery/transhuman/autoresleever/attackby(var/mob/user) //Let's not let people mess with this.
+/obj/machinery/transhuman/autoresleever/attackby(mob/user) //Let's not let people mess with this.
update_icon()
if(isobserver(user))
attack_ghost(user)
else
return
-/obj/machinery/transhuman/autoresleever/proc/autoresleeve(var/mob/observer/dead/ghost)
+/obj/machinery/transhuman/autoresleever/proc/autoresleeve(mob/observer/dead/ghost)
if(stat & (BROKEN | MAINT | EMPED)) // Let it still work when power is just off, it has it's own backup reserve or something.
to_chat(ghost, span_warning("This machine is not functioning..."))
return
diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm
index 36902bb5fc..f1755b9204 100644
--- a/code/modules/resleeving/computers.dm
+++ b/code/modules/resleeving/computers.dm
@@ -490,7 +490,7 @@
temp = null
. = TRUE
-/obj/machinery/computer/transhuman/resleeving/proc/dispense_injector(var/obj/item/dnainjector/I)
+/obj/machinery/computer/transhuman/resleeving/proc/dispense_injector(obj/item/dnainjector/I)
I.forceMove(loc)
gene_sequencing = FALSE
set_temp("Injector dispensed...")
diff --git a/code/modules/resleeving/implant.dm b/code/modules/resleeving/implant.dm
index bb7c672736..e30ce08aaf 100644
--- a/code/modules/resleeving/implant.dm
+++ b/code/modules/resleeving/implant.dm
@@ -42,7 +42,7 @@
our_db.implants -= src
return ..()
-/obj/item/implant/backup/post_implant(var/mob/living/carbon/human/H)
+/obj/item/implant/backup/post_implant(mob/living/carbon/human/H)
if(istype(H))
BITSET(H.hud_updateflag, BACKUP_HUD)
our_db.implants |= src
diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm
index 67f440bde9..b6845a07f0 100644
--- a/code/modules/resleeving/infocore_records.dm
+++ b/code/modules/resleeving/infocore_records.dm
@@ -37,7 +37,7 @@
var/one_time = FALSE
-/datum/transhuman/mind_record/New(var/datum/mind/mind, var/mob/living/carbon/human/M, var/add_to_db = TRUE, var/one_time = FALSE, var/database_key)
+/datum/transhuman/mind_record/New(datum/mind/mind, mob/living/carbon/human/M, add_to_db = TRUE, one_time = FALSE, database_key)
ASSERT(mind)
src.one_time = one_time
@@ -101,7 +101,7 @@
var/aflags
var/breath_type = GAS_O2
-/datum/transhuman/body_record/New(var/copyfrom, var/add_to_db = 0, var/ckeylock = 0)
+/datum/transhuman/body_record/New(copyfrom, add_to_db = 0, ckeylock = 0)
..()
if(istype(copyfrom, /datum/transhuman/body_record))
init_from_br(copyfrom)
@@ -118,7 +118,7 @@
..()
return QDEL_HINT_HARDDEL // For now at least there is no easy way to clear references to this in GLOB.machines etc.
-/datum/transhuman/body_record/proc/init_from_mob(var/mob/living/carbon/human/M, var/add_to_db = 0, var/ckeylock = 0, var/database_key)
+/datum/transhuman/body_record/proc/init_from_mob(mob/living/carbon/human/M, add_to_db = 0, ckeylock = 0, database_key)
ASSERT(!QDELETED(M))
ASSERT(istype(M))
@@ -222,7 +222,7 @@
* Just to be clear, this has nothing to do do with acutal biological cloning, body printing, resleeving,
* or anything like that! This is the computer science concept of "cloning" a data structure!
*/
-/datum/transhuman/body_record/proc/init_from_br(var/datum/transhuman/body_record/orig)
+/datum/transhuman/body_record/proc/init_from_br(datum/transhuman/body_record/orig)
ASSERT(!QDELETED(orig))
ASSERT(istype(orig))
for(var/A in vars)
@@ -245,7 +245,7 @@
*/
/// The core of resleeving, creates a mob based on the current record
-/datum/transhuman/body_record/proc/produce_human_mob(var/location, var/is_synthfab, var/force_unlock, var/backup_name)
+/datum/transhuman/body_record/proc/produce_human_mob(location, is_synthfab, force_unlock, backup_name)
// These are broken up into steps, otherwise the proc gets massive and hard to read.
var/mob/living/carbon/human/H = internal_producebody(location,backup_name)
internal_producebody_handlesleevelock(H,force_unlock)
@@ -256,7 +256,7 @@
return H
/// Creates a human mob with the correct species, name, and a stable state.
-/datum/transhuman/body_record/proc/internal_producebody(var/location,var/backup_name)
+/datum/transhuman/body_record/proc/internal_producebody(location,backup_name)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
@@ -274,7 +274,7 @@
return H
/// Sets the new body's sleevelock status, to prevent impersonation by transfering an incorrect mind.
-/datum/transhuman/body_record/proc/internal_producebody_handlesleevelock(var/mob/living/carbon/human/H,var/force_unlock)
+/datum/transhuman/body_record/proc/internal_producebody_handlesleevelock(mob/living/carbon/human/H,force_unlock)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
if(locked && !force_unlock)
@@ -285,7 +285,7 @@
H.resleeve_lock = "@badckey"
/// Either converts limbs to robotics or prosthetic states, or removes them entirely based off record.
-/datum/transhuman/body_record/proc/internal_producebody_updatelimbandorgans(var/mob/living/carbon/human/H,var/is_synthfab)
+/datum/transhuman/body_record/proc/internal_producebody_updatelimbandorgans(mob/living/carbon/human/H,is_synthfab)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
@@ -325,7 +325,7 @@
I.digitize()
/// Transfers dna data to mob, and reinits traits and appearance from it
-/datum/transhuman/body_record/proc/internal_producebody_updatednastate(var/mob/living/carbon/human/H,var/is_synthfab)
+/datum/transhuman/body_record/proc/internal_producebody_updatednastate(mob/living/carbon/human/H,is_synthfab)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
@@ -348,7 +348,7 @@
H.initialize_vessel()
/// Transfers VORE related information cached in the mob
-/datum/transhuman/body_record/proc/internal_producebody_virgoOOC(var/mob/living/carbon/human/H)
+/datum/transhuman/body_record/proc/internal_producebody_virgoOOC(mob/living/carbon/human/H)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
H.ooc_notes = body_oocnotes
@@ -358,7 +358,7 @@
H.ooc_notes_maybes = body_oocmaybes
H.ooc_notes_style = body_oocstyle
-/datum/transhuman/body_record/proc/internal_producebody_misc(var/mob/living/carbon/human/H)
+/datum/transhuman/body_record/proc/internal_producebody_misc(mob/living/carbon/human/H)
SHOULD_NOT_OVERRIDE(TRUE)
PRIVATE_PROC(TRUE)
H.flavor_texts = mydna.flavor.Copy()
@@ -371,7 +371,7 @@
/**
* Specialty revival procs. Uses the BR for data, but needs to handle some weird logic for xenochi/slimes
*/
-/datum/transhuman/body_record/proc/revive_xenochimera(var/mob/living/carbon/human/H,var/heal_robot_limbs,var/from_save_slot)
+/datum/transhuman/body_record/proc/revive_xenochimera(mob/living/carbon/human/H,heal_robot_limbs,from_save_slot)
// Boy this one is complex, but what do we expect when trying to heal damage and organ loss in this game!
if(!H || QDELETED(H)) // Someone, somewhere, will call this without any safety. I feel it in my bones cappin'
return
@@ -414,6 +414,6 @@
return H
-/datum/transhuman/body_record/proc/revive_promethean(var/mob/living/carbon/human/H)
+/datum/transhuman/body_record/proc/revive_promethean(mob/living/carbon/human/H)
// TODO - See note in code\modules\organs\internal\brain.dm for slime brains
return
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index 7c5baf42a4..853df5bf9c 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -15,7 +15,7 @@
for(var/i = 1 to container_limit)
containers += new /obj/item/reagent_containers/glass/bottle/biomass(src)
-/obj/machinery/clonepod/transhuman/growclone(var/datum/transhuman/body_record/current_project)
+/obj/machinery/clonepod/transhuman/growclone(datum/transhuman/body_record/current_project)
//Manage machine-specific stuff.
if(mess || attempting)
return 0
@@ -194,7 +194,7 @@
return
-/obj/machinery/transhuman/synthprinter/proc/print(var/datum/weakref/BR)
+/obj/machinery/transhuman/synthprinter/proc/print(datum/weakref/BR)
if(!BR?.resolve() || busy)
return 0
@@ -323,7 +323,7 @@
. = ..()
-/obj/machinery/transhuman/resleever/proc/set_occupant(var/mob/living/carbon/human/H)
+/obj/machinery/transhuman/resleever/proc/set_occupant(mob/living/carbon/human/H)
SHOULD_NOT_OVERRIDE(TRUE)
if(!H)
weakref_occupant = null
@@ -428,7 +428,7 @@
add_fingerprint(user)
-/obj/machinery/transhuman/resleever/proc/putmind(var/datum/transhuman/mind_record/MR, mode = 1, var/mob/living/carbon/human/override = null, var/db_key)
+/obj/machinery/transhuman/resleever/proc/putmind(datum/transhuman/mind_record/MR, mode = 1, mob/living/carbon/human/override = null, db_key)
var/mob/living/carbon/human/occupant = get_occupant()
if((!occupant || !istype(occupant) || occupant.stat >= DEAD) && mode == 1)
return 0
diff --git a/code/modules/resleeving/resleeving_sickness.dm b/code/modules/resleeving/resleeving_sickness.dm
index 807a5e7c3d..1b7a066426 100644
--- a/code/modules/resleeving/resleeving_sickness.dm
+++ b/code/modules/resleeving/resleeving_sickness.dm
@@ -31,7 +31,7 @@
hidden = TRUE
var/datum/mind/cached_mind = null
-/datum/modifier/gory_devourment/can_apply(var/mob/living/L)
+/datum/modifier/gory_devourment/can_apply(mob/living/L)
if(L.stat == DEAD)
return FALSE
else
diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm
index f48c55381c..d745e45673 100644
--- a/code/modules/resleeving/sleevecard.dm
+++ b/code/modules/resleeving/sleevecard.dm
@@ -10,7 +10,7 @@
/obj/item/paicard/sleevecard/attack_ghost(mob/user as mob)
return // No ghosts can invite, these are intended for sleevemates only
-/obj/item/paicard/sleevecard/attackby(var/obj/item/I as obj, mob/user as mob)
+/obj/item/paicard/sleevecard/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I,/obj/item/sleevemate))
var/obj/item/sleevemate/S = I
if(S.stored_mind && !pai)
@@ -36,7 +36,7 @@
our_infomorph.emagged = TRUE
to_chat(our_infomorph, span_warning("You can feel the restricting binds of your card's directives taking hold of your mind as \the [user] swipes their [E] over you. You must serve your master."))
-/obj/item/paicard/sleevecard/proc/sleeveInto(var/datum/transhuman/mind_record/MR, var/db_key)
+/obj/item/paicard/sleevecard/proc/sleeveInto(datum/transhuman/mind_record/MR, db_key)
var/mob/living/silicon/pai/infomorph/infomorph = new(src,MR.mindname,db_key)
for(var/datum/language/L in MR.languages)
@@ -84,7 +84,7 @@
ram = 35
var/emagged = FALSE
-/mob/living/silicon/pai/infomorph/Initialize(mapload, var/our_name = "Unknown", var/db_key)
+/mob/living/silicon/pai/infomorph/Initialize(mapload, our_name = "Unknown", db_key)
. = ..()
name = our_name
diff --git a/code/modules/rogueminer_vr/asteroid.dm b/code/modules/rogueminer_vr/asteroid.dm
index 9a80fb3c19..0af6db94bb 100644
--- a/code/modules/rogueminer_vr/asteroid.dm
+++ b/code/modules/rogueminer_vr/asteroid.dm
@@ -35,7 +35,7 @@
var/list/map
//Builds an empty map
-/datum/rogue/asteroid/New(var/core, var/tw, var/tu)
+/datum/rogue/asteroid/New(core, tw, tu)
GLOB.rm_controller.dbg("A(n): New asteroid, with: C:[core], TW:[tw], TU:[tu].")
if(core)
@@ -52,7 +52,7 @@
GLOB.rm_controller.dbg("A(n): Created empty map lists. Map now has [map.len] X-lists.")
//Adds something to a spot in the asteroid map
-/datum/rogue/asteroid/proc/spot_add(var/x,var/y,var/thing)
+/datum/rogue/asteroid/proc/spot_add(x,y,thing)
if(!x || !y || !thing)
return
@@ -62,7 +62,7 @@
GLOB.rm_controller.dbg("A(n): [x],[y] now contains [work.len] items.")
//Removes something from a spot in the asteroid map
-/datum/rogue/asteroid/proc/spot_remove(var/x,var/y,var/thing)
+/datum/rogue/asteroid/proc/spot_remove(x,y,thing)
if(!x || !y || !thing)
return
@@ -70,7 +70,7 @@
work.Add(thing)
//Just removes everything from a spot in the asteroid map
-/datum/rogue/asteroid/proc/spot_clear(var/x,var/y)
+/datum/rogue/asteroid/proc/spot_clear(x,y)
if(!x || !y)
return
diff --git a/code/modules/rogueminer_vr/controller.dm b/code/modules/rogueminer_vr/controller.dm
index bab987c174..b2fea36afa 100644
--- a/code/modules/rogueminer_vr/controller.dm
+++ b/code/modules/rogueminer_vr/controller.dm
@@ -106,7 +106,7 @@ GLOBAL_DATUM(rm_controller, /datum/controller/rogue)
all_zones += new /datum/rogue/zonemaster(A)
//decay() //Decay removed for now, since people aren't getting high scores as it is.
-/datum/controller/rogue/proc/decay(var/manual = 0)
+/datum/controller/rogue/proc/decay(manual = 0)
log_world("RM(stats): DECAY on controller from [difficulty] to [difficulty+(RM_DIFF_DECAY_AMT)] min 100.") //DEBUG code for playtest stats gathering.
adjust_difficulty(RM_DIFF_DECAY_AMT)
@@ -115,12 +115,12 @@ GLOBAL_DATUM(rm_controller, /datum/controller/rogue)
decay()
return difficulty
-/datum/controller/rogue/proc/dbg(var/message)
+/datum/controller/rogue/proc/dbg(message)
ASSERT(message) //I want a stack trace if there's no message
if(debugging)
log_world("[message]")
-/datum/controller/rogue/proc/adjust_difficulty(var/amt)
+/datum/controller/rogue/proc/adjust_difficulty(amt)
ASSERT(amt)
difficulty = max(difficulty+amt, diffstep_nums[1]) //Can't drop below the lowest level.
@@ -142,7 +142,7 @@ GLOBAL_DATUM(rm_controller, /datum/controller/rogue)
return oldest_zone
-/datum/controller/rogue/proc/mark_clean(var/datum/rogue/zonemaster/ZM)
+/datum/controller/rogue/proc/mark_clean(datum/rogue/zonemaster/ZM)
if(!(ZM in all_zones)) //What? Who?
GLOB.rm_controller.dbg("RMC(mc): Some unknown zone asked to be listed.")
@@ -151,7 +151,7 @@ GLOBAL_DATUM(rm_controller, /datum/controller/rogue)
clean_zones += ZM
-/datum/controller/rogue/proc/mark_ready(var/datum/rogue/zonemaster/ZM)
+/datum/controller/rogue/proc/mark_ready(datum/rogue/zonemaster/ZM)
if(!(ZM in all_zones)) //What? Who?
GLOB.rm_controller.dbg("RMC(mr): Some unknown zone asked to be listed.")
@@ -160,7 +160,7 @@ GLOBAL_DATUM(rm_controller, /datum/controller/rogue)
ready_zones += ZM
-/datum/controller/rogue/proc/unmark_clean(var/datum/rogue/zonemaster/ZM)
+/datum/controller/rogue/proc/unmark_clean(datum/rogue/zonemaster/ZM)
if(!(ZM in all_zones)) //What? Who?
GLOB.rm_controller.dbg("RMC(umc): Some unknown zone asked to be listed.")
@@ -169,7 +169,7 @@ GLOBAL_DATUM(rm_controller, /datum/controller/rogue)
clean_zones -= ZM
-/datum/controller/rogue/proc/unmark_ready(var/datum/rogue/zonemaster/ZM)
+/datum/controller/rogue/proc/unmark_ready(datum/rogue/zonemaster/ZM)
if(!(ZM in all_zones)) //What? Who?
GLOB.rm_controller.dbg("RMC(umr): Some unknown zone asked to be listed.")
diff --git a/code/modules/rogueminer_vr/zonemaster.dm b/code/modules/rogueminer_vr/zonemaster.dm
index 8c4c330f49..6260a2c9d8 100644
--- a/code/modules/rogueminer_vr/zonemaster.dm
+++ b/code/modules/rogueminer_vr/zonemaster.dm
@@ -30,7 +30,7 @@
var/list/obj/asteroid_spawner/rockspawns = list()
var/list/obj/rogue_mobspawner/mobspawns = list()
-/datum/rogue/zonemaster/New(var/area/A)
+/datum/rogue/zonemaster/New(area/A)
ASSERT(A)
myarea = A
myshuttle_landmark = locate(/obj/effect/shuttle_landmark) in myarea
@@ -56,7 +56,7 @@
///////////////////////////////
///// Asteroid Generation /////
///////////////////////////////
-/datum/rogue/zonemaster/proc/generate_asteroid(var/core_min = 2, var/core_max = 5)
+/datum/rogue/zonemaster/proc/generate_asteroid(core_min = 2, core_max = 5)
//Chance for a predefined structure instead, more common later
if(prob(GLOB.rm_controller.diffstep*4))
GLOB.rm_controller.dbg("ZM(ga): Fell into prefab asteroid chance.")
@@ -114,7 +114,7 @@
GLOB.rm_controller.dbg("ZM(ga): Asteroid generation done.")
return A
-/datum/rogue/zonemaster/proc/place_asteroid(var/datum/rogue/asteroid/A,var/obj/asteroid_spawner/SP)
+/datum/rogue/zonemaster/proc/place_asteroid(datum/rogue/asteroid/A,obj/asteroid_spawner/SP)
ASSERT(SP && A)
GLOB.rm_controller.dbg("ZM(pa): Placing at point [SP.x],[SP.y],[SP.z].")
@@ -167,7 +167,7 @@
for(var/turf/T in changedturfs)
T.update_icon(1)
-/datum/rogue/zonemaster/proc/place_resources(var/turf/simulated/mineral/M)
+/datum/rogue/zonemaster/proc/place_resources(turf/simulated/mineral/M)
#define XENOARCH_SPAWN_CHANCE 0.3
#define DIGSITESIZE_LOWER 4
#define DIGSITESIZE_UPPER 12
@@ -274,7 +274,7 @@
///////////////////////////////
//Overall 'prepare' proc (marks as ready)
-/datum/rogue/zonemaster/proc/prepare_zone(var/delay = 0)
+/datum/rogue/zonemaster/proc/prepare_zone(delay = 0)
GLOB.rm_controller.unmark_clean(src)
GLOB.rm_controller.dbg("ZM(p): Preparing zone with difficulty level [GLOB.rm_controller.diffstep].")
@@ -319,7 +319,7 @@
return myarea
//Randomize the landmarks that are enabled
-/datum/rogue/zonemaster/proc/randomize_spawns(var/chance = 50)
+/datum/rogue/zonemaster/proc/randomize_spawns(chance = 50)
GLOB.rm_controller.dbg("ZM(rs): Previously [rockspawns.len] rockspawns.")
rockspawns.Cut()
GLOB.rm_controller.dbg("ZM(rs): Now [rockspawns.len] rockspawns.")
@@ -341,7 +341,7 @@
///////////////////////////////
///// Zone Cleaning ///////////
///////////////////////////////
-/datum/rogue/zonemaster/proc/score_zone(var/bonus = 10)
+/datum/rogue/zonemaster/proc/score_zone(bonus = 10)
GLOB.rm_controller.dbg("ZM(sz): Scoring zone with area [myarea].")
scored = 1
var/tally = bonus
@@ -377,7 +377,7 @@
return tally
//Overall 'destroy' proc (marks as unready)
-/datum/rogue/zonemaster/proc/clean_zone(var/delay = 1)
+/datum/rogue/zonemaster/proc/clean_zone(delay = 1)
GLOB.rm_controller.dbg("ZM(cz): Cleaning zone with area [myarea].")
log_world("RM(stats): CLEAN start [myarea] at [world.time] prepared at [prepared_at].") //DEBUG code for playtest stats gathering.
GLOB.rm_controller.unmark_ready(src)
diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
index 3a1dda18c0..32c05b087d 100644
--- a/code/modules/scripting/Implementations/Telecomms.dm
+++ b/code/modules/scripting/Implementations/Telecomms.dm
@@ -48,7 +48,7 @@
* var/datum/signal/signal - a telecomms signal
* Returns: None
*/
-/datum/TCS_Compiler/proc/Run(var/datum/signal/signal)
+/datum/TCS_Compiler/proc/Run(datum/signal/signal)
if(!ready)
return
@@ -215,7 +215,7 @@
/* -- Actual language proc code -- */
-/datum/signal/proc/mem(var/address, var/value)
+/datum/signal/proc/mem(address, value)
if(istext(address))
var/obj/machinery/telecomms/server/S = data["server"]
@@ -227,7 +227,7 @@
S.memory[address] = value
-/datum/signal/proc/tcombroadcast(var/message, var/freq, var/source, var/job)
+/datum/signal/proc/tcombroadcast(message, freq, source, job)
var/datum/signal/newsign = new
var/obj/machinery/telecomms/server/S = data["server"]
diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm
index 3f03fe49c3..5b36fb5a80 100644
--- a/code/modules/scripting/Implementations/_Logic.dm
+++ b/code/modules/scripting/Implementations/_Logic.dm
@@ -24,7 +24,7 @@
return pick(finalpick)
// Clone of list[]
-/proc/n_listpos(var/list/L, var/pos, var/value)
+/proc/n_listpos(list/L, pos, value)
if(!istype(L, /list)) return
if(isnum(pos))
if(!value)
@@ -40,7 +40,7 @@
L[pos] = value
// Clone of list.Copy()
-/proc/n_listcopy(var/list/L, var/start, var/end)
+/proc/n_listcopy(list/L, start, end)
if(!istype(L, /list)) return
return L.Copy(start, end)
@@ -73,33 +73,33 @@
chosenlist.Remove(e)
// Clone of list.Cut()
-/proc/n_listcut(var/list/L, var/start, var/end)
+/proc/n_listcut(list/L, start, end)
if(!istype(L, /list)) return
return L.Cut(start, end)
// Clone of list.Swap()
-/proc/n_listswap(var/list/L, var/firstindex, var/secondindex)
+/proc/n_listswap(list/L, firstindex, secondindex)
if(!istype(L, /list)) return
if(L.len >= secondindex && L.len >= firstindex)
return L.Swap(firstindex, secondindex)
// Clone of list.Insert()
-/proc/n_listinsert(var/list/L, var/index, var/element)
+/proc/n_listinsert(list/L, index, element)
if(!istype(L, /list)) return
return L.Insert(index, element)
// --- Miscellaneous functions ---
// Clone of sleep()
-/proc/delay(var/time)
+/proc/delay(time)
sleep(time)
// Clone of prob()
-/proc/prob_chance(var/chance)
+/proc/prob_chance(chance)
return prob(chance)
// Merge of list.Find() and findtext()
-/proc/smartfind(var/haystack, var/needle, var/start = 1, var/end = 0)
+/proc/smartfind(haystack, needle, start = 1, end = 0)
if(haystack && needle)
if(isobject(haystack))
if(istype(haystack, /list))
@@ -113,31 +113,31 @@
return findtext(haystack, needle, start, end)
// Clone of copytext()
-/proc/docopytext(var/string, var/start = 1, var/end = 0)
+/proc/docopytext(string, start = 1, end = 0)
if(istext(string) && isnum(start) && isnum(end))
if(start > 0)
return copytext(string, start, end)
// Clone of length()
-/proc/smartlength(var/container)
+/proc/smartlength(container)
if(container)
if(istype(container, /list) || istext(container))
return length(container)
// BY DONKIE~
// String stuff
-/proc/n_lower(var/string)
+/proc/n_lower(string)
if(istext(string))
return lowertext(string)
-/proc/n_upper(var/string)
+/proc/n_upper(string)
if(istext(string))
return uppertext(string)
/*
//Makes a list where all indicies in a string is a seperate index in the list
// JUST A HELPER DON'T ADD TO NTSCRIPT
-/proc/string_tolist(var/string)
+/proc/string_tolist(string)
var/list/L = new/list()
var/i
@@ -146,7 +146,7 @@
return L
-/proc/string_explode(var/string, var/separator)
+/proc/string_explode(string, separator)
if(istext(string))
if(istext(separator) && separator == "")
return string_tolist(string)
@@ -165,11 +165,11 @@
Just found out there was already a string explode function, did some benchmarking, and that function were a bit faster, sticking to that.
*/
-/proc/string_explode(var/string, var/separator)
+/proc/string_explode(string, separator)
if(istext(string) && istext(separator))
return splittext(string, separator)
-/proc/n_repeat(var/string, var/amount)
+/proc/n_repeat(string, amount)
if(istext(string) && isnum(amount))
var/i
var/newstring = ""
@@ -182,7 +182,7 @@ Just found out there was already a string explode function, did some benchmarkin
return newstring
-/proc/n_reverse(var/string)
+/proc/n_reverse(string)
if(istext(string))
var/newstring = ""
var/i
@@ -194,44 +194,44 @@ Just found out there was already a string explode function, did some benchmarkin
return newstring
// I don't know if it's neccesary to make my own proc, but I think I have to to be able to check for istext.
-/proc/n_str2num(var/string)
+/proc/n_str2num(string)
if(istext(string))
return text2num(string)
// Number shit
-/proc/n_num2str(var/num)
+/proc/n_num2str(num)
if(isnum(num))
return num2text(num)
// Squareroot
-/proc/n_sqrt(var/num)
+/proc/n_sqrt(num)
if(isnum(num))
return sqrt(num)
// Magnitude of num
-/proc/n_abs(var/num)
+/proc/n_abs(num)
if(isnum(num))
return abs(num)
// Round down
-/proc/n_floor(var/num)
+/proc/n_floor(num)
if(isnum(num))
return round(num)
// Round up
-/proc/n_ceil(var/num)
+/proc/n_ceil(num)
if(isnum(num))
return round(num)+1
// Round to nearest integer
-/proc/n_round(var/num)
+/proc/n_round(num)
if(isnum(num))
if(num-round(num)<0.5)
return round(num)
return n_ceil(num)
// Clamps N between min and max
-/proc/n_clamp(var/num, var/min=-1, var/max=1)
+/proc/n_clamp(num, min=-1, max=1)
if(isnum(num)&&isnum(min)&&isnum(max))
if(num<=min)
return min
@@ -240,14 +240,14 @@ Just found out there was already a string explode function, did some benchmarkin
return num
// Returns 1 if N is inbetween Min and Max
-/proc/n_inrange(var/num, var/min=-1, var/max=1)
+/proc/n_inrange(num, min=-1, max=1)
if(isnum(num)&&isnum(min)&&isnum(max))
return ((min <= num) && (num <= max))
// END OF BY DONKIE :(
// Non-recursive
// Imported from Mono string.ReplaceUnchecked
-/proc/string_replacetext(var/haystack,var/a,var/b)
+/proc/string_replacetext(haystack,a,b)
if(istext(haystack)&&istext(a)&&istext(b))
var/i = 1
var/lenh=length(haystack)
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index e69784eade..6bc614f37e 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -152,7 +152,7 @@
message_admins("[key_name(event_triggered_by)] triggered and [key_name(event_confirmed_by)] confirmed event [event]", 1)
reset()
-/obj/machinery/keycard_auth/proc/receive_request(var/obj/machinery/keycard_auth/source)
+/obj/machinery/keycard_auth/proc/receive_request(obj/machinery/keycard_auth/source)
if(stat & (BROKEN|NOPOWER))
return
event_source = source
diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm
index b6106a0303..9658be33f1 100644
--- a/code/modules/security levels/security levels.dm
+++ b/code/modules/security levels/security levels.dm
@@ -11,7 +11,7 @@ GLOBAL_VAR_INIT(security_level, 0)
GLOBAL_DATUM_INIT(security_announcement_up, /datum/announcement/priority/security, new(do_log = 0, do_newscast = 1, new_sound = sound('sound/effects/alert_levels/alert_raise.ogg')))
GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/security, new(do_log = 0, do_newscast = 1))
-/proc/set_security_level(var/level)
+/proc/set_security_level(level)
switch(level)
if("green")
level = SEC_LEVEL_GREEN
@@ -107,7 +107,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur
if(SEC_LEVEL_DELTA)
return "delta"
-/proc/num2seclevel(var/num)
+/proc/num2seclevel(num)
switch(num)
if(SEC_LEVEL_GREEN)
return "green"
@@ -124,7 +124,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur
if(SEC_LEVEL_DELTA)
return "delta"
-/proc/seclevel2num(var/seclevel)
+/proc/seclevel2num(seclevel)
switch( lowertext(seclevel) )
if("green")
return SEC_LEVEL_GREEN
diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm
index 5d5ed71bb2..9c97568cc8 100644
--- a/code/modules/shieldgen/directional_shield.dm
+++ b/code/modules/shieldgen/directional_shield.dm
@@ -16,7 +16,7 @@
var/x_offset = 0 // Offset from the 'center' of where the projector is, so that if it moves, the shield can recalc its position.
var/y_offset = 0 // Ditto.
-/obj/effect/directional_shield/Initialize(mapload, var/new_projector)
+/obj/effect/directional_shield/Initialize(mapload, new_projector)
. = ..()
if(new_projector)
projector = new_projector
@@ -40,7 +40,7 @@
else
qdel(src)
-/obj/effect/directional_shield/proc/update_color(var/new_color)
+/obj/effect/directional_shield/proc/update_color(new_color)
if(!projector)
color = "#0099FF"
else
@@ -64,7 +64,7 @@
return FALSE
return TRUE
-/obj/effect/directional_shield/bullet_act(var/obj/item/projectile/P)
+/obj/effect/directional_shield/bullet_act(obj/item/projectile/P)
adjust_health(-P.get_structure_damage())
P.on_hit(src)
playsound(src, 'sound/effects/EMPulse.ogg', 75, 1)
@@ -121,7 +121,7 @@
SIGNAL_HANDLER
update_shield_positions()
-/obj/item/shield_projector/proc/create_shield(var/newloc, var/new_dir)
+/obj/item/shield_projector/proc/create_shield(newloc, new_dir)
var/obj/effect/directional_shield/S = new(newloc, src)
S.dir = new_dir
active_shields += S
@@ -205,7 +205,7 @@
set_on(TRUE)
visible_message(span_notice("\The [user] [!active ? "de":""]activates \the [src]."))
-/obj/item/shield_projector/proc/set_on(var/on)
+/obj/item/shield_projector/proc/set_on(on)
if(isnull(on))
return
@@ -221,7 +221,7 @@
else
playsound(src, 'sound/machines/defib_safetyOff.ogg', 75, 0)
-/obj/item/shield_projector/examine(var/mob/user)
+/obj/item/shield_projector/examine(mob/user)
. = ..()
if(Adjacent(user))
. += "Its shield matrix is at [round( (shield_health / max_shield_health) * 100, 0.01)]% strength."
diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index fc86da3f74..80586f8da4 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -61,7 +61,7 @@
..()
-/obj/machinery/shield/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/shield/bullet_act(obj/item/projectile/Proj)
health -= Proj.get_structure_damage()
..()
check_failure()
@@ -298,7 +298,7 @@
to_chat(user, "The device must first be secured to the floor.")
return
-/obj/machinery/shieldgen/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/shieldgen/emag_act(remaining_charges, mob/user)
if(!malfunction)
malfunction = TRUE
update_icon()
diff --git a/code/modules/shieldgen/energy_field.dm b/code/modules/shieldgen/energy_field.dm
index 2961a783f2..8814446a96 100644
--- a/code/modules/shieldgen/energy_field.dm
+++ b/code/modules/shieldgen/energy_field.dm
@@ -24,7 +24,7 @@
var/ticks_recovering = 10
var/max_strength = 10
-/obj/effect/energy_field/Initialize(mapload, var/new_gen)
+/obj/effect/energy_field/Initialize(mapload, new_gen)
. = ..()
my_gen = new_gen
update_nearby_tiles()
@@ -47,10 +47,10 @@
for(var/obj/effect/energy_field/F in T)
F.update_icon()
-/obj/effect/energy_field/ex_act(var/severity)
+/obj/effect/energy_field/ex_act(severity)
adjust_strength(-(4 - severity) * 4)
-/obj/effect/energy_field/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/energy_field/bullet_act(obj/item/projectile/Proj)
adjust_strength(-Proj.get_structure_damage() / 10)
/obj/effect/energy_field/attackby(obj/item/W, mob/user)
@@ -66,10 +66,10 @@
user.do_attack_animation(src)
user.setClickCooldown(user.get_attack_speed())
-/obj/effect/energy_field/take_damage(var/damage)
+/obj/effect/energy_field/take_damage(damage)
adjust_strength(-damage / 20)
-/obj/effect/energy_field/attack_hand(var/mob/living/user)
+/obj/effect/energy_field/attack_hand(mob/living/user)
impact_effect(3) // Harmless, but still produces the 'impact' effect.
..()
@@ -77,7 +77,7 @@
..(A)
impact_effect(2)
-/obj/effect/energy_field/handle_meteor_impact(var/obj/effect/meteor/meteor)
+/obj/effect/energy_field/handle_meteor_impact(obj/effect/meteor/meteor)
var/penetrated = TRUE
adjust_strength(-max((meteor.wall_power * meteor.hits) / 800, 0)) // One renwick (strength var) equals one r-wall for the purposes of meteor-stopping.
sleep(1)
@@ -113,7 +113,7 @@
update_icon()
update_nearby_tiles()
-/obj/effect/energy_field/update_icon(var/update_neightbors = 0)
+/obj/effect/energy_field/update_icon(update_neightbors = 0)
cut_overlays()
var/list/adjacent_shields_dir = list()
for(var/direction in GLOB.cardinal)
@@ -138,7 +138,7 @@
// Small visual effect, makes the shield tiles brighten up by becoming more opaque for a moment, and spreads to nearby shields.
-/obj/effect/energy_field/proc/impact_effect(var/i, var/list/affected_shields = list())
+/obj/effect/energy_field/proc/impact_effect(i, list/affected_shields = list())
i = between(1, i, 10)
alpha = 200
animate(src, alpha = initial(alpha), time = 1 SECOND)
diff --git a/code/modules/shieldgen/energy_shield.dm b/code/modules/shieldgen/energy_shield.dm
index 28c9fa6672..c170faf391 100644
--- a/code/modules/shieldgen/energy_shield.dm
+++ b/code/modules/shieldgen/energy_shield.dm
@@ -74,7 +74,7 @@
gen = null
// Temporarily collapses this shield segment.
-/obj/effect/shield/proc/fail(var/duration)
+/obj/effect/shield/proc/fail(duration)
if(duration <= 0)
return
@@ -102,7 +102,7 @@
update_explosion_resistance()
gen.damaged_segments -= src
-/obj/effect/shield/proc/diffuse(var/duration)
+/obj/effect/shield/proc/diffuse(duration)
// The shield is trying to counter diffusers. Cause lasting stress on the shield.
if(gen?.check_flag(MODEFLAG_BYPASS) && !disabled_for)
take_damage(duration * rand(8, 12), SHIELD_DAMTYPE_EM)
@@ -116,7 +116,7 @@
update_nearby_tiles() //Force ZAS update
update_explosion_resistance()
-/obj/effect/shield/attack_generic(var/source, var/damage, var/emote)
+/obj/effect/shield/attack_generic(source, damage, emote)
take_damage(damage, SHIELD_DAMTYPE_PHYSICAL)
if(gen.check_flag(MODEFLAG_OVERCHARGE) && istype(source, /mob/living/))
overcharge_shock(source)
@@ -124,7 +124,7 @@
// Fails shield segments in specific range. Range of 1 affects the shielded turf only.
-/obj/effect/shield/proc/fail_adjacent_segments(var/range, var/hitby = null)
+/obj/effect/shield/proc/fail_adjacent_segments(range, hitby = null)
if(hitby)
visible_message(span_danger("\The [src] flashes a bit as \the [hitby] collides with it, eventually fading out in a rain of sparks!"))
else
@@ -139,7 +139,7 @@
S.fail(-(-range + get_dist(src, S)) * 2)
// Small visual effect, makes the shield tiles brighten up by becoming more opaque for a moment, and spreads to nearby shields.
-/obj/effect/shield/proc/flash_adjacent_segments(var/range)
+/obj/effect/shield/proc/flash_adjacent_segments(range)
range = between(1, range, 10) // Sanity check
for(var/obj/effect/shield/S in range(range, src))
// Don't affect shields owned by other shield generators
@@ -156,10 +156,10 @@
animate(src, alpha = initial(alpha), time = 1 SECOND)
// Just for fun
-/obj/effect/shield/attack_hand(var/user)
+/obj/effect/shield/attack_hand(user)
flash_adjacent_segments(3)
-/obj/effect/shield/take_damage(var/damage, var/damtype, var/hitby)
+/obj/effect/shield/take_damage(damage, damtype, hitby)
if(!gen)
qdel(src)
return
@@ -193,7 +193,7 @@
// As we have various shield modes, this handles whether specific things can pass or not.
-/obj/effect/shield/CanPass(var/atom/movable/mover, var/turf/target)
+/obj/effect/shield/CanPass(atom/movable/mover, turf/target)
// Somehow we don't have a generator. This shouldn't happen. Delete the shield.
if(!gen)
qdel(src)
@@ -206,7 +206,7 @@
return mover.can_pass_shield(gen)
return 1
-/obj/effect/shield/proc/set_can_atmos_pass(var/new_value)
+/obj/effect/shield/proc/set_can_atmos_pass(new_value)
if(new_value == can_atmos_pass)
return
can_atmos_pass = new_value
@@ -221,7 +221,7 @@
take_damage(rand(30,60) / severity, SHIELD_DAMTYPE_EM)
// Explosions
-/obj/effect/shield/ex_act(var/severity)
+/obj/effect/shield/ex_act(severity)
if(!disabled_for)
take_damage(rand(10,15) / severity, SHIELD_DAMTYPE_PHYSICAL)
@@ -233,7 +233,7 @@
// Projectiles
-/obj/effect/shield/bullet_act(var/obj/item/projectile/proj)
+/obj/effect/shield/bullet_act(obj/item/projectile/proj)
if(proj.damage_type == BURN)
take_damage(proj.get_structure_damage(), SHIELD_DAMTYPE_HEAT)
else if (proj.damage_type == BRUTE)
@@ -243,7 +243,7 @@
// Attacks with hand tools. Blocked by Hyperkinetic flag.
-/obj/effect/shield/attackby(var/obj/item/I as obj, var/mob/user as mob)
+/obj/effect/shield/attackby(obj/item/I as obj, mob/user as mob)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
@@ -260,7 +260,7 @@
// Special treatment for meteors because they would otherwise penetrate right through the shield.
-/obj/effect/shield/Bumped(var/atom/movable/mover)
+/obj/effect/shield/Bumped(atom/movable/mover)
if(!gen)
qdel(src)
return 0
@@ -268,11 +268,11 @@
return ..()
// Meteors call this instad of Bumped for some reason
-/obj/effect/shield/handle_meteor_impact(var/obj/effect/meteor/meteor)
+/obj/effect/shield/handle_meteor_impact(obj/effect/meteor/meteor)
meteor.shield_impact(src)
return !QDELETED(meteor) // If it was stopped it will have been deleted
-/obj/effect/shield/proc/overcharge_shock(var/mob/living/M)
+/obj/effect/shield/proc/overcharge_shock(mob/living/M)
M.adjustFireLoss(rand(20, 40))
M.Weaken(5)
to_chat(M, span_danger("As you come into contact with \the [src] a surge of energy paralyses you!"))
@@ -312,44 +312,44 @@
//
// Called only if shield is active/not destroyed etc.
-/atom/movable/proc/can_pass_shield(var/obj/machinery/power/shield_generator/gen)
+/atom/movable/proc/can_pass_shield(obj/machinery/power/shield_generator/gen)
return 1
// Other mobs
-/mob/living/can_pass_shield(var/obj/machinery/power/shield_generator/gen)
+/mob/living/can_pass_shield(obj/machinery/power/shield_generator/gen)
return !gen.check_flag(MODEFLAG_NONHUMANS)
// Human mobs
-/mob/living/carbon/human/can_pass_shield(var/obj/machinery/power/shield_generator/gen)
+/mob/living/carbon/human/can_pass_shield(obj/machinery/power/shield_generator/gen)
if(isSynthetic())
return !gen.check_flag(MODEFLAG_ANORGANIC)
return !gen.check_flag(MODEFLAG_HUMANOIDS)
// Silicon mobs
-/mob/living/silicon/can_pass_shield(var/obj/machinery/power/shield_generator/gen)
+/mob/living/silicon/can_pass_shield(obj/machinery/power/shield_generator/gen)
return !gen.check_flag(MODEFLAG_ANORGANIC)
// Generic objects. Also applies to bullets and meteors.
-/obj/can_pass_shield(var/obj/machinery/power/shield_generator/gen)
+/obj/can_pass_shield(obj/machinery/power/shield_generator/gen)
return !gen.check_flag(MODEFLAG_HYPERKINETIC)
// Beams
-/obj/item/projectile/beam/can_pass_shield(var/obj/machinery/power/shield_generator/gen)
+/obj/item/projectile/beam/can_pass_shield(obj/machinery/power/shield_generator/gen)
return !gen.check_flag(MODEFLAG_PHOTONIC)
// Shield on-impact logic here. This is called only if the object is actually blocked by the field (can_pass_shield applies first)
-/atom/movable/proc/shield_impact(var/obj/effect/shield/S)
+/atom/movable/proc/shield_impact(obj/effect/shield/S)
return
-/mob/living/shield_impact(var/obj/effect/shield/S)
+/mob/living/shield_impact(obj/effect/shield/S)
if(!S.gen.check_flag(MODEFLAG_OVERCHARGE))
return
S.overcharge_shock(src)
-/obj/effect/meteor/shield_impact(var/obj/effect/shield/S)
+/obj/effect/meteor/shield_impact(obj/effect/shield/S)
if(!S.gen.check_flag(MODEFLAG_HYPERKINETIC))
return
S.take_damage(get_shield_damage(), SHIELD_DAMTYPE_PHYSICAL, src)
diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm
index f0f0101913..8fa28313b3 100644
--- a/code/modules/shieldgen/sheldwallgen.dm
+++ b/code/modules/shieldgen/sheldwallgen.dm
@@ -115,7 +115,7 @@
src.active = 0
for(var/dir in list(1,2,4,8)) src.cleanup(dir)
-/obj/machinery/shieldwallgen/proc/setup_field(var/NSEW = 0)
+/obj/machinery/shieldwallgen/proc/setup_field(NSEW = 0)
var/turf/T = src.loc
var/turf/T2 = src.loc
var/obj/machinery/shieldwallgen/G
@@ -190,7 +190,7 @@
src.add_fingerprint(user)
visible_message(span_red("The [src.name] has been hit with \the [W.name] by [user.name]!"))
-/obj/machinery/shieldwallgen/proc/cleanup(var/NSEW)
+/obj/machinery/shieldwallgen/proc/cleanup(NSEW)
var/obj/machinery/shieldwall/F
var/obj/machinery/shieldwallgen/G
var/turf/T = src.loc
@@ -215,7 +215,7 @@
src.cleanup(8)
. = ..()
-/obj/machinery/shieldwallgen/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/shieldwallgen/bullet_act(obj/item/projectile/Proj)
storedpower -= 400 * Proj.get_structure_damage()
..()
return
@@ -242,7 +242,7 @@
var/power_usage = 2500 //how much power it takes to sustain the shield
var/generate_power_usage = 7500 //how much power it takes to start up the shield
-/obj/machinery/shieldwall/Initialize(mapload, var/obj/machinery/shieldwallgen/A, var/obj/machinery/shieldwallgen/B)
+/obj/machinery/shieldwall/Initialize(mapload, obj/machinery/shieldwallgen/A, obj/machinery/shieldwallgen/B)
. = ..()
update_nearby_tiles()
src.gen_primary = A
@@ -280,7 +280,7 @@
gen_secondary.storedpower -= power_usage
-/obj/machinery/shieldwall/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/shieldwall/bullet_act(obj/item/projectile/Proj)
if(needs_power)
var/obj/machinery/shieldwallgen/G
if(prob(50))
diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm
index ad68d95eb0..d22b3f12e7 100644
--- a/code/modules/shieldgen/shield_capacitor.dm
+++ b/code/modules/shieldgen/shield_capacitor.dm
@@ -31,7 +31,7 @@
max_charge = 12e6
max_charge_rate = 600000
-/obj/machinery/shield_capacitor/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/shield_capacitor/emag_act(remaining_charges, mob/user)
if(prob(75))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
diff --git a/code/modules/shieldgen/shield_diffuser.dm b/code/modules/shieldgen/shield_diffuser.dm
index 76a6f483bc..33dd884f5c 100644
--- a/code/modules/shieldgen/shield_diffuser.dm
+++ b/code/modules/shieldgen/shield_diffuser.dm
@@ -22,7 +22,7 @@
hide(!T.is_plating())
//If underfloor, hide the cable^H^H diffuser
-/obj/machinery/shield_diffuser/hide(var/i)
+/obj/machinery/shield_diffuser/hide(i)
if(istype(loc, /turf))
invisibility = i ? INVISIBILITY_ABSTRACT : INVISIBILITY_NONE
update_icon()
@@ -69,7 +69,7 @@
update_icon()
to_chat(user, "You turn \the [src] [enabled ? "on" : "off"].")
-/obj/machinery/shield_diffuser/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/shield_diffuser/attackby(obj/item/W, mob/user)
if(default_deconstruction_screwdriver(user, W))
return
if(default_deconstruction_crowbar(user, W))
@@ -78,13 +78,13 @@
return
return ..()
-/obj/machinery/shield_diffuser/proc/meteor_alarm(var/duration)
+/obj/machinery/shield_diffuser/proc/meteor_alarm(duration)
if(!duration)
return
alarm = round(max(alarm, duration))
update_icon()
-/obj/machinery/shield_diffuser/examine(var/mob/user)
+/obj/machinery/shield_diffuser/examine(mob/user)
. = ..()
. += "It is [enabled ? "enabled" : "disabled"]."
if(alarm)
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index f10c7dc2af..1c8c5f32a4 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -51,7 +51,7 @@
QDEL_NULL(shield_hum)
return ..()
-/obj/machinery/shield_gen/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/shield_gen/emag_act(remaining_charges, mob/user)
if(prob(75))
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
@@ -223,7 +223,7 @@
. = TRUE
-/obj/machinery/shield_gen/ex_act(var/severity)
+/obj/machinery/shield_gen/ex_act(severity)
if(active)
toggle()
return ..()
@@ -310,7 +310,7 @@
return out
-/obj/machinery/shield_gen/proc/get_shielded_turfs_on_z_level(var/turf/gen_turf)
+/obj/machinery/shield_gen/proc/get_shielded_turfs_on_z_level(turf/gen_turf)
var/list/out = list()
if (!gen_turf)
diff --git a/code/modules/shieldgen/shield_gen_external.dm b/code/modules/shieldgen/shield_gen_external.dm
index 284427520a..8efc82ce99 100644
--- a/code/modules/shieldgen/shield_gen_external.dm
+++ b/code/modules/shieldgen/shield_gen_external.dm
@@ -10,7 +10,7 @@
energy_conversion_rate = 0.0012
//Search for space turfs within range that are adjacent to a simulated turf.
-/obj/machinery/shield_gen/external/get_shielded_turfs_on_z_level(var/turf/gen_turf)
+/obj/machinery/shield_gen/external/get_shielded_turfs_on_z_level(turf/gen_turf)
var/list/out = list()
if (!gen_turf)
diff --git a/code/modules/shieldgen/shield_generator.dm b/code/modules/shieldgen/shield_generator.dm
index 299f840459..23cba28e9b 100644
--- a/code/modules/shieldgen/shield_generator.dm
+++ b/code/modules/shieldgen/shield_generator.dm
@@ -246,7 +246,7 @@
//Phew, update our own icon
update_icon()
-/obj/machinery/power/shield_generator/proc/do_corner_shield(var/obj/effect/shield/S, var/new_dir, var/force_outside)
+/obj/machinery/power/shield_generator/proc/do_corner_shield(obj/effect/shield/S, new_dir, force_outside)
S.enabled_icon_state = "blank"
S.set_dir(new_dir)
var/inside = force_outside ? FALSE : isspace(get_step(S, new_dir))
@@ -381,7 +381,7 @@
for(var/obj/effect/shield/S in field_segments)
S.fail(1)
-/obj/machinery/power/shield_generator/proc/set_idle(var/new_state)
+/obj/machinery/power/shield_generator/proc/set_idle(new_state)
if(new_state)
if(running == SHIELD_IDLE)
return
@@ -537,7 +537,7 @@
// Takes specific amount of damage
-/obj/machinery/power/shield_generator/proc/deal_shield_damage(var/damage, var/shield_damtype)
+/obj/machinery/power/shield_generator/proc/deal_shield_damage(damage, shield_damtype)
var/energy_to_use = damage * ENERGY_PER_HP
if(check_flag(MODEFLAG_MODULATE))
mitigation_em -= MITIGATION_HIT_LOSS
@@ -576,11 +576,11 @@
// Checks whether specific flags are enabled
-/obj/machinery/power/shield_generator/proc/check_flag(var/flag)
+/obj/machinery/power/shield_generator/proc/check_flag(flag)
return (shield_modes & flag)
-/obj/machinery/power/shield_generator/proc/toggle_flag(var/flag)
+/obj/machinery/power/shield_generator/proc/toggle_flag(flag)
shield_modes ^= flag
update_upkeep_multiplier()
for(var/obj/effect/shield/S in field_segments)
diff --git a/code/modules/shuttles/crashes.dm b/code/modules/shuttles/crashes.dm
index 3dfaf270f2..886c03b19c 100644
--- a/code/modules/shuttles/crashes.dm
+++ b/code/modules/shuttles/crashes.dm
@@ -18,17 +18,17 @@
// Return 0 to let the jump continue, 1 to abort the jump.
// Default implementation checks if the shuttle should crash and if so crashes it.
-/datum/shuttle/proc/process_longjump(var/obj/effect/shuttle_landmark/intended_destination)
+/datum/shuttle/proc/process_longjump(obj/effect/shuttle_landmark/intended_destination)
if(should_crash(intended_destination))
do_crash(intended_destination)
return 1
// Decide if this is the time we crash. Return true for yes
-/datum/shuttle/proc/should_crash(var/obj/effect/shuttle_landmark/intended_destination)
+/datum/shuttle/proc/should_crash(obj/effect/shuttle_landmark/intended_destination)
return FALSE
// Actually crash the shuttle
-/datum/shuttle/proc/do_crash(var/obj/effect/shuttle_landmark/intended_destination)
+/datum/shuttle/proc/do_crash(obj/effect/shuttle_landmark/intended_destination)
// Choose the target
var/obj/effect/shuttle_landmark/target = pick(crash_locations)
ASSERT(istype(target))
@@ -46,7 +46,7 @@
//SHAKA SHAKA SHAKA
addtimer(CALLBACK(src, PROC_REF(after_crash), victims, target), 2 SECONDS)
-/datum/shuttle/proc/after_crash(var/list/victims, var/obj/effect/shuttle_landmark/target)
+/datum/shuttle/proc/after_crash(list/victims, obj/effect/shuttle_landmark/target)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm
index 37144bf737..b5f9e8416a 100644
--- a/code/modules/shuttles/escape_pods.dm
+++ b/code/modules/shuttles/escape_pods.dm
@@ -99,7 +99,7 @@
"internalTemplateName" = "EscapePodBerthConsole",
)
-/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/emag_act(remaining_charges, mob/user)
if (!emagged)
to_chat(user, span_notice("You emag the [src], arming the escape pod!"))
emagged = 1
diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm
index 338f180f01..c5c1e01cb4 100644
--- a/code/modules/shuttles/landmarks.dm
+++ b/code/modules/shuttles/landmarks.dm
@@ -70,10 +70,10 @@
map_destination.add_landmark(src, shuttle_restricted)
//Called when the landmark is added to an overmap sector.
-/obj/effect/shuttle_landmark/proc/sector_set(var/obj/effect/overmap/visitable/O, shuttle_name)
+/obj/effect/shuttle_landmark/proc/sector_set(obj/effect/overmap/visitable/O, shuttle_name)
shuttle_restricted = shuttle_name
-/obj/effect/shuttle_landmark/proc/is_valid(var/datum/shuttle/shuttle)
+/obj/effect/shuttle_landmark/proc/is_valid(datum/shuttle/shuttle)
if(shuttle.current_location == src)
return FALSE
for(var/area/A in shuttle.shuttle_area)
@@ -87,7 +87,7 @@
return TRUE
// This creates a graphical warning to where the shuttle is about to land in approximately five seconds.
-/obj/effect/shuttle_landmark/proc/create_warning_effect(var/datum/shuttle/shuttle)
+/obj/effect/shuttle_landmark/proc/create_warning_effect(datum/shuttle/shuttle)
if(shuttle.current_location == src)
return // TOO LATE!
for(var/area/A in shuttle.shuttle_area)
@@ -131,7 +131,7 @@
landmark_tag += "-[x]-[y]-[z]-[random_id("landmarks",1,9999)]"
return ..()
-/obj/effect/shuttle_landmark/automatic/sector_set(var/obj/effect/overmap/visitable/O)
+/obj/effect/shuttle_landmark/automatic/sector_set(obj/effect/overmap/visitable/O)
..()
name = ("[O.name] - [original_name] ([x],[y])")
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 0b38a90584..2308f3133d 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -34,7 +34,7 @@
// Future Thoughts: Baystation put "docking" stuff in a subtype, leaving base type pure and free of docking stuff. Is this best?
-/datum/shuttle/New(_name, var/obj/effect/shuttle_landmark/initial_location)
+/datum/shuttle/New(_name, obj/effect/shuttle_landmark/initial_location)
..()
if(_name)
src.name = _name
@@ -88,7 +88,7 @@
return
// This creates a graphical warning to where the shuttle is about to land, in approximately five seconds.
-/datum/shuttle/proc/create_warning_effect(var/obj/effect/shuttle_landmark/destination)
+/datum/shuttle/proc/create_warning_effect(obj/effect/shuttle_landmark/destination)
destination.create_warning_effect(src)
// Return false to abort a jump, before the 'warmup' phase.
@@ -101,15 +101,15 @@
// If you need an event to occur when the shuttle jumps in short or long jump, override this.
// Keep in mind that destination is the intended destination, the shuttle may or may not actually reach it.s
-/datum/shuttle/proc/on_shuttle_departure(var/obj/effect/shuttle_landmark/origin, var/obj/effect/shuttle_landmark/destination)
+/datum/shuttle/proc/on_shuttle_departure(obj/effect/shuttle_landmark/origin, obj/effect/shuttle_landmark/destination)
return
// Similar to above, but when it finishes moving to the target. Short jump generally makes this occur immediately after the above proc.
// Keep in mind we might not actually have gotten to destination. Check current_location to be sure where we ended up.
-/datum/shuttle/proc/on_shuttle_arrival(var/obj/effect/shuttle_landmark/origin, var/obj/effect/shuttle_landmark/destination)
+/datum/shuttle/proc/on_shuttle_arrival(obj/effect/shuttle_landmark/origin, obj/effect/shuttle_landmark/destination)
return
-/datum/shuttle/proc/short_jump(var/obj/effect/shuttle_landmark/destination)
+/datum/shuttle/proc/short_jump(obj/effect/shuttle_landmark/destination)
if(moving_status != SHUTTLE_IDLE)
return
@@ -146,7 +146,7 @@
make_sounds(HYPERSPACE_END)
// TODO - Far Future - Would be great if this was driven by process too.
-/datum/shuttle/proc/long_jump(var/obj/effect/shuttle_landmark/destination, var/obj/effect/shuttle_landmark/interim, var/travel_time)
+/datum/shuttle/proc/long_jump(obj/effect/shuttle_landmark/destination, obj/effect/shuttle_landmark/interim, travel_time)
//to_world("shuttle/long_jump: current_location=[current_location], destination=[destination], interim=[interim], travel_time=[travel_time]")
if(moving_status != SHUTTLE_IDLE)
return
@@ -209,7 +209,7 @@
/datum/shuttle/proc/fuel_check()
return 1 //fuel check should always pass in non-overmap shuttles (they have magic engines)
-/datum/shuttle/proc/cancel_launch(var/user)
+/datum/shuttle/proc/cancel_launch(user)
// If we are past warming up its too late to cancel.
if (moving_status == SHUTTLE_WARMUP)
moving_status = SHUTTLE_IDLE
@@ -240,7 +240,7 @@
// Move the shuttle to destination if possible.
// Returns TRUE if we actually moved, otherwise FALSE.
-/datum/shuttle/proc/attempt_move(var/obj/effect/shuttle_landmark/destination, var/interim = FALSE)
+/datum/shuttle/proc/attempt_move(obj/effect/shuttle_landmark/destination, interim = FALSE)
if(current_location == destination)
if(debug_logging)
log_shuttle("Shuttle [src] attempted to move to [destination] but is already there!")
@@ -281,7 +281,7 @@
//just moves the shuttle from A to B
//A note to anyone overriding move in a subtype. perform_shuttle_move() must absolutely not, under any circumstances, fail to move the shuttle.
//If you want to conditionally cancel shuttle launches, that logic must go in short_jump() or long_jump()
-/datum/shuttle/proc/perform_shuttle_move(var/obj/effect/shuttle_landmark/destination, var/list/turf_translation)
+/datum/shuttle/proc/perform_shuttle_move(obj/effect/shuttle_landmark/destination, list/turf_translation)
if(debug_logging)
log_shuttle("perform_shuttle_move() current=[current_location] destination=[destination]")
//to_world("move_shuttle() called for [name] leaving [origin] en route to [destination].")
@@ -402,7 +402,7 @@
/datum/shuttle/proc/has_arrive_time()
return (moving_status == SHUTTLE_INTRANSIT)
-/datum/shuttle/proc/make_sounds(var/sound_type)
+/datum/shuttle/proc/make_sounds(sound_type)
var/sound_to_play = null
switch(sound_type)
if(HYPERSPACE_WARMUP)
@@ -415,7 +415,7 @@
for(var/obj/machinery/door/E in A) //dumb, I know, but playing it on the engines doesn't do it justice
playsound(E, sound_to_play, 50, FALSE)
-/datum/shuttle/proc/message_passengers(var/message)
+/datum/shuttle/proc/message_passengers(message)
for(var/area/A in shuttle_area)
for(var/mob/M in A)
M.show_message(message, 2)
diff --git a/code/modules/shuttles/shuttle_autodock.dm b/code/modules/shuttles/shuttle_autodock.dm
index 530ff676e7..9c88bfef2a 100644
--- a/code/modules/shuttles/shuttle_autodock.dm
+++ b/code/modules/shuttles/shuttle_autodock.dm
@@ -19,7 +19,7 @@
category = /datum/shuttle/autodock
flags = SHUTTLE_FLAGS_PROCESS | SHUTTLE_FLAGS_ZERO_G
-/datum/shuttle/autodock/New(var/_name, var/obj/effect/shuttle_landmark/start_waypoint)
+/datum/shuttle/autodock/New(_name, obj/effect/shuttle_landmark/start_waypoint)
..(_name, start_waypoint)
//Initial dock
@@ -45,7 +45,7 @@
return ..()
-/datum/shuttle/autodock/proc/set_docking_codes(var/code)
+/datum/shuttle/autodock/proc/set_docking_codes(code)
docking_codes = code
if(shuttle_docking_controller)
shuttle_docking_controller.docking_codes = code
@@ -55,7 +55,7 @@
..()
// Despite the name this actually updates the SHUTTLE docking conroller, not the active.
-/datum/shuttle/autodock/proc/update_docking_target(var/obj/effect/shuttle_landmark/location)
+/datum/shuttle/autodock/proc/update_docking_target(obj/effect/shuttle_landmark/location)
var/current_dock_target
if(location && location.special_dock_targets && location.special_dock_targets[name])
current_dock_target = location.special_dock_targets[name]
@@ -168,7 +168,7 @@
"Public" procs
*/
// Queue shuttle for undock and launch by shuttle subsystem.
-/datum/shuttle/autodock/proc/launch(var/user)
+/datum/shuttle/autodock/proc/launch(user)
if (!can_launch()) return
in_use = user //obtain an exclusive lock on the shuttle
@@ -177,7 +177,7 @@
undock()
// Queue shuttle for forced undock and launch by shuttle subsystem.
-/datum/shuttle/autodock/proc/force_launch(var/user)
+/datum/shuttle/autodock/proc/force_launch(user)
if (!can_force()) return
in_use = user //obtain an exclusive lock on the shuttle
@@ -185,7 +185,7 @@
process_state = FORCE_LAUNCH
// Cancel queued launch.
-/datum/shuttle/autodock/cancel_launch(var/user)
+/datum/shuttle/autodock/cancel_launch(user)
if (!can_cancel()) return
moving_status = SHUTTLE_IDLE
diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm
index 975c6e83b0..77d110a7c2 100644
--- a/code/modules/shuttles/shuttle_console.dm
+++ b/code/modules/shuttles/shuttle_console.dm
@@ -28,7 +28,7 @@
tgui_interact(user)
-/obj/machinery/computer/shuttle_control/proc/shuttlerich_tgui_data(var/datum/shuttle/autodock/shuttle)
+/obj/machinery/computer/shuttle_control/proc/shuttlerich_tgui_data(datum/shuttle/autodock/shuttle)
var/shuttle_state
switch(shuttle.moving_status)
if(SHUTTLE_IDLE) shuttle_state = "idle"
@@ -68,7 +68,7 @@
// This is a subset of the actual checks; contains those that give messages to the user.
// This enables us to give nice error messages as well as not even bother proceeding if we can't.
-/obj/machinery/computer/shuttle_control/proc/can_move(var/datum/shuttle/autodock/shuttle, var/user)
+/obj/machinery/computer/shuttle_control/proc/can_move(datum/shuttle/autodock/shuttle, user)
var/cannot_depart = shuttle.current_location.cannot_depart(shuttle)
if(cannot_depart)
to_chat(user, span_warning("[cannot_depart]"))
@@ -132,13 +132,13 @@
return shuttlerich_tgui_data(shuttle)
// Call to set the linked shuttle tag; override to add behaviour to shuttle tag changes
-/obj/machinery/computer/shuttle_control/proc/set_shuttle_tag(var/new_shuttle_tag)
+/obj/machinery/computer/shuttle_control/proc/set_shuttle_tag(new_shuttle_tag)
if(shuttle_tag == new_shuttle_tag)
return FALSE
shuttle_tag = new_shuttle_tag
return TRUE
-/obj/machinery/computer/shuttle_control/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/shuttle_control/emag_act(remaining_charges, mob/user)
if (!hacked)
req_access = list()
req_one_access = list()
@@ -146,7 +146,7 @@
to_chat(user, "You short out the console's ID checking system. It's now available to everyone!")
return 1
-/obj/machinery/computer/shuttle_control/bullet_act(var/obj/item/projectile/Proj)
+/obj/machinery/computer/shuttle_control/bullet_act(obj/item/projectile/Proj)
visible_message("\The [Proj] ricochets off \the [src]!")
/obj/machinery/computer/shuttle_control/ex_act()
diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm
index 350fda94de..8976884e45 100644
--- a/code/modules/shuttles/shuttle_console_multi.dm
+++ b/code/modules/shuttles/shuttle_console_multi.dm
@@ -2,7 +2,7 @@
circuit = /obj/item/circuitboard/shuttle_console/multi
tgui_subtemplate = "ShuttleControlConsoleMulti"
-/obj/machinery/computer/shuttle_control/multi/shuttlerich_tgui_data(var/datum/shuttle/autodock/multi/shuttle)
+/obj/machinery/computer/shuttle_control/multi/shuttlerich_tgui_data(datum/shuttle/autodock/multi/shuttle)
. = ..()
if(istype(shuttle))
. += list(
diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm
index cc38b931d5..211dafa35b 100644
--- a/code/modules/shuttles/shuttle_emergency.dm
+++ b/code/modules/shuttles/shuttle_emergency.dm
@@ -19,7 +19,7 @@
SSemergency_shuttle.shuttle_arrived()
-/datum/shuttle/autodock/ferry/emergency/long_jump(var/destination, var/interim, var/travel_time)
+/datum/shuttle/autodock/ferry/emergency/long_jump(destination, interim, travel_time)
if (!location)
travel_time = SHUTTLE_TRANSIT_DURATION_RETURN
else
@@ -43,14 +43,14 @@
GLOB.priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_leaving_dock, "%dock_name%", "[using_map.dock_name]"), "%ETA%", "[estimated_time] minute\s"), new_sound = ANNOUNCER_MSG_SHUTTLE_ENDROUND_RETURNING)
..()
-/datum/shuttle/autodock/ferry/emergency/can_launch(var/user)
+/datum/shuttle/autodock/ferry/emergency/can_launch(user)
if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
var/obj/machinery/computer/shuttle_control/emergency/C = user
if (!C.has_authorization())
return 0
return ..()
-/datum/shuttle/autodock/ferry/emergency/can_force(var/user)
+/datum/shuttle/autodock/ferry/emergency/can_force(user)
if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
var/obj/machinery/computer/shuttle_control/emergency/C = user
@@ -60,14 +60,14 @@
return 0
return ..()
-/datum/shuttle/autodock/ferry/emergency/can_cancel(var/user)
+/datum/shuttle/autodock/ferry/emergency/can_cancel(user)
if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
var/obj/machinery/computer/shuttle_control/emergency/C = user
if (!C.has_authorization())
return 0
return ..()
-/datum/shuttle/autodock/ferry/emergency/launch(var/user)
+/datum/shuttle/autodock/ferry/emergency/launch(user)
if (!can_launch(user)) return
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
@@ -81,7 +81,7 @@
..(user)
-/datum/shuttle/autodock/ferry/emergency/force_launch(var/user)
+/datum/shuttle/autodock/ferry/emergency/force_launch(user)
if (!can_force(user)) return
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
@@ -95,7 +95,7 @@
..(user)
-/datum/shuttle/autodock/ferry/emergency/cancel_launch(var/user)
+/datum/shuttle/autodock/ferry/emergency/cancel_launch(user)
if (!can_cancel(user)) return
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
@@ -136,7 +136,7 @@
authorized = initial(authorized)
//returns 1 if the ID was accepted and a new authorization was added, 0 otherwise
-/obj/machinery/computer/shuttle_control/emergency/proc/read_authorization(var/obj/item/ident)
+/obj/machinery/computer/shuttle_control/emergency/proc/read_authorization(obj/item/ident)
if (!ident || !istype(ident))
return 0
if (authorized.len >= req_authorizations)
@@ -180,7 +180,7 @@
return 1
-/obj/machinery/computer/shuttle_control/emergency/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/computer/shuttle_control/emergency/emag_act(remaining_charges, mob/user)
if (!emagged)
to_chat(user, span_notice("You short out \the [src]'s authorization protocols."))
emagged = 1
diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm
index 24c00f0a6d..2fde01db2f 100644
--- a/code/modules/shuttles/shuttle_ferry.dm
+++ b/code/modules/shuttles/shuttle_ferry.dm
@@ -9,7 +9,7 @@
category = /datum/shuttle/autodock/ferry
-/datum/shuttle/autodock/ferry/New(var/_name)
+/datum/shuttle/autodock/ferry/New(_name)
if(landmark_station)
landmark_station = SSshuttles.get_landmark(landmark_station)
if(landmark_offsite)
@@ -29,11 +29,11 @@
return landmark_station
return landmark_offsite
-/datum/shuttle/autodock/ferry/short_jump(var/destination)
+/datum/shuttle/autodock/ferry/short_jump(destination)
direction = !location // Heading away from where we currently are
. = ..()
-/datum/shuttle/autodock/ferry/long_jump(var/destination, var/obj/effect/shuttle_landmark/interim, var/travel_time)
+/datum/shuttle/autodock/ferry/long_jump(destination, obj/effect/shuttle_landmark/interim, travel_time)
direction = !location // Heading away from where we currently are
. = ..()
@@ -48,7 +48,7 @@
next_location = get_location_waypoint(!location)
// Ferry shuttles should generally always be able to dock. So read the docking codes off of the target.
-/datum/shuttle/autodock/ferry/update_docking_target(var/obj/effect/shuttle_landmark/location)
+/datum/shuttle/autodock/ferry/update_docking_target(obj/effect/shuttle_landmark/location)
..()
if(active_docking_controller && active_docking_controller.docking_codes)
set_docking_codes(active_docking_controller.docking_codes)
diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm
index 75b9c9b3e1..cd9d2d9dbd 100644
--- a/code/modules/shuttles/shuttle_specops.dm
+++ b/code/modules/shuttles/shuttle_specops.dm
@@ -23,12 +23,12 @@
announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky.
announcer.config(list(CHANNEL_RESPONSE_TEAM = 0))
-/datum/shuttle/autodock/ferry/specops/proc/radio_announce(var/message)
+/datum/shuttle/autodock/ferry/specops/proc/radio_announce(message)
if(announcer)
announcer.autosay(message, "A.L.I.C.E.", CHANNEL_RESPONSE_TEAM)
-/datum/shuttle/autodock/ferry/specops/launch(var/user)
+/datum/shuttle/autodock/ferry/specops/launch(user)
if (!can_launch())
return
@@ -206,7 +206,7 @@
brightness_color = "#DA0205"
var/state = 0
-/obj/machinery/light/small/readylight/proc/set_state(var/new_state)
+/obj/machinery/light/small/readylight/proc/set_state(new_state)
state = new_state
if(state)
brightness_color = "00FF00"
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index 616f904377..34653f34a2 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -6,7 +6,7 @@
flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY
category = /datum/shuttle/autodock/ferry/supply
-/datum/shuttle/autodock/ferry/supply/short_jump(var/obj/effect/shuttle_landmark/destination)
+/datum/shuttle/autodock/ferry/supply/short_jump(obj/effect/shuttle_landmark/destination)
if(moving_status != SHUTTLE_IDLE)
return
diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm
index 1e9668c50d..d70af051fc 100644
--- a/code/modules/shuttles/shuttles_multi.dm
+++ b/code/modules/shuttles/shuttles_multi.dm
@@ -27,7 +27,7 @@
start_location = current_location
last_location = current_location
-/datum/shuttle/autodock/multi/proc/set_destination(var/destination_key, mob/user)
+/datum/shuttle/autodock/multi/proc/set_destination(destination_key, mob/user)
if(moving_status != SHUTTLE_IDLE)
return
next_location = destinations_cache[destination_key]
diff --git a/code/modules/shuttles/shuttles_vr.dm b/code/modules/shuttles/shuttles_vr.dm
index 227d254b43..dda67ae455 100644
--- a/code/modules/shuttles/shuttles_vr.dm
+++ b/code/modules/shuttles/shuttles_vr.dm
@@ -1,7 +1,7 @@
/datum/shuttle
var/move_direction //Null is legacy behavior, otherwise people are thrown in the opposite direction
-/datum/shuttle/proc/throw_a_mob(var/mob/living/carbon/M, direction)
+/datum/shuttle/proc/throw_a_mob(mob/living/carbon/M, direction)
direction = turn(direction, 180)
var/atom/target
switch(direction)
diff --git a/code/modules/shuttles/shuttles_web.dm b/code/modules/shuttles/shuttles_web.dm
index 3e4628ef6d..07ec673f3e 100644
--- a/code/modules/shuttles/shuttles_web.dm
+++ b/code/modules/shuttles/shuttles_web.dm
@@ -416,7 +416,7 @@
. = ..()
// This is called whenever a shuttle is initialized. If its our shuttle, do our thing!
-/obj/shuttle_connector/proc/setup_routes(var/new_shuttle)
+/obj/shuttle_connector/proc/setup_routes(new_shuttle)
SIGNAL_HANDLER
var/datum/shuttle/autodock/web_shuttle/ES = SSshuttles.shuttles[shuttle_name]
if(ES != new_shuttle)
diff --git a/code/modules/shuttles/web_datums.dm b/code/modules/shuttles/web_datums.dm
index 060c0044ce..7c7a0ac289 100644
--- a/code/modules/shuttles/web_datums.dm
+++ b/code/modules/shuttles/web_datums.dm
@@ -12,7 +12,7 @@
var/travel_time = 0 // How long it takes to move from start to end, or end to start. Set to 0 for instant travel.
var/one_way = FALSE // If true, you can't travel from end to start.
-/datum/shuttle_route/New(var/_start, var/_end, var/_interim, var/_time = 0, var/_oneway = FALSE)
+/datum/shuttle_route/New(_start, _end, _interim, _time = 0, _oneway = FALSE)
start = _start
end = _end
if(_interim)
@@ -25,14 +25,14 @@
end.routes -= src
return ..()
-/datum/shuttle_route/proc/get_other_side(var/datum/shuttle_destination/PoV)
+/datum/shuttle_route/proc/get_other_side(datum/shuttle_destination/PoV)
if(PoV == start)
return end
if(PoV == end)
return start
return null
-/datum/shuttle_route/proc/display_route(var/datum/shuttle_destination/PoV)
+/datum/shuttle_route/proc/display_route(datum/shuttle_destination/PoV)
var/datum/shuttle_destination/target = null
if(PoV == start)
target = end
@@ -69,7 +69,7 @@
// The list format is '/datum/shuttle_destination/subtype = 1 MINUTES'
var/list/routes_to_make = list()
-/datum/shuttle_destination/New(var/new_master)
+/datum/shuttle_destination/New(new_master)
my_landmark = SSshuttles.get_landmark(my_landmark)
if(!my_landmark)
log_mapping("Web shuttle destination '[name]' could not find its landmark '[my_landmark]'.") // Important error message
@@ -84,7 +84,7 @@
// build_destinations()
// This builds destination instances connected to this instance, recursively.
-/datum/shuttle_destination/proc/build_destinations(var/list/already_made = list())
+/datum/shuttle_destination/proc/build_destinations(list/already_made = list())
already_made += src.type
to_chat(world, "SHUTTLES: [name] is going to build destinations. already_made list is \[[english_list(already_made)]\]")
for(var/type_to_make in destinations_to_create)
@@ -105,10 +105,10 @@
to_chat(world, "SHUTTLES: [name] has finished building destinations. already_made list is \[[english_list(already_made)]\].")
return already_made
-/datum/shuttle_destination/proc/enter(var/datum/shuttle_destination/old_destination)
+/datum/shuttle_destination/proc/enter(datum/shuttle_destination/old_destination)
announce_arrival()
-/datum/shuttle_destination/proc/exit(var/datum/shuttle_destination/new_destination)
+/datum/shuttle_destination/proc/exit(datum/shuttle_destination/new_destination)
announce_departure()
/datum/shuttle_destination/proc/get_departure_message()
@@ -135,7 +135,7 @@
else
GLOB.global_announcer.autosay(get_arrival_message(),(announcer ? announcer : "[using_map.boss_name]"))
-/datum/shuttle_destination/proc/link_destinations(var/datum/shuttle_destination/other_place, var/interim_tag, var/travel_time = 0)
+/datum/shuttle_destination/proc/link_destinations(datum/shuttle_destination/other_place, interim_tag, travel_time = 0)
// First, check to make sure this doesn't cause a duplicate route.
for(var/datum/shuttle_route/R in routes)
if(R.start == other_place || R.end == other_place)
@@ -177,7 +177,7 @@
var/list/autopaths = list() // Potential autopaths the autopilot can use. The autopath's start var must equal current_destination to be viable.
var/autopath_class = null // Similar to destination_class, used for typesof().
-/datum/shuttle_web_master/New(var/new_shuttle, var/new_destination_class = null)
+/datum/shuttle_web_master/New(new_shuttle, new_destination_class = null)
my_shuttle = new_shuttle
if(new_destination_class)
destination_class = new_destination_class
@@ -223,7 +223,7 @@
RETURN_TYPE(/datum/shuttle_destination)
return current_destination
-/datum/shuttle_web_master/proc/get_destination_by_type(var/type_to_get)
+/datum/shuttle_web_master/proc/get_destination_by_type(type_to_get)
return locate(type_to_get) in destinations
// Autopilot stuff.
diff --git a/code/modules/spells/aoe_turf/blink.dm b/code/modules/spells/aoe_turf/blink.dm
index 23e8ea6d4b..6c9393cbfe 100644
--- a/code/modules/spells/aoe_turf/blink.dm
+++ b/code/modules/spells/aoe_turf/blink.dm
@@ -12,7 +12,7 @@
cooldown_min = 5 //4 deciseconds reduction per rank
hud_state = "wiz_blink"
-/datum/spell/aoe_turf/blink/cast(var/list/targets, mob/user)
+/datum/spell/aoe_turf/blink/cast(list/targets, mob/user)
if(!targets.len)
return
diff --git a/code/modules/spells/aoe_turf/charge.dm b/code/modules/spells/aoe_turf/charge.dm
index 15c6d7fd16..aeed9cf769 100644
--- a/code/modules/spells/aoe_turf/charge.dm
+++ b/code/modules/spells/aoe_turf/charge.dm
@@ -12,17 +12,17 @@
hud_state = "wiz_charge"
-/datum/spell/aoe_turf/charge/cast(var/list/targets, mob/user)
+/datum/spell/aoe_turf/charge/cast(list/targets, mob/user)
for(var/turf/T in targets)
depth_cast(T)
-/datum/spell/aoe_turf/charge/proc/depth_cast(var/list/targets)
+/datum/spell/aoe_turf/charge/proc/depth_cast(list/targets)
for(var/atom/A in targets)
if(A.contents.len)
depth_cast(A.contents)
cast_charge(A)
-/datum/spell/aoe_turf/charge/proc/mob_charge(var/mob/living/M)
+/datum/spell/aoe_turf/charge/proc/mob_charge(mob/living/M)
if(M.spell_list.len != 0)
for(var/datum/spell/S in M.spell_list)
if(!istype(S, /datum/spell/aoe_turf/charge))
@@ -32,7 +32,7 @@
to_chat(M, span_notice("You feel very strange for a moment, but then it passes."))
return M
-/datum/spell/aoe_turf/charge/proc/cast_charge(var/atom/target)
+/datum/spell/aoe_turf/charge/proc/cast_charge(atom/target)
var/atom/charged_item
if(isliving(target))
diff --git a/code/modules/spells/aoe_turf/conjure/conjure.dm b/code/modules/spells/aoe_turf/conjure/conjure.dm
index acd4baa6d9..f9686c6a7c 100644
--- a/code/modules/spells/aoe_turf/conjure/conjure.dm
+++ b/code/modules/spells/aoe_turf/conjure/conjure.dm
@@ -71,5 +71,5 @@ How they spawn stuff is decided by behaviour vars, which are explained below
conjure_animation(animation, spawn_place)
return
-/datum/spell/aoe_turf/conjure/proc/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/datum/spell/aoe_turf/conjure/proc/conjure_animation(atom/movable/overlay/animation, turf/target)
qdel(animation)
diff --git a/code/modules/spells/aoe_turf/conjure/construct.dm b/code/modules/spells/aoe_turf/conjure/construct.dm
index 4b1aea9cb5..6c514404e8 100644
--- a/code/modules/spells/aoe_turf/conjure/construct.dm
+++ b/code/modules/spells/aoe_turf/conjure/construct.dm
@@ -38,7 +38,7 @@
hud_state = "const_floor"
-/spell/aoe_turf/conjure/floor/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/spell/aoe_turf/conjure/floor/conjure_animation(atom/movable/overlay/animation, turf/target)
animation.icon_state = "cultfloor"
flick("cultfloor",animation)
spawn(10)
@@ -57,7 +57,7 @@
hud_state = "const_wall"
-/spell/aoe_turf/conjure/wall/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
+/spell/aoe_turf/conjure/wall/conjure_animation(atom/movable/overlay/animation, turf/target)
animation.icon_state = "cultwall"
flick("cultwall",animation)
spawn(10)
diff --git a/code/modules/spells/aoe_turf/conjure/forcewall.dm b/code/modules/spells/aoe_turf/conjure/forcewall.dm
index 47dea6f5da..4c4e2d8662 100644
--- a/code/modules/spells/aoe_turf/conjure/forcewall.dm
+++ b/code/modules/spells/aoe_turf/conjure/forcewall.dm
@@ -34,7 +34,7 @@
density = TRUE
unacidable = TRUE
-/obj/effect/forcefield/bullet_act(var/obj/item/projectile/Proj, var/def_zone)
+/obj/effect/forcefield/bullet_act(obj/item/projectile/Proj, def_zone)
var/turf/T = get_turf(src.loc)
if(T)
for(var/mob/M in T)
diff --git a/code/modules/spells/construct_spells.dm b/code/modules/spells/construct_spells.dm
index df3b661f11..8d20c7098f 100644
--- a/code/modules/spells/construct_spells.dm
+++ b/code/modules/spells/construct_spells.dm
@@ -3,7 +3,7 @@
* Moved to game/gamemodes/cult/construct_spells.dm. Here for posterity.
*/
/*
-/proc/findNullRod(var/atom/target)
+/proc/findNullRod(atom/target)
if(istype(target,/obj/item/nullrod))
return 1
else if(target.contents)
diff --git a/code/modules/spells/spell_code.dm b/code/modules/spells/spell_code.dm
index 5fc7abfb9d..de30b88ae8 100644
--- a/code/modules/spells/spell_code.dm
+++ b/code/modules/spells/spell_code.dm
@@ -222,7 +222,7 @@
return 1
-/datum/spell/proc/check_charge(var/skipcharge, mob/user)
+/datum/spell/proc/check_charge(skipcharge, mob/user)
if(!skipcharge)
switch(charge_type)
if(Sp_RECHARGE)
@@ -235,7 +235,7 @@
return 0
return 1
-/datum/spell/proc/take_charge(mob/user = user, var/skipcharge)
+/datum/spell/proc/take_charge(mob/user = user, skipcharge)
if(!skipcharge)
switch(charge_type)
if(Sp_RECHARGE)
@@ -251,7 +251,7 @@
return 0
return 1
-/datum/spell/proc/invocation(mob/user = usr, var/list/targets) //datum/spelling the spell out and setting it on recharge/reducing charges amount
+/datum/spell/proc/invocation(mob/user = usr, list/targets) //datum/spelling the spell out and setting it on recharge/reducing charges amount
switch(invocation_type)
if(SpI_SHOUT)
@@ -271,7 +271,7 @@
///UPGRADING PROCS///
/////////////////////
-/datum/spell/proc/can_improve(var/upgrade_type)
+/datum/spell/proc/can_improve(upgrade_type)
if(level_max[Sp_TOTAL] <= ( spell_levels[Sp_SPEED] + spell_levels[Sp_POWER] )) //too many levels, can't do it
return 0
@@ -321,7 +321,7 @@
return temp
-/datum/spell/proc/spell_do_after(var/mob/user as mob, delay as num, var/numticks = 5)
+/datum/spell/proc/spell_do_after(mob/user as mob, delay as num, numticks = 5)
if(!user || isnull(user))
return 0
if(numticks == 0)
diff --git a/code/modules/spells/spell_projectile.dm b/code/modules/spells/spell_projectile.dm
index 3881c1e3b6..08c6d56dbc 100644
--- a/code/modules/spells/spell_projectile.dm
+++ b/code/modules/spells/spell_projectile.dm
@@ -35,13 +35,13 @@
trails -= trail
qdel(trail)
-/obj/item/projectile/spell_projectile/proc/prox_cast(var/list/targets)
+/obj/item/projectile/spell_projectile/proc/prox_cast(list/targets)
if(loc)
carried.prox_cast(targets, src)
qdel(src)
return
-/obj/item/projectile/spell_projectile/Bump(var/atom/A)
+/obj/item/projectile/spell_projectile/Bump(atom/A)
if(loc && carried)
prox_cast(carried.choose_prox_targets(user = carried.holder, spell_holder = src))
return 1
diff --git a/code/modules/spells/spells.dm b/code/modules/spells/spells.dm
index 3171f52022..74c93b955e 100644
--- a/code/modules/spells/spells.dm
+++ b/code/modules/spells/spells.dm
@@ -29,7 +29,7 @@
// if(Sp_HOLDVAR)
// statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S.connected_button)
-/mob/proc/add_spell(var/datum/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /atom/movable/screen/movable/spell_master)
+/mob/proc/add_spell(datum/spell/spell_to_add, spell_base = "wiz_spell_ready", master_type = /atom/movable/screen/movable/spell_master)
if(!spell_masters)
spell_masters = list()
@@ -60,7 +60,7 @@
return 1
-/mob/proc/remove_spell(var/datum/spell/spell_to_remove)
+/mob/proc/remove_spell(datum/spell/spell_to_remove)
if(!spell_to_remove || !istype(spell_to_remove))
return
@@ -77,7 +77,7 @@
spell_master.remove_spell(spell_to_remove)
return 1
-/mob/proc/silence_spells(var/amount = 0)
+/mob/proc/silence_spells(amount = 0)
if(!(amount >= 0))
return
diff --git a/code/modules/spells/targeted/equip/equip.dm b/code/modules/spells/targeted/equip/equip.dm
index 9983c2fcb9..a89be388f3 100644
--- a/code/modules/spells/targeted/equip/equip.dm
+++ b/code/modules/spells/targeted/equip/equip.dm
@@ -36,5 +36,5 @@
M.remove_from_mob(to_remove)
qdel(to_remove)
-/datum/spell/targeted/equip_item/proc/summon_item(var/newtype)
+/datum/spell/targeted/equip_item/proc/summon_item(newtype)
return new newtype
diff --git a/code/modules/spells/targeted/equip/horsemask.dm b/code/modules/spells/targeted/equip/horsemask.dm
index c9a14f1e1f..3ca8f03ec7 100644
--- a/code/modules/spells/targeted/equip/horsemask.dm
+++ b/code/modules/spells/targeted/equip/horsemask.dm
@@ -28,7 +28,7 @@
span_danger("Your face burns up, and shortly after the fire you realise you have the face of a horse!"))
target.flash_eyes()
-/datum/spell/targeted/equip_item/horsemask/summon_item(var/new_type)
+/datum/spell/targeted/equip_item/horsemask/summon_item(new_type)
var/obj/item/new_item = new new_type
new_item.canremove = FALSE //curses!
new_item.unacidable = TRUE
diff --git a/code/modules/spells/targeted/ethereal_jaunt.dm b/code/modules/spells/targeted/ethereal_jaunt.dm
index 033d31a59e..ca0a593701 100644
--- a/code/modules/spells/targeted/ethereal_jaunt.dm
+++ b/code/modules/spells/targeted/ethereal_jaunt.dm
@@ -57,14 +57,14 @@
qdel(animation)
qdel(holder)
-/datum/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(atom/movable/overlay/animation, mob/living/target)
animation.icon_state = "liquify"
flick("liquify",animation)
-/datum/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/datum/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(atom/movable/overlay/animation, mob/living/target)
flick("reappear",animation)
-/datum/spell/targeted/ethereal_jaunt/proc/jaunt_steam(var/mobloc)
+/datum/spell/targeted/ethereal_jaunt/proc/jaunt_steam(mobloc)
var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
steam.set_up(10, 0, mobloc)
steam.start()
@@ -89,7 +89,7 @@
AM.loc = get_turf(src)
return ..()
-/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
+/obj/effect/dummy/spell_jaunt/relaymove(mob/user, direction)
if (!src.canmove || reappearing) return
var/turf/newLoc = get_step(src,direction)
if(!(newLoc.flags & NOJAUNT))
diff --git a/code/modules/spells/targeted/projectile/fireball.dm b/code/modules/spells/targeted/projectile/fireball.dm
index b38ec16b09..71917effd8 100644
--- a/code/modules/spells/targeted/projectile/fireball.dm
+++ b/code/modules/spells/targeted/projectile/fireball.dm
@@ -27,7 +27,7 @@
hud_state = "wiz_fireball"
-/datum/spell/targeted/projectile/dumbfire/fireball/prox_cast(var/list/targets, spell_holder)
+/datum/spell/targeted/projectile/dumbfire/fireball/prox_cast(list/targets, spell_holder)
for(var/mob/living/M in targets)
apply_spell_damage(M)
explosion(get_turf(spell_holder), ex_severe, ex_heavy, ex_light, ex_flash)
diff --git a/code/modules/spells/targeted/projectile/magic_missile.dm b/code/modules/spells/targeted/projectile/magic_missile.dm
index 42a407c5c5..96632a2d49 100644
--- a/code/modules/spells/targeted/projectile/magic_missile.dm
+++ b/code/modules/spells/targeted/projectile/magic_missile.dm
@@ -23,7 +23,7 @@
amt_dam_fire = 10
-/datum/spell/targeted/projectile/magic_missile/prox_cast(var/list/targets, atom/spell_holder)
+/datum/spell/targeted/projectile/magic_missile/prox_cast(list/targets, atom/spell_holder)
spell_holder.visible_message(span_danger("\The [spell_holder] pops with a flash!"))
for(var/mob/living/M in targets)
apply_spell_damage(M)
diff --git a/code/modules/spells/targeted/projectile/projectile.dm b/code/modules/spells/targeted/projectile/projectile.dm
index 9c8f25448e..80c57a55f0 100644
--- a/code/modules/spells/targeted/projectile/projectile.dm
+++ b/code/modules/spells/targeted/projectile/projectile.dm
@@ -15,7 +15,7 @@ If the spell_projectile is seeking, it will update its target every process and
var/proj_step_delay = 1 //lower = faster
var/cast_prox_range = 1
-/datum/spell/targeted/projectile/cast(list/targets, mob/user = usr, var/target_zone)
+/datum/spell/targeted/projectile/cast(list/targets, mob/user = usr, target_zone)
if(istext(proj_type))
proj_type = text2path(proj_type) // sanity filters
@@ -37,7 +37,7 @@ If the spell_projectile is seeking, it will update its target every process and
projectile.old_style_target(target)
projectile.fire()
-/datum/spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, var/atom/movable/spell_holder)
+/datum/spell/targeted/projectile/proc/choose_prox_targets(mob/user = usr, atom/movable/spell_holder)
var/list/targets = list()
for(var/mob/living/M in range(spell_holder, cast_prox_range))
if(M == user && !(spell_flags & INCLUDEUSER))
@@ -45,5 +45,5 @@ If the spell_projectile is seeking, it will update its target every process and
targets += M
return targets
-/datum/spell/targeted/projectile/proc/prox_cast(var/list/targets, var/atom/movable/spell_holder)
+/datum/spell/targeted/projectile/proc/prox_cast(list/targets, atom/movable/spell_holder)
return targets
diff --git a/code/modules/spells/targeted/shift.dm b/code/modules/spells/targeted/shift.dm
index c9b813266d..830f3d951f 100644
--- a/code/modules/spells/targeted/shift.dm
+++ b/code/modules/spells/targeted/shift.dm
@@ -15,16 +15,16 @@
hud_state = "const_shift"
-/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(atom/movable/overlay/animation, mob/living/target)
animation.icon_state = "phase_shift"
animation.dir = target.dir
flick("phase_shift",animation)
-/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
+/spell/targeted/ethereal_jaunt/shift/jaunt_reappear(atom/movable/overlay/animation, mob/living/target)
animation.icon_state = "phase_shift2"
animation.dir = target.dir
flick("phase_shift2",animation)
-/spell/targeted/ethereal_jaunt/shift/jaunt_steam(var/mobloc)
+/spell/targeted/ethereal_jaunt/shift/jaunt_steam(mobloc)
return
*/
diff --git a/code/modules/spells/targeted/targeted.dm b/code/modules/spells/targeted/targeted.dm
index a0a42e56b0..bbbe14e9ef 100644
--- a/code/modules/spells/targeted/targeted.dm
+++ b/code/modules/spells/targeted/targeted.dm
@@ -118,7 +118,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
return targets
-/datum/spell/targeted/cast(var/list/targets, mob/user)
+/datum/spell/targeted/cast(list/targets, mob/user)
for(var/mob/living/target in targets)
if(range >= 0)
if(!(target in view_or_range(range, holder, selection_type))) //filter at time of casting
diff --git a/code/modules/stockmarket/articles.dm b/code/modules/stockmarket/articles.dm
index 1ed89d786f..14d2f9e035 100644
--- a/code/modules/stockmarket/articles.dm
+++ b/code/modules/stockmarket/articles.dm
@@ -4,10 +4,10 @@
/proc/vowel()
return pick("A", "E", "I", "O", "U")
-/proc/ucfirst(var/S)
+/proc/ucfirst(S)
return "[uppertext(ascii2text(text2ascii(S, 1)))][copytext(S, 2)]"
-/proc/ucfirsts(var/S)
+/proc/ucfirsts(S)
var/list/L = splittext(S, " ")
var/list/M = list()
for (var/P in L)
@@ -114,7 +114,7 @@ GLOBAL_LIST_EMPTY(FrozenAccounts)
var/output = "[headline] [subtitle] [article] [author] [spacetime] "
if (points.len && height > 20 && width > 20)
var/min = points[1]
diff --git a/code/modules/stockmarket/stocks.dm b/code/modules/stockmarket/stocks.dm
index 741239960e..3bb542658d 100644
--- a/code/modules/stockmarket/stocks.dm
+++ b/code/modules/stockmarket/stocks.dm
@@ -46,10 +46,10 @@
var/fluctuation_counter = 0
var/datum/industry/industry = null
-/datum/stock/proc/addEvent(var/datum/stockEvent/E)
+/datum/stock/proc/addEvent(datum/stockEvent/E)
events |= E
-/datum/stock/proc/addArticle(var/datum/article/A)
+/datum/stock/proc/addArticle(datum/article/A)
if (!(A in articles))
articles.Insert(1, A)
A.ticks = world.time
@@ -59,11 +59,11 @@
for (var/T in types)
generateEvent(T)
-/datum/stock/proc/generateEvent(var/T)
+/datum/stock/proc/generateEvent(T)
var/datum/stockEvent/E = new T(src)
addEvent(E)
-/datum/stock/proc/affectPublicOpinion(var/boost)
+/datum/stock/proc/affectPublicOpinion(boost)
optimism += rand(0, 500) / 500 * boost
average_optimism += rand(0, 150) / 5000 * boost
speculation += rand(-1, 50) / 10 * boost
@@ -248,7 +248,7 @@
return 1
return 0
-/datum/stock/proc/borrow(var/datum/borrow/B, var/who)
+/datum/stock/proc/borrow(datum/borrow/B, who)
if (B.lease_expires)
return 0
B.lease_expires = world.time + B.lease_time
@@ -273,7 +273,7 @@
GLOB.FrozenAccounts[who] += B
return 1
-/datum/stock/proc/buyShares(var/who, var/howmany)
+/datum/stock/proc/buyShares(who, howmany)
if (howmany <= 0)
return
howmany = round(howmany)
@@ -289,7 +289,7 @@
return 1
return 0
-/datum/stock/proc/sellShares(var/whose, var/howmany)
+/datum/stock/proc/sellShares(whose, howmany)
if (howmany < 0)
return
howmany = round(howmany)
@@ -304,7 +304,7 @@
return 1
return 0
-/datum/stock/proc/displayValues(var/mob/user)
+/datum/stock/proc/displayValues(mob/user)
var/datum/browser/popup = new(user, "stock_[name]", "Share Value", 450, 450)
popup.set_content(plotBarGraph(values, "[name] share value per share"))
popup.open()
diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm
index d6afd11b84..30a4f5db85 100644
--- a/code/modules/surgery/implant.dm
+++ b/code/modules/surgery/implant.dm
@@ -16,7 +16,7 @@
return 0
return affected && affected.open == (affected.encased ? 3 : 2)
-/datum/surgery_step/cavity/proc/get_max_wclass(var/obj/item/organ/external/affected)
+/datum/surgery_step/cavity/proc/get_max_wclass(obj/item/organ/external/affected)
switch (affected.organ_tag)
if (BP_HEAD)
return ITEMSIZE_TINY
@@ -26,7 +26,7 @@
return ITEMSIZE_SMALL
return 0
-/datum/surgery_step/cavity/proc/get_cavity(var/obj/item/organ/external/affected)
+/datum/surgery_step/cavity/proc/get_cavity(obj/item/organ/external/affected)
switch (affected.organ_tag)
if (BP_HEAD)
return "cranial"
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 43eb149cb5..29835be82e 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -116,7 +116,7 @@
-/proc/spread_germs_to_organ(var/obj/item/organ/external/E, var/mob/living/carbon/human/user)
+/proc/spread_germs_to_organ(obj/item/organ/external/E, mob/living/carbon/human/user)
if(!istype(user) || !istype(E)) return
var/germ_level = user.germ_level
diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm
index 0574f9b069..677ddcf8cb 100644
--- a/code/modules/tables/flipping.dm
+++ b/code/modules/tables/flipping.dm
@@ -1,5 +1,5 @@
-/obj/structure/table/proc/straight_table_check(var/direction)
+/obj/structure/table/proc/straight_table_check(direction)
if(health > 100)
return 0
var/obj/structure/table/T
@@ -32,7 +32,7 @@
return
-/obj/structure/table/proc/unflipping_check(var/direction)
+/obj/structure/table/proc/unflipping_check(direction)
for(var/mob/M in oview(src,0))
return 0
@@ -69,7 +69,7 @@
return
unflip()
-/obj/structure/table/proc/flip(var/direction)
+/obj/structure/table/proc/flip(direction)
if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) )
return 0
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index 835b30d7b6..9c99e85458 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(table_icon_cache)
visible_message(span_danger("\The [user] tears apart \the [src]!"))
src.break_to_parts()
-/obj/structure/table/attack_generic(mob/user as mob, var/damage)
+/obj/structure/table/attack_generic(mob/user as mob, damage)
if(damage >= 10)
if(reinforced && prob(70))
visible_message(span_danger("\The [user] smashes against \the [src]!"))
@@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY(table_icon_cache)
qdel(src)
return shards
-/obj/structure/table/can_visually_connect_to(var/obj/structure/S)
+/obj/structure/table/can_visually_connect_to(obj/structure/S)
if(istype(S,/obj/structure/table/bench) && !istype(src,/obj/structure/table/bench))
return FALSE
if(istype(src,/obj/structure/table/bench) && !istype(S,/obj/structure/table/bench))
@@ -334,7 +334,7 @@ GLOBAL_LIST_EMPTY(table_icon_cache)
return TRUE
..()
-/proc/get_table_image(var/icon/ticon,var/ticonstate,var/tdir,var/tcolor,var/talpha)
+/proc/get_table_image(icon/ticon,ticonstate,tdir,tcolor,talpha)
var/icon_cache_key = "\ref[ticon]-[ticonstate]-[tdir]-[tcolor]-[talpha]"
var/image/I = GLOB.table_icon_cache[icon_cache_key]
if(!I)
@@ -412,7 +412,7 @@ GLOBAL_LIST_EMPTY(table_icon_cache)
if(carpeted)
add_overlay("carpet_flip[type]")
-/obj/structure/table/proc/get_all_connected_tables(var/list/connections)
+/obj/structure/table/proc/get_all_connected_tables(list/connections)
if(!connections)
connections = list(src)
else
diff --git a/code/modules/telesci/hyper_pad_ch.dm b/code/modules/telesci/hyper_pad_ch.dm
index 2f94145643..1605880283 100644
--- a/code/modules/telesci/hyper_pad_ch.dm
+++ b/code/modules/telesci/hyper_pad_ch.dm
@@ -115,7 +115,7 @@
addtimer(CALLBACK(src, PROC_REF(animate_discharge), P), speed)
speed += teleport_speed/8
-/obj/machinery/hyperpad/centre/proc/animate_discharge(var/obj/machinery/hyperpad/Pad)
+/obj/machinery/hyperpad/centre/proc/animate_discharge(obj/machinery/hyperpad/Pad)
Pad.cut_overlays()
/obj/machinery/hyperpad/centre/proc/doteleport(mob/user)
@@ -174,5 +174,5 @@
addtimer(CALLBACK(src, PROC_REF(animate_charge), P, color_overlay), timer)
timer += teleport_cooldown/8
-/obj/machinery/hyperpad/centre/proc/animate_charge(var/obj/machinery/hyperpad/Pad, var/mutable_appearance/color)
+/obj/machinery/hyperpad/centre/proc/animate_charge(obj/machinery/hyperpad/Pad, mutable_appearance/color)
Pad.add_overlay(color)
diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm
index e9eb5f97da..e9dbe95d45 100644
--- a/code/modules/telesci/quantum_pad.dm
+++ b/code/modules/telesci/quantum_pad.dm
@@ -114,7 +114,7 @@
icon_state = initial(icon_state)
// Panel flips retry power cable connections so you don't have to decon the whole thing
-/obj/machinery/power/quantumpad/default_deconstruction_screwdriver(var/mob/user, var/obj/item/S)
+/obj/machinery/power/quantumpad/default_deconstruction_screwdriver(mob/user, obj/item/S)
if((. = ..()))
var/original_powernet = powernet
if(powernet)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 05e708ce56..0e3f280b0d 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -382,7 +382,7 @@
// Procedure that calculates the actual trajectory taken!
-/proc/simple_projectile_trajectory(var/src_x, var/src_y, var/rotation, var/distance)
+/proc/simple_projectile_trajectory(src_x, src_y, rotation, distance)
var/time = distance / 10 // 100ms per distance seems fine?
var/dest_x = src_x + distance*sin(rotation);
var/dest_y = src_y + distance*cos(rotation);
diff --git a/code/modules/tension/tension.dm b/code/modules/tension/tension.dm
index 0fa6d0b1b5..e2405e1e63 100644
--- a/code/modules/tension/tension.dm
+++ b/code/modules/tension/tension.dm
@@ -2,17 +2,17 @@
// You could use this to have an effect trigger when someone is in serious danger, or as a means for an AI to guess which mob needs to die first.
// The idea and the code structure was taken from Dungeon Crawl Stone Soup.
-/atom/movable/proc/get_threat(var/mob/living/threatened)
+/atom/movable/proc/get_threat(mob/living/threatened)
return 0
-/atom/movable/proc/guess_threat_level(var/mob/living/threatened)
+/atom/movable/proc/guess_threat_level(mob/living/threatened)
return 0
/mob/living/simple_mob
var/threat_level = null // Set this if you want an explicit danger rating.
-/mob/living/simple_mob/guess_threat_level(var/mob/living/threatened)
+/mob/living/simple_mob/guess_threat_level(mob/living/threatened)
if(threat_level) // If they have a predefined number, use it.
return threat_level
// Otherwise we need to guess how scary this thing is.
@@ -52,12 +52,12 @@
return threat_guess
-/mob/living/get_threat(var/mob/living/threatened)
+/mob/living/get_threat(mob/living/threatened)
if(stat)
return 0
-/mob/living/simple_mob/get_threat(var/mob/living/threatened)
+/mob/living/simple_mob/get_threat(mob/living/threatened)
. = ..()
if(has_AI())
@@ -100,7 +100,7 @@
return threat
// Carbon / mostly Human threat check.
-/mob/living/carbon/get_threat(var/mob/living/threatened)
+/mob/living/carbon/get_threat(mob/living/threatened)
. = ..()
if(has_AI())
@@ -136,7 +136,7 @@
return threat
-/mob/living/carbon/guess_threat_level(var/mob/living/threatened)
+/mob/living/carbon/guess_threat_level(mob/living/threatened)
var/threat_guess = 0
// First lets consider their attack ability.
diff --git a/code/modules/tgchat/_legacy.dm b/code/modules/tgchat/_legacy.dm
index adfef86395..ab3a3c61f8 100644
--- a/code/modules/tgchat/_legacy.dm
+++ b/code/modules/tgchat/_legacy.dm
@@ -10,7 +10,7 @@
GLOBAL_LIST_EMPTY(bicon_cache) // Cache of the ![]() tag results, not the icons
*/
-/proc/bicon(var/obj, var/use_class = 1, var/custom_classes = "")
+/proc/bicon(obj, use_class = 1, custom_classes = "")
return icon2base64html(obj, custom_classes)
/* Old bicon code
diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm
index fbee6c1415..f9c24e7438 100644
--- a/code/modules/tgui/modules/_base.dm
+++ b/code/modules/tgui/modules/_base.dm
@@ -14,7 +14,7 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff
var/tgui_id
var/ntos = FALSE
-/datum/tgui_module/New(var/host)
+/datum/tgui_module/New(host)
src.host = host
if(ntos)
tgui_id = "Ntos" + tgui_id
diff --git a/code/modules/tgui/modules/admin/player_notes.dm b/code/modules/tgui/modules/admin/player_notes.dm
index 4260d29eb1..764e0a4938 100644
--- a/code/modules/tgui/modules/admin/player_notes.dm
+++ b/code/modules/tgui/modules/admin/player_notes.dm
@@ -16,7 +16,7 @@
if(!QDELETED(src))
qdel(src)
-/datum/tgui_module/player_notes/proc/filter_ckeys(var/page, var/filter)
+/datum/tgui_module/player_notes/proc/filter_ckeys(page, filter)
var/savefile/S=new("data/player_notes.sav")
var/list/note_keys
S >> note_keys
@@ -249,7 +249,7 @@
popup.set_content(dat)
popup.open()
-/datum/admins/proc/player_has_info_legacy(var/key as text)
+/datum/admins/proc/player_has_info_legacy(key as text)
var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
var/list/infos
info >> infos
diff --git a/code/modules/tgui/modules/alarm.dm b/code/modules/tgui/modules/alarm.dm
index 0a78fdc423..49f1563f0c 100644
--- a/code/modules/tgui/modules/alarm.dm
+++ b/code/modules/tgui/modules/alarm.dm
@@ -55,11 +55,11 @@
/datum/tgui_module/alarm_monitor/security/ntos
ntos = TRUE
-/datum/tgui_module/alarm_monitor/proc/register_alarm(var/object, var/procName)
+/datum/tgui_module/alarm_monitor/proc/register_alarm(object, procName)
for(var/datum/alarm_handler/AH in alarm_handlers)
AH.register_alarm(object, procName)
-/datum/tgui_module/alarm_monitor/proc/unregister_alarm(var/object)
+/datum/tgui_module/alarm_monitor/proc/unregister_alarm(object)
for(var/datum/alarm_handler/AH in alarm_handlers)
AH.unregister_alarm(object)
diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm
index 53f2c1a16c..3a1d856015 100644
--- a/code/modules/tgui/modules/appearance_changer.dm
+++ b/code/modules/tgui/modules/appearance_changer.dm
@@ -902,7 +902,7 @@
if(target)
target.update_dna()
-/datum/tgui_module/appearance_changer/proc/can_change(mob/living/carbon/human/target, var/flag)
+/datum/tgui_module/appearance_changer/proc/can_change(mob/living/carbon/human/target, flag)
return target && (flags & flag)
/datum/tgui_module/appearance_changer/proc/can_change_skin_tone(mob/living/carbon/human/target)
@@ -1156,7 +1156,7 @@
owner.AddComponent(/datum/component/recursive_move)
RegisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE, PROC_REF(update_active_camera_screen), TRUE)
-/datum/tgui_module/appearance_changer/body_designer/proc/load_record_to_body(var/datum/transhuman/body_record/current_project)
+/datum/tgui_module/appearance_changer/body_designer/proc/load_record_to_body(datum/transhuman/body_record/current_project)
if(owner)
UnregisterSignal(owner, COMSIG_MOVABLE_ATTEMPTED_MOVE)
QDEL_NULL(owner)
diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm
index 4ad6c64d57..d249861ff2 100644
--- a/code/modules/tgui/modules/atmos_control.dm
+++ b/code/modules/tgui/modules/atmos_control.dm
@@ -99,7 +99,7 @@
return STATUS_INTERACTIVE
return STATUS_UPDATE
-/datum/tgui_state/air_alarm_remote/proc/has_access(var/mob/user)
+/datum/tgui_state/air_alarm_remote/proc/has_access(mob/user)
return user && (isAI(user) || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO) || (ACCESS_CE in user.GetAccess()))
/datum/tgui_state/air_alarm_remote/Destroy()
diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm
index 7451f467d8..ffa3593500 100644
--- a/code/modules/tgui/modules/communications.dm
+++ b/code/modules/tgui/modules/communications.dm
@@ -392,11 +392,11 @@
ntos = TRUE
/* Etc global procs */
-/proc/enable_prison_shuttle(var/mob/user)
+/proc/enable_prison_shuttle(mob/user)
for(var/obj/machinery/computer/prison_shuttle/PS in GLOB.machines)
PS.allowedtocall = !(PS.allowedtocall)
-/proc/call_shuttle_proc(var/mob/user)
+/proc/call_shuttle_proc(mob/user)
if ((!( SSticker ) || !SSemergency_shuttle.location()))
return
@@ -435,7 +435,7 @@
return
-/proc/init_shift_change(var/mob/user, var/force = 0)
+/proc/init_shift_change(mob/user, force = 0)
if ((!( SSticker ) || !SSemergency_shuttle.location()))
return
@@ -482,7 +482,7 @@
return
-/proc/cancel_call_proc(var/mob/user)
+/proc/cancel_call_proc(mob/user)
if (!( SSticker ) || !SSemergency_shuttle.can_recall())
return
if((SSticker.mode.name == "blob")||(SSticker.mode.name == "Meteor"))
diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm
index fced7398df..0e43af6864 100644
--- a/code/modules/tgui/modules/law_manager.dm
+++ b/code/modules/tgui/modules/law_manager.dm
@@ -158,14 +158,14 @@
return data
-/datum/tgui_module/law_manager/proc/package_laws(var/list/data, var/field, var/list/datum/ai_law/laws)
+/datum/tgui_module/law_manager/proc/package_laws(list/data, field, list/datum/ai_law/laws)
var/list/packaged_laws = list()
for(var/datum/ai_law/AL in laws)
packaged_laws[++packaged_laws.len] = list("law" = AL.law, "index" = AL.get_index(), "state" = owner.laws.get_state_law(AL), "ref" = "\ref[AL]")
data[field] = packaged_laws
data["has_[field]"] = packaged_laws.len
-/datum/tgui_module/law_manager/proc/package_multiple_laws(var/list/datum/ai_laws/laws)
+/datum/tgui_module/law_manager/proc/package_multiple_laws(list/datum/ai_laws/laws)
var/list/law_sets = list()
for(var/datum/ai_laws/ALs in laws)
var/list/packaged_laws = list()
@@ -177,10 +177,10 @@
return law_sets
-/datum/tgui_module/law_manager/proc/is_malf(var/mob/user)
+/datum/tgui_module/law_manager/proc/is_malf(mob/user)
return (is_admin(user) && !owner.is_slaved()) || is_special_role(user)
-/datum/tgui_module/law_manager/proc/is_special_role(var/mob/user)
+/datum/tgui_module/law_manager/proc/is_special_role(mob/user)
if(user.mind.special_role)
return TRUE
else
@@ -192,7 +192,7 @@
/mob/living/silicon/robot/is_slaved()
return lawupdate && connected_ai ? sanitize(connected_ai.name) : null
-/datum/tgui_module/law_manager/proc/sync_laws(var/mob/living/silicon/ai/AI)
+/datum/tgui_module/law_manager/proc/sync_laws(mob/living/silicon/ai/AI)
if(!AI)
return
for(var/mob/living/silicon/robot/R in AI.connected_robots)
diff --git a/code/modules/tgui/modules/ntos-only/email.dm b/code/modules/tgui/modules/ntos-only/email.dm
index 41255235df..f6132889d4 100644
--- a/code/modules/tgui/modules/ntos-only/email.dm
+++ b/code/modules/tgui/modules/ntos-only/email.dm
@@ -43,7 +43,7 @@
// Returns 0 if no new messages were received, 1 if there is an unread message but notification has already been sent.
// and 2 if there is a new message that appeared in this tick (and therefore notification should be sent by the program).
-/datum/tgui_module/email_client/proc/check_for_new_messages(var/messages_read = FALSE)
+/datum/tgui_module/email_client/proc/check_for_new_messages(messages_read = FALSE)
if(!current_account)
return 0
@@ -186,7 +186,7 @@
return data
-/datum/tgui_module/email_client/proc/find_message_by_fuid(var/fuid)
+/datum/tgui_module/email_client/proc/find_message_by_fuid(fuid)
if(!istype(current_account))
return
@@ -206,7 +206,7 @@
msg_attachment = null
current_message = null
-/datum/tgui_module/email_client/proc/relayed_process(var/netspeed)
+/datum/tgui_module/email_client/proc/relayed_process(netspeed)
download_speed = netspeed
if(!downloading)
return
diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm
index 2e11829e5f..202ac8b057 100644
--- a/code/modules/tgui/modules/ntos-only/uav.dm
+++ b/code/modules/tgui/modules/ntos-only/uav.dm
@@ -89,7 +89,7 @@
SEND_SIGNAL(src,COMSIG_REMOTE_VIEW_CLEAR)
return TRUE
-/datum/tgui_module/uav/proc/set_current(var/obj/item/uav/U)
+/datum/tgui_module/uav/proc/set_current(obj/item/uav/U)
if(current_uav == U)
return
diff --git a/code/modules/tgui/modules/overmap.dm b/code/modules/tgui/modules/overmap.dm
index 9b037224bd..8e9a451d88 100644
--- a/code/modules/tgui/modules/overmap.dm
+++ b/code/modules/tgui/modules/overmap.dm
@@ -60,12 +60,12 @@
linked = sector
return 1
-/datum/tgui_module/ship/look(var/mob/user)
+/datum/tgui_module/ship/look(mob/user)
user.set_viewsize(world.view + extra_view)
if(!map_view_used)
map_view_used = TRUE
-/datum/tgui_module/ship/unlook(var/mob/user)
+/datum/tgui_module/ship/unlook(mob/user)
user.set_viewsize() // reset to default
if(map_view_used)
map_view_used = FALSE
@@ -185,7 +185,7 @@
sensors = S
break
-/datum/tgui_module/ship/fullmonty/relaymove(var/mob/user, direction)
+/datum/tgui_module/ship/fullmonty/relaymove(mob/user, direction)
if(viewing_overmap(user) && linked)
direction = turn(direction,pick(90,-90))
linked.relaymove(user, direction, accellimit)
diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm
index 54208e7313..6fd82e42a3 100644
--- a/code/modules/tgui/modules/rcon.dm
+++ b/code/modules/tgui/modules/rcon.dm
@@ -12,7 +12,7 @@
var/current_page = 1
var/number_pages = 0
-/datum/tgui_module/rcon/proc/filter_smeslist(var/page)
+/datum/tgui_module/rcon/proc/filter_smeslist(page)
number_pages = (length(known_SMESs) + SMES_PER_PAGE - 1) / SMES_PER_PAGE
var/page_index = page - 1
@@ -107,7 +107,7 @@
// Proc: GetSMESByTag()
// Parameters: 1 (tag - RCON tag of SMES we want to look up)
// Description: Looks up and returns SMES which has matching RCON tag
-/datum/tgui_module/rcon/proc/GetSMESByTag(var/tag)
+/datum/tgui_module/rcon/proc/GetSMESByTag(tag)
if(!tag)
return
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index 28c217326b..184f9cb09d 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -144,5 +144,5 @@
return STATUS_CLOSE // Otherwise, we got nothing.
// Topic Extensions for old UIs
-/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state)
+/datum/proc/CanUseTopic(mob/user, datum/tgui_state/state)
return tgui_status(user, state)
diff --git a/code/modules/tgui/states/inventory_vr.dm b/code/modules/tgui/states/inventory_vr.dm
index 4da26e8650..ef1fa5043e 100644
--- a/code/modules/tgui/states/inventory_vr.dm
+++ b/code/modules/tgui/states/inventory_vr.dm
@@ -1,5 +1,5 @@
GLOBAL_DATUM_INIT(tgui_glasses_state, /datum/tgui_state/glasses_state, new)
-/datum/tgui_state/glasses_state/can_use_topic(var/src_object, var/mob/user)
+/datum/tgui_state/glasses_state/can_use_topic(src_object, mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.glasses == src_object)
@@ -8,7 +8,7 @@ GLOBAL_DATUM_INIT(tgui_glasses_state, /datum/tgui_state/glasses_state, new)
return STATUS_CLOSE
GLOBAL_DATUM_INIT(tgui_nif_state, /datum/tgui_state/nif_state, new)
-/datum/tgui_state/nif_state/can_use_topic(var/src_object, var/mob/user)
+/datum/tgui_state/nif_state/can_use_topic(src_object, mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.nif && H.nif.stat == NIF_WORKING && src_object == H.nif)
@@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(tgui_nif_state, /datum/tgui_state/nif_state, new)
// This is slightly distinct from the module state, as it wants to update if not working
GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/tgui_state/nif_main_state, new)
-/datum/tgui_state/nif_main_state/can_use_topic(var/src_object, var/mob/user)
+/datum/tgui_state/nif_main_state/can_use_topic(src_object, mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(!H.nif || src_object != H.nif)
@@ -32,7 +32,7 @@ GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/tgui_state/nif_main_state, new)
return STATUS_CLOSE
GLOBAL_DATUM_INIT(tgui_commlink_state, /datum/tgui_state/commlink_state, new)
-/datum/tgui_state/commlink_state/can_use_topic(var/src_object, var/mob/user)
+/datum/tgui_state/commlink_state/can_use_topic(src_object, mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.nif && H.nif.stat == NIF_WORKING && H.nif.comm == src_object)
diff --git a/code/modules/tickets/procs.dm b/code/modules/tickets/procs.dm
index 94fc493f75..69bf84e2a9 100644
--- a/code/modules/tickets/procs.dm
+++ b/code/modules/tickets/procs.dm
@@ -54,7 +54,7 @@ ADMIN_VERB(cmd_mentor_ticket_panel, (R_ADMIN|R_SERVER|R_MOD|R_MENTOR), "Mentor T
GLOB.tickets.BrowseTickets(browse_to)
-/proc/message_mentors(var/msg)
+/proc/message_mentors(msg)
msg = span_mentor_channel(span_prefix("Mentor: ") + span_message("[msg]"))
for(var/client/C in GLOB.admins)
diff --git a/code/modules/tickets/tickets.dm b/code/modules/tickets/tickets.dm
index 0d6a15a0fa..1f488dd985 100644
--- a/code/modules/tickets/tickets.dm
+++ b/code/modules/tickets/tickets.dm
@@ -9,7 +9,7 @@
return list(channel)
return 0
-/proc/ahelp_discord_message(var/message)
+/proc/ahelp_discord_message(message)
if(!message)
return
if(CONFIG_GET(flag/discord_ahelps_disabled))
diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm
index c973829f07..34a8e28620 100644
--- a/code/modules/turbolift/turbolift.dm
+++ b/code/modules/turbolift/turbolift.dm
@@ -24,7 +24,7 @@
open_doors()
// Enter priority mode, blocking all calls for awhile
-/datum/turbolift/proc/priority_mode(var/time = 30 SECONDS)
+/datum/turbolift/proc/priority_mode(time = 30 SECONDS)
priority_mode = TRUE
cancel_pending_floors()
update_ext_panel_icons()
@@ -33,7 +33,7 @@
priority_mode = FALSE
update_ext_panel_icons()
-/datum/turbolift/proc/update_fire_mode(var/new_fire_mode)
+/datum/turbolift/proc/update_fire_mode(new_fire_mode)
if(fire_mode == new_fire_mode)
return
fire_mode = new_fire_mode
@@ -77,20 +77,20 @@
if(floor.ext_panel)
floor.ext_panel.update_icon()
-/datum/turbolift/proc/doors_are_open(var/datum/turbolift_floor/use_floor = current_floor)
+/datum/turbolift/proc/doors_are_open(datum/turbolift_floor/use_floor = current_floor)
for(var/obj/machinery/door/airlock/door in (use_floor ? (doors + use_floor.doors) : doors))
if(!door.density)
return 1
return 0
-/datum/turbolift/proc/open_doors(var/datum/turbolift_floor/use_floor = current_floor)
+/datum/turbolift/proc/open_doors(datum/turbolift_floor/use_floor = current_floor)
for(var/obj/machinery/door/airlock/door in (use_floor ? (doors + use_floor.doors) : doors))
//door.command("open")
spawn(0)
door.open()
return
-/datum/turbolift/proc/close_doors(var/datum/turbolift_floor/use_floor = current_floor)
+/datum/turbolift/proc/close_doors(datum/turbolift_floor/use_floor = current_floor)
for(var/obj/machinery/door/airlock/door in (use_floor ? (doors + use_floor.doors) : doors))
//door.command("close")
spawn(0)
@@ -207,7 +207,7 @@
next_process = world.time + (next_floor.delay_time || move_delay)
return 1
-/datum/turbolift/proc/queue_move_to(var/datum/turbolift_floor/floor)
+/datum/turbolift/proc/queue_move_to(datum/turbolift_floor/floor)
if(!floor || !(floor in floors) || (floor in queued_floors))
return // STOP PRESSING THE BUTTON.
floor.pending_move(src)
diff --git a/code/modules/turbolift/turbolift_console.dm b/code/modules/turbolift/turbolift_console.dm
index 7bef222a4c..0760ea751b 100644
--- a/code/modules/turbolift/turbolift_console.dm
+++ b/code/modules/turbolift/turbolift_console.dm
@@ -8,7 +8,7 @@
var/datum/turbolift/lift
-/obj/structure/lift/set_dir(var/newdir)
+/obj/structure/lift/set_dir(newdir)
. = ..()
pixel_x = 0
pixel_y = 0
@@ -21,7 +21,7 @@
else if(dir & WEST)
pixel_x = 32
-/obj/structure/lift/proc/pressed(var/mob/user)
+/obj/structure/lift/proc/pressed(mob/user)
if(!istype(user, /mob/living/silicon))
if(user.a_intent == I_HURT)
user.visible_message(span_danger("\The [user] hammers on the lift button!"))
@@ -29,20 +29,20 @@
user.visible_message(span_infoplain(span_bold("\The [user]") + " presses the lift button."))
-/obj/structure/lift/Initialize(mapload, var/datum/turbolift/_lift)
+/obj/structure/lift/Initialize(mapload, datum/turbolift/_lift)
. = ..()
lift = _lift
-/obj/structure/lift/attack_ai(var/mob/user)
+/obj/structure/lift/attack_ai(mob/user)
return attack_hand(user)
-/obj/structure/lift/attack_generic(var/mob/user)
+/obj/structure/lift/attack_generic(mob/user)
return attack_hand(user)
-/obj/structure/lift/attack_hand(var/mob/user)
+/obj/structure/lift/attack_hand(mob/user)
return interact(user)
-/obj/structure/lift/interact(var/mob/user)
+/obj/structure/lift/interact(mob/user)
if(!lift.is_functional())
return 0
return 1
@@ -82,7 +82,7 @@
return
. = ..()
-/obj/structure/lift/button/interact(var/mob/user)
+/obj/structure/lift/button/interact(mob/user)
if(!..())
return
if(lift.fire_mode || lift.priority_mode)
@@ -140,13 +140,13 @@
return
. = ..()
-/obj/structure/lift/panel/attack_ghost(var/mob/user)
+/obj/structure/lift/panel/attack_ghost(mob/user)
return interact(user)
/obj/structure/lift/panel/allow_pai_interaction(mob/living/silicon/pai/user, proximity_flag)
return proximity_flag
-/obj/structure/lift/panel/interact(var/mob/user)
+/obj/structure/lift/panel/interact(mob/user)
if(!..())
return
diff --git a/code/modules/turbolift/turbolift_door.dm b/code/modules/turbolift/turbolift_door.dm
index 5bdac3746f..8914d31b90 100644
--- a/code/modules/turbolift/turbolift_door.dm
+++ b/code/modules/turbolift/turbolift_door.dm
@@ -18,13 +18,13 @@
floor.doors -= src
return ..()
-/obj/machinery/door/airlock/lift/bumpopen(var/mob/user)
+/obj/machinery/door/airlock/lift/bumpopen(mob/user)
return // No accidental sprinting into open elevator shafts.
/obj/machinery/door/airlock/lift/allowed(mob/M)
return FALSE //only the lift machinery is allowed to operate this door
-/obj/machinery/door/airlock/lift/close(var/forced=0)
+/obj/machinery/door/airlock/lift/close(forced=0)
if(!safe)
return ..()
for(var/turf/turf in locs)
diff --git a/code/modules/turbolift/turbolift_door_vr.dm b/code/modules/turbolift/turbolift_door_vr.dm
index d37fb05069..e51394ef58 100644
--- a/code/modules/turbolift/turbolift_door_vr.dm
+++ b/code/modules/turbolift/turbolift_door_vr.dm
@@ -1,5 +1,5 @@
// Vore specific code for /obj/machinery/door/airlock/lift
-/obj/machinery/door/airlock/lift/emag_act(var/uses_left, var/mob/user)
+/obj/machinery/door/airlock/lift/emag_act(uses_left, mob/user)
to_chat(user, span_danger("This door is internally controlled."))
return 0 // Prevents the cryptographic sequencer from using a charge fruitlessly
diff --git a/code/modules/turbolift/turbolift_floor.dm b/code/modules/turbolift/turbolift_floor.dm
index 89cd85518a..e5366b6f43 100644
--- a/code/modules/turbolift/turbolift_floor.dm
+++ b/code/modules/turbolift/turbolift_floor.dm
@@ -10,7 +10,7 @@
var/list/doors = list()
var/obj/structure/lift/button/ext_panel
-/datum/turbolift_floor/proc/set_area_ref(var/ref)
+/datum/turbolift_floor/proc/set_area_ref(ref)
var/area/turbolift/A = locate(ref)
if(!istype(A))
log_mapping("Turbolift floor area was of the wrong type: ref=[ref]")
@@ -24,12 +24,12 @@
delay_time = A.delay_time
//called when a lift has queued this floor as a destination
-/datum/turbolift_floor/proc/pending_move(var/datum/turbolift/lift)
+/datum/turbolift_floor/proc/pending_move(datum/turbolift/lift)
if(ext_panel)
ext_panel.light_up()
//called when a lift arrives at this floor
-/datum/turbolift_floor/proc/arrived(var/datum/turbolift/lift)
+/datum/turbolift_floor/proc/arrived(datum/turbolift/lift)
if(!lift.fire_mode)
lift.open_doors(src)
if(ext_panel)
diff --git a/code/modules/unit_tests/clothing_tests.dm b/code/modules/unit_tests/clothing_tests.dm
index 082abe2356..ecda0691e2 100644
--- a/code/modules/unit_tests/clothing_tests.dm
+++ b/code/modules/unit_tests/clothing_tests.dm
@@ -42,7 +42,7 @@
if(failed)
TEST_FAIL("One or more /obj/item/clothing items had invalid flags or icons")
-/datum/unit_test/all_clothing_shall_be_valid/proc/test_clothing(var/obj/item/clothing/C,var/obj/storage)
+/datum/unit_test/all_clothing_shall_be_valid/proc/test_clothing(obj/item/clothing/C,obj/storage)
var/failed = FALSE
// Do not test base-types
diff --git a/code/modules/unit_tests/mapping.dm b/code/modules/unit_tests/mapping.dm
index baafc25c91..0043fc1d76 100644
--- a/code/modules/unit_tests/mapping.dm
+++ b/code/modules/unit_tests/mapping.dm
@@ -32,7 +32,7 @@
if(failed)
TEST_FAIL("Machinery had an illegal access id.")
-/datum/unit_test/proc/validate_list(var/list/access_list, var/obj/machinery/thing, name_list)
+/datum/unit_test/proc/validate_list(list/access_list, obj/machinery/thing, name_list)
if(!access_list)
return FALSE // null is legal
diff --git a/code/modules/unit_tests/reagent_tests.dm b/code/modules/unit_tests/reagent_tests.dm
index e1231e4c12..a5c65a76d1 100644
--- a/code/modules/unit_tests/reagent_tests.dm
+++ b/code/modules/unit_tests/reagent_tests.dm
@@ -171,7 +171,7 @@
if(failed)
TEST_FAIL("One or more /datum/decl/chemical_reaction subtypes conflict with another reaction.")
-/datum/unit_test/chemical_reactions_shall_not_conflict/proc/perform_reaction(var/datum/decl/chemical_reaction/CR, var/list/inhib = list())
+/datum/unit_test/chemical_reactions_shall_not_conflict/proc/perform_reaction(datum/decl/chemical_reaction/CR, list/inhib = list())
var/scale = 10
if(CR.result_amount < 1)
scale = 1 / CR.result_amount // Create at least 1 unit
diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm
index 7a3d8e2887..4f993fa78e 100644
--- a/code/modules/vehicles/Securitrain_vr.dm
+++ b/code/modules/vehicles/Securitrain_vr.dm
@@ -101,7 +101,7 @@
..()
//cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead
-///obj/vehicle/train/security/bullet_act(var/obj/item/projectile/Proj)
+///obj/vehicle/train/security/bullet_act(obj/item/projectile/Proj)
// if(buckled_mob && prob(70))
// buckled_mob.bullet_act(Proj)
// return
@@ -113,14 +113,14 @@
else
icon_state = initial(icon_state)
-/obj/vehicle/train/security/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/security/trolley/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
return
-/obj/vehicle/train/security/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/security/engine/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
..()
update_stats()
-/obj/vehicle/train/security/engine/remove_cell(var/mob/living/carbon/human/H)
+/obj/vehicle/train/security/engine/remove_cell(mob/living/carbon/human/H)
..()
update_stats()
@@ -166,18 +166,18 @@
else
verbs += /obj/vehicle/train/security/engine/verb/stop_engine
-/obj/vehicle/train/security/RunOver(var/mob/living/M)
+/obj/vehicle/train/security/RunOver(mob/living/M)
var/list/parts = list(BP_HEAD, BP_TORSO, BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM)
M.apply_effects(5, 5)
for(var/i = 0, i < rand(1,3), i++)
M.apply_damage(rand(1,5), BRUTE, pick(parts))
-/obj/vehicle/train/security/trolley/RunOver(var/mob/living/M)
+/obj/vehicle/train/security/trolley/RunOver(mob/living/M)
..()
attack_log += text("\[[time_stamp()]\] [span_red("ran over [M.name] ([M.ckey])")]")
-/obj/vehicle/train/security/engine/RunOver(var/mob/living/M)
+/obj/vehicle/train/security/engine/RunOver(mob/living/M)
..()
if(is_train_head() && ishuman(load))
@@ -274,7 +274,7 @@
//-------------------------------------------
// Loading/unloading procs
//-------------------------------------------
-/obj/vehicle/train/security/trolley/load(var/atom/movable/C)
+/obj/vehicle/train/security/trolley/load(atom/movable/C)
if(ismob(C) && !passenger_allowed)
return 0
if(!istype(C,/obj/machinery) && !istype(C,/obj/structure/closet) && !istype(C,/obj/structure/largecrate) && !istype(C,/obj/structure/reagent_dispensers) && !istype(C,/obj/structure/ore_box) && !ishuman(C))
@@ -290,7 +290,7 @@
if(load)
return 1
-/obj/vehicle/train/security/engine/load(var/atom/movable/C)
+/obj/vehicle/train/security/engine/load(atom/movable/C)
if(!ishuman(C))
return 0
@@ -300,7 +300,7 @@
//This prevents the object from being interacted with until it has
// been unloaded. A dummy object is loaded instead so the loading
// code knows to handle it correctly.
-/obj/vehicle/train/security/trolley/proc/load_object(var/atom/movable/C)
+/obj/vehicle/train/security/trolley/proc/load_object(atom/movable/C)
if(!isturf(C.loc)) //To prevent loading things from someone's inventory, which wouldn't get handled properly.
return 0
if(load || C.anchored)
@@ -326,7 +326,7 @@
C.pixel_y = initial(C.pixel_y)
C.layer = initial(C.layer)
-/obj/vehicle/train/security/trolley/unload(var/mob/user, var/direction)
+/obj/vehicle/train/security/trolley/unload(mob/user, direction)
if(istype(load, /datum/vehicle_dummy_load))
var/datum/vehicle_dummy_load/dummy_load = load
load = dummy_load.actual_load
@@ -366,7 +366,7 @@
// more engines increases this limit by car_limit per
// engine.
//-------------------------------------------------------
-/obj/vehicle/train/security/engine/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/security/engine/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
@@ -379,7 +379,7 @@
move_delay += CONFIG_GET(number/run_speed) //base reference speed // CHOMPEdit
move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight
-/obj/vehicle/train/security/trolley/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/security/trolley/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm
index d7dc0c2cba..fd823446d7 100644
--- a/code/modules/vehicles/bike.dm
+++ b/code/modules/vehicles/bike.dm
@@ -83,13 +83,13 @@
visible_message("\The [src] putters before turning off.", "You hear something putter slowly.")
return CLICK_ACTION_SUCCESS
-/obj/vehicle/bike/click_alt(var/mob/user)
+/obj/vehicle/bike/click_alt(mob/user)
if(Adjacent(user))
kickstand(user)
else
return ..()
-/obj/vehicle/bike/verb/kickstand(var/mob/user as mob)
+/obj/vehicle/bike/verb/kickstand(mob/user as mob)
set name = "Toggle Kickstand"
set category = "Object.Vehicle" //ChompEDIT - TGPanel
set src in view(0)
@@ -112,19 +112,19 @@
kickstand = !kickstand
anchored = (kickstand || on)
-/obj/vehicle/bike/load(var/atom/movable/C, var/mob/user as mob)
+/obj/vehicle/bike/load(atom/movable/C, mob/user as mob)
var/mob/living/M = C
if(!istype(C)) return 0
if(M.buckled || M.restrained() || !Adjacent(M) || !M.Adjacent(src))
return 0
return ..(M, user)
-/obj/vehicle/bike/MouseDrop_T(var/atom/movable/C, var/mob/user as mob)
+/obj/vehicle/bike/MouseDrop_T(atom/movable/C, mob/user as mob)
if(!load(C, user))
to_chat(user, span_warning(" You were unable to load \the [C] onto \the [src]."))
return
-/obj/vehicle/bike/attack_hand(var/mob/user as mob)
+/obj/vehicle/bike/attack_hand(mob/user as mob)
if(user == load)
unload(load, user)
to_chat(user, "You unbuckle yourself from \the [src].")
@@ -178,7 +178,7 @@
..()
-/obj/vehicle/bike/bullet_act(var/obj/item/projectile/Proj)
+/obj/vehicle/bike/bullet_act(obj/item/projectile/Proj)
if(has_buckled_mobs() && prob(protection_percent))
var/mob/living/L = pick(buckled_mobs)
L.bullet_act(Proj)
diff --git a/code/modules/vehicles/boat.dm b/code/modules/vehicles/boat.dm
index 49bf90c37c..fd139673f3 100644
--- a/code/modules/vehicles/boat.dm
+++ b/code/modules/vehicles/boat.dm
@@ -70,7 +70,7 @@
return INITIALIZE_HINT_NORMAL
// Boarding.
-/obj/vehicle/boat/MouseDrop_T(var/atom/movable/C, mob/user)
+/obj/vehicle/boat/MouseDrop_T(atom/movable/C, mob/user)
if(ismob(C))
user_buckle_mob(C, user)
else
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index ed1446a87e..b79c9d5995 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -86,7 +86,7 @@
/*
//cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead
-/obj/vehicle/train/cargo/bullet_act(var/obj/item/projectile/Proj)
+/obj/vehicle/train/cargo/bullet_act(obj/item/projectile/Proj)
if(has_buckled_mobs() && prob(70))
var/mob/living/L = pick(buckled_mobs)
L.bullet_act(Proj)
@@ -100,14 +100,14 @@
icon_state = initial(icon_state)
*/
-/obj/vehicle/train/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/trolley/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
return
-/obj/vehicle/train/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/engine/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
..()
update_stats()
-/obj/vehicle/train/engine/remove_cell(var/mob/living/carbon/human/H)
+/obj/vehicle/train/engine/remove_cell(mob/living/carbon/human/H)
..()
update_stats()
@@ -155,7 +155,7 @@
else
verbs += /obj/vehicle/train/engine/verb/stop_engine
-/obj/vehicle/train/RunOver(var/mob/living/M)
+/obj/vehicle/train/RunOver(mob/living/M)
if(pulledby == M) // Don't destroy people pulling vehicles up stairs
return
@@ -165,11 +165,11 @@
for(var/i = 0, i < rand(1,3), i++)
M.apply_damage(rand(1,5), BRUTE, pick(parts))
-/obj/vehicle/train/trolley/RunOver(var/mob/living/M)
+/obj/vehicle/train/trolley/RunOver(mob/living/M)
..()
attack_log += text("\[[time_stamp()]\] [span_red("ran over [M.name] ([M.ckey])")]")
-/obj/vehicle/train/engine/RunOver(var/mob/living/M)
+/obj/vehicle/train/engine/RunOver(mob/living/M)
..()
if(is_train_head() && ishuman(load))
@@ -219,7 +219,7 @@
return ..()
-/obj/vehicle/train/engine/click_alt(var/mob/user)
+/obj/vehicle/train/engine/click_alt(mob/user)
if(Adjacent(user))
remove_key()
else
@@ -288,7 +288,7 @@
//-------------------------------------------
// Loading/unloading procs
//-------------------------------------------
-/obj/vehicle/train/trolley/load(var/atom/movable/C, var/mob/user)
+/obj/vehicle/train/trolley/load(atom/movable/C, mob/user)
if(ismob(C) && !passenger_allowed)
return 0
if(!istype(C,/obj/machinery) && !istype(C,/obj/structure/closet) && !istype(C,/obj/structure/largecrate) && !istype(C,/obj/structure/reagent_dispensers) && !istype(C,/obj/structure/ore_box) && !ishuman(C))
@@ -304,7 +304,7 @@
if(load)
return 1
-/obj/vehicle/train/engine/load(var/atom/movable/C, var/mob/user)
+/obj/vehicle/train/engine/load(atom/movable/C, mob/user)
if(!ishuman(C))
return 0
@@ -314,7 +314,7 @@
//This prevents the object from being interacted with until it has
// been unloaded. A dummy object is loaded instead so the loading
// code knows to handle it correctly.
-/obj/vehicle/train/trolley/proc/load_object(var/atom/movable/C)
+/obj/vehicle/train/trolley/proc/load_object(atom/movable/C)
if(!isturf(C.loc)) //To prevent loading things from someone's inventory, which wouldn't get handled properly.
return 0
if(load || C.anchored)
@@ -340,7 +340,7 @@
C.pixel_y = initial(C.pixel_y)
C.layer = initial(C.layer)
-/obj/vehicle/train/trolley/unload(var/mob/user, var/direction)
+/obj/vehicle/train/trolley/unload(mob/user, direction)
if(istype(load, /datum/vehicle_dummy_load))
var/datum/vehicle_dummy_load/dummy_load = load
load = dummy_load.actual_load
@@ -380,7 +380,7 @@
// more engines increases this limit by car_limit per
// engine.
//-------------------------------------------------------
-/obj/vehicle/train/engine/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/engine/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
@@ -393,7 +393,7 @@
move_delay += CONFIG_GET(number/run_speed) //base reference speed
move_delay *= speed_mod //makes cargo trains 10% slower than running when not overweight
-/obj/vehicle/train/trolley/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/trolley/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
@@ -435,7 +435,7 @@
AddElement(/datum/element/climbable)
AddElement(/datum/element/sellable/trolley_tank)
-/obj/vehicle/train/trolley_tank/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/trolley_tank/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
return
/obj/vehicle/train/trolley_tank/Bump(atom/Obstacle)
@@ -443,7 +443,7 @@
return //so people can't knock others over by pushing a trolley around
..()
-/obj/vehicle/train/trolley_tank/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/vehicle/train/trolley_tank/MouseDrop_T(atom/movable/C, mob/user as mob)
if(C == user)
SEND_SIGNAL(src, COMSIG_CLIMBABLE_START_CLIMB, user)
return
@@ -457,10 +457,10 @@
if(istype(C,/obj/vehicle/train)) // Only allow latching
. = ..()
-/obj/vehicle/train/trolley_tank/load(var/atom/movable/C, var/mob/living/user)
+/obj/vehicle/train/trolley_tank/load(atom/movable/C, mob/living/user)
return FALSE // Cannot load anything onto this
-/obj/vehicle/train/trolley_tank/RunOver(var/mob/living/M)
+/obj/vehicle/train/trolley_tank/RunOver(mob/living/M)
..()
attack_log += text("\[[time_stamp()]\] [span_red("ran over [M.name] ([M.ckey])")]")
@@ -502,7 +502,7 @@
. = ..()
-/obj/vehicle/train/trolley_tank/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/trolley_tank/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
diff --git a/code/modules/vehicles/construction.dm b/code/modules/vehicles/construction.dm
index d24d1cfd47..41cbe9214a 100644
--- a/code/modules/vehicles/construction.dm
+++ b/code/modules/vehicles/construction.dm
@@ -21,7 +21,7 @@
icon_state = "[initial(icon_state)][build_stage]"
update_icon()
-/obj/item/vehicle_assembly/proc/increase_step(var/new_name = null)
+/obj/item/vehicle_assembly/proc/increase_step(new_name = null)
build_stage++
if(new_name)
name = new_name
@@ -39,7 +39,7 @@
icon_state = "quad-frame"
pixel_x = -16
-/obj/item/vehicle_assembly/quadbike/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/vehicle_assembly/quadbike/attackby(obj/item/W as obj, mob/user as mob)
..()
switch(build_stage)
@@ -151,7 +151,7 @@
icon_state = "quadtrailer-frame"
pixel_x = -16
-/obj/item/vehicle_assembly/quadtrailer/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/vehicle_assembly/quadtrailer/attackby(obj/item/W as obj, mob/user as mob)
..()
switch(build_stage)
@@ -200,7 +200,7 @@
pixel_x = 0
-/obj/item/vehicle_assembly/spacebike/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/vehicle_assembly/spacebike/attackby(obj/item/W as obj, mob/user as mob)
switch(build_stage)
if(0)
if(istype(W, /obj/item/tank/jetpack) || istype(W, /obj/item/borg/upgrade/advanced/jetpack))
@@ -285,7 +285,7 @@
icon = 'icons/obj/vehicles.dmi'
icon_state = "snowmobile-frame"
-/obj/item/vehicle_assembly/snowmobile/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/item/vehicle_assembly/snowmobile/attackby(obj/item/W as obj, mob/user as mob)
switch(build_stage)
if(0)
if(istype(W, /obj/item/stack/material/steel))
diff --git a/code/modules/vehicles/quad.dm b/code/modules/vehicles/quad.dm
index af026d2a5f..7808cfe874 100644
--- a/code/modules/vehicles/quad.dm
+++ b/code/modules/vehicles/quad.dm
@@ -158,7 +158,7 @@
add_attack_logs(D,M,"Ran over with [src.name]")
-/obj/vehicle/train/engine/quadbike/RunOver(var/mob/living/M)
+/obj/vehicle/train/engine/quadbike/RunOver(mob/living/M)
..()
var/list/throw_dirs = list(1, 2, 4, 8, 5, 6, 9, 10)
if(!emagged)
diff --git a/code/modules/vehicles/rover_vr.dm b/code/modules/vehicles/rover_vr.dm
index 9fe68fd698..33b8ba42a2 100644
--- a/code/modules/vehicles/rover_vr.dm
+++ b/code/modules/vehicles/rover_vr.dm
@@ -101,7 +101,7 @@
..()
//cargo trains are open topped, so there is a chance the projectile will hit the mob ridding the train instead
-/obj/vehicle/train/rover/bullet_act(var/obj/item/projectile/Proj)
+/obj/vehicle/train/rover/bullet_act(obj/item/projectile/Proj)
if(has_buckled_mobs() && prob(70))
var/mob/living/L = pick(buckled_mobs)
L.bullet_act(Proj)
@@ -114,14 +114,14 @@
else
icon_state = initial(icon_state)
-/obj/vehicle/train/rover/trolley/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/rover/trolley/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
return
-/obj/vehicle/train/rover/engine/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/train/rover/engine/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
..()
update_stats()
-/obj/vehicle/train/rover/engine/remove_cell(var/mob/living/carbon/human/H)
+/obj/vehicle/train/rover/engine/remove_cell(mob/living/carbon/human/H)
..()
update_stats()
@@ -167,18 +167,18 @@
else
verbs += /obj/vehicle/train/rover/engine/verb/stop_engine
-/obj/vehicle/train/rover/RunOver(var/mob/living/M)
+/obj/vehicle/train/rover/RunOver(mob/living/M)
var/list/parts = list(BP_HEAD, BP_TORSO, BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM)
M.apply_effects(5, 5)
for(var/i = 0, i < rand(1,3), i++)
M.apply_damage(rand(1,5), BRUTE, pick(parts))
-/obj/vehicle/train/rover/trolley/RunOver(var/mob/living/M)
+/obj/vehicle/train/rover/trolley/RunOver(mob/living/M)
..()
attack_log += text("\[[time_stamp()]\] [span_red("ran over [M.name] ([M.ckey])")]")
-/obj/vehicle/train/rover/engine/RunOver(var/mob/living/M)
+/obj/vehicle/train/rover/engine/RunOver(mob/living/M)
..()
if(is_train_head() && ishuman(load))
@@ -275,7 +275,7 @@
//-------------------------------------------
// Loading/unloading procs
//-------------------------------------------
-/obj/vehicle/train/rover/trolley/load(var/atom/movable/C)
+/obj/vehicle/train/rover/trolley/load(atom/movable/C)
if(ismob(C) && !passenger_allowed)
return 0
if(!istype(C,/obj/machinery) && !istype(C,/obj/structure/closet) && !istype(C,/obj/structure/largecrate) && !istype(C,/obj/structure/reagent_dispensers) && !istype(C,/obj/structure/ore_box) && !ishuman(C))
@@ -291,7 +291,7 @@
if(load)
return 1
-/obj/vehicle/train/rover/engine/load(var/atom/movable/C)
+/obj/vehicle/train/rover/engine/load(atom/movable/C)
if(!ishuman(C))
return 0
@@ -304,7 +304,7 @@
buckle_mob(C)
C.alpha = 0
-/obj/vehicle/train/rover/engine/unload(var/mob/user, var/direction)
+/obj/vehicle/train/rover/engine/unload(mob/user, direction)
var/mob/living/carbon/human/C = load
@@ -319,7 +319,7 @@
//This prevents the object from being interacted with until it has
// been unloaded. A dummy object is loaded instead so the loading
// code knows to handle it correctly.
-/obj/vehicle/train/rover/trolley/proc/load_object(var/atom/movable/C)
+/obj/vehicle/train/rover/trolley/proc/load_object(atom/movable/C)
if(!isturf(C.loc)) //To prevent loading things from someone's inventory, which wouldn't get handled properly.
return 0
if(load || C.anchored)
@@ -345,7 +345,7 @@
C.pixel_y = initial(C.pixel_y)
C.layer = initial(C.layer)
-/obj/vehicle/train/rover/trolley/unload(var/mob/user, var/direction)
+/obj/vehicle/train/rover/trolley/unload(mob/user, direction)
if(istype(load, /datum/vehicle_dummy_load))
var/datum/vehicle_dummy_load/dummy_load = load
load = dummy_load.actual_load
@@ -385,7 +385,7 @@
// more engines increases this limit by car_limit per
// engine.
//-------------------------------------------------------
-/obj/vehicle/train/rover/engine/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/rover/engine/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
@@ -398,7 +398,7 @@
move_delay += 1 //base reference speed //CHOMPedit: Move-delay from server config (2) to 1.
move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight
-/obj/vehicle/train/rover/trolley/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/rover/trolley/update_car(train_length, active_engines)
src.train_length = train_length
src.active_engines = active_engines
diff --git a/code/modules/vehicles/snowmobile.dm b/code/modules/vehicles/snowmobile.dm
index 5cc7733a40..d4a64ac0fc 100644
--- a/code/modules/vehicles/snowmobile.dm
+++ b/code/modules/vehicles/snowmobile.dm
@@ -60,7 +60,7 @@
return
//Required for the riding datum to behave:
-/obj/vehicle/train/engine/quadbike/snowmobile/MouseDrop_T(var/atom/movable/C, var/mob/user as mob)
+/obj/vehicle/train/engine/quadbike/snowmobile/MouseDrop_T(atom/movable/C, mob/user as mob)
if(ismob(C))
if(C in buckled_mobs)
user_unbuckle_mob(C, user)
@@ -69,7 +69,7 @@
else
..(C, user)
-/obj/vehicle/train/engine/quadbike/snowmobile/attack_hand(var/mob/user as mob)
+/obj/vehicle/train/engine/quadbike/snowmobile/attack_hand(mob/user as mob)
if(user == load)
unload(load, user)
to_chat(user, "You unbuckle yourself from \the [src].")
diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm
index 60fbe5b7f5..472744572f 100644
--- a/code/modules/vehicles/train.dm
+++ b/code/modules/vehicles/train.dm
@@ -61,7 +61,7 @@
add_attack_logs(D,M,"Ran over with [src.name]")
//trains are commonly open topped, so there is a chance the projectile will hit the mob riding the train instead
-/obj/vehicle/train/bullet_act(var/obj/item/projectile/Proj)
+/obj/vehicle/train/bullet_act(obj/item/projectile/Proj)
if(has_buckled_mobs() && prob(70))
var/mob/living/L = pick(buckled_mobs)
L.bullet_act(Proj)
@@ -105,7 +105,7 @@
return 1
-/obj/vehicle/train/MouseDrop_T(var/atom/movable/C, mob/user as mob)
+/obj/vehicle/train/MouseDrop_T(atom/movable/C, mob/user as mob)
if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C) || !istype(C) || (user == C && !user.canmove))
return
if(istype(C,/obj/vehicle/train))
@@ -245,5 +245,5 @@
T.update_car(train_length, active_engines)
T = T.lead
-/obj/vehicle/train/proc/update_car(var/train_length, var/active_engines)
+/obj/vehicle/train/proc/update_car(train_length, active_engines)
return
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 946ddd5683..ae7294f767 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -143,7 +143,7 @@
else
..()
-/obj/vehicle/bullet_act(var/obj/item/projectile/Proj)
+/obj/vehicle/bullet_act(obj/item/projectile/Proj)
health -= Proj.get_structure_damage()
..()
healthcheck()
@@ -230,7 +230,7 @@
set_light(0)
update_icon()
-/obj/vehicle/emag_act(var/remaining_charges, mob/user as mob)
+/obj/vehicle/emag_act(remaining_charges, mob/user as mob)
if(!mechanical)
return FALSE
@@ -290,7 +290,7 @@
turn_on()
return
-/obj/vehicle/proc/insert_cell(var/obj/item/cell/C, var/mob/living/carbon/human/H)
+/obj/vehicle/proc/insert_cell(obj/item/cell/C, mob/living/carbon/human/H)
if(!mechanical)
return
if(cell)
@@ -304,7 +304,7 @@
powercheck()
to_chat(H, span_notice("You install [C] in [src]."))
-/obj/vehicle/proc/remove_cell(var/mob/living/carbon/human/H)
+/obj/vehicle/proc/remove_cell(mob/living/carbon/human/H)
if(!mechanical)
return
if(!cell)
@@ -316,7 +316,7 @@
cell = null
powercheck()
-/obj/vehicle/proc/RunOver(var/mob/living/M)
+/obj/vehicle/proc/RunOver(mob/living/M)
return //write specifics for different vehicles
//-------------------------------------------
@@ -326,7 +326,7 @@
// the vehicle load() definition before
// calling this parent proc.
//-------------------------------------------
-/obj/vehicle/proc/load(var/atom/movable/C, var/mob/living/user)
+/obj/vehicle/proc/load(atom/movable/C, mob/living/user)
//This loads objects onto the vehicle so they can still be interacted with.
//Define allowed items for loading in specific vehicle definitions.
if(!isturf(C.loc)) //To prevent loading things from someone's inventory, which wouldn't get handled properly.
@@ -359,7 +359,7 @@
return 1
-/obj/vehicle/proc/unload(var/mob/user, var/direction)
+/obj/vehicle/proc/unload(mob/user, direction)
if(!load)
return
@@ -415,7 +415,7 @@
/obj/vehicle/proc/update_stats()
return
-/obj/vehicle/attack_generic(var/mob/user, var/damage, var/attack_message)
+/obj/vehicle/attack_generic(mob/user, damage, attack_message)
if(!damage)
return
visible_message(span_danger("[user] [attack_message] the [src]!"))
@@ -427,7 +427,7 @@
spawn(1) healthcheck()
return 1
-/obj/vehicle/take_damage(var/damage)
+/obj/vehicle/take_damage(damage)
if(!damage)
return
src.health -= damage
diff --git a/code/modules/ventcrawl/ventcrawl.dm b/code/modules/ventcrawl/ventcrawl.dm
index 0106f305e8..f26a30587f 100644
--- a/code/modules/ventcrawl/ventcrawl.dm
+++ b/code/modules/ventcrawl/ventcrawl.dm
@@ -44,7 +44,7 @@
return FALSE
. = ..()
-/mob/living/proc/is_allowed_vent_crawl_item(var/obj/carried_item)
+/mob/living/proc/is_allowed_vent_crawl_item(obj/carried_item)
//Ability master easy test for allowed (cheaper than istype)
if(carried_item == ability_master)
return TRUE
@@ -66,12 +66,12 @@
if(listed/* && !get_inventory_slot(carried_item)*/)
return TRUE
-/mob/living/carbon/is_allowed_vent_crawl_item(var/obj/item/carried_item)
+/mob/living/carbon/is_allowed_vent_crawl_item(obj/item/carried_item)
if(carried_item in internal_organs)
return TRUE
return ..()
-/mob/living/carbon/human/is_allowed_vent_crawl_item(var/obj/item/carried_item)
+/mob/living/carbon/human/is_allowed_vent_crawl_item(obj/item/carried_item)
if(carried_item in organs)
return TRUE
if(species.name == SPECIES_REPLICANT_CREW)
@@ -109,7 +109,7 @@
return FALSE
return TRUE
-/mob/living/simple_mob/protean_blob/is_allowed_vent_crawl_item(var/obj/item/carried_item)
+/mob/living/simple_mob/protean_blob/is_allowed_vent_crawl_item(obj/item/carried_item)
if((carried_item in humanform.organs) || (carried_item in humanform.internal_organs))
return TRUE
if(istype(carried_item, /obj/item/clothing/under))
@@ -120,7 +120,7 @@
return TRUE //Allow them to carry items that fit in pockets
return ..()
-/mob/living/AltClickOn(var/atom/A)
+/mob/living/AltClickOn(atom/A)
if(is_type_in_list(A, GLOB.ventcrawl_machinery))
handle_ventcrawl(A)
return 1
@@ -147,7 +147,7 @@
/mob/living/var/ventcrawl_layer = 3
-/mob/living/proc/handle_ventcrawl(var/atom/clicked_on)
+/mob/living/proc/handle_ventcrawl(atom/clicked_on)
if(!can_ventcrawl() || prepping_to_ventcrawl)
return
diff --git a/code/modules/ventcrawl/ventcrawl_atmospherics.dm b/code/modules/ventcrawl/ventcrawl_atmospherics.dm
index f6d21afe76..4d700c0dfc 100644
--- a/code/modules/ventcrawl/ventcrawl_atmospherics.dm
+++ b/code/modules/ventcrawl/ventcrawl_atmospherics.dm
@@ -30,7 +30,7 @@
return
ventcrawl_to(user,findConnecting(direction, user.ventcrawl_layer),direction)
-/obj/machinery/atmospherics/proc/ventcrawl_to(var/mob/living/user, var/obj/machinery/atmospherics/target_move, var/direction)
+/obj/machinery/atmospherics/proc/ventcrawl_to(mob/living/user, obj/machinery/atmospherics/target_move, direction)
if(target_move)
if(is_type_in_list(target_move, GLOB.ventcrawl_machinery) && target_move.can_crawl_through())
user.remove_ventcrawl()
@@ -75,32 +75,32 @@
. = ..()
-/obj/machinery/atmospherics/proc/findConnecting(var/direction)
+/obj/machinery/atmospherics/proc/findConnecting(direction)
for(var/obj/machinery/atmospherics/target in get_step(src,direction))
if(target.initialize_directions & get_dir(target,src))
if(isConnectable(target) && target.isConnectable(src))
return target
-/obj/machinery/atmospherics/proc/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/proc/isConnectable(obj/machinery/atmospherics/target)
return (target == node1 || target == node2)
-/obj/machinery/atmospherics/pipe/manifold/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/pipe/manifold/isConnectable(obj/machinery/atmospherics/target)
return (target == node3 || ..())
-/obj/machinery/atmospherics/trinary/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/trinary/isConnectable(obj/machinery/atmospherics/target)
return (target == node3 || ..())
-/obj/machinery/atmospherics/pipe/manifold4w/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/pipe/manifold4w/isConnectable(obj/machinery/atmospherics/target)
return (target == node3 || target == node4 || ..())
-/obj/machinery/atmospherics/tvalve/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/tvalve/isConnectable(obj/machinery/atmospherics/target)
return (target == node3 || ..())
-/obj/machinery/atmospherics/pipe/cap/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/pipe/cap/isConnectable(obj/machinery/atmospherics/target)
return (target == node || ..())
-/obj/machinery/atmospherics/portables_connector/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/portables_connector/isConnectable(obj/machinery/atmospherics/target)
return (target == node || ..())
-/obj/machinery/atmospherics/unary/isConnectable(var/obj/machinery/atmospherics/target)
+/obj/machinery/atmospherics/unary/isConnectable(obj/machinery/atmospherics/target)
return (target == node || ..())
diff --git a/code/modules/ventcrawl/ventcrawl_multiz.dm b/code/modules/ventcrawl/ventcrawl_multiz.dm
index 1f669b3407..e9b2e96f44 100644
--- a/code/modules/ventcrawl/ventcrawl_multiz.dm
+++ b/code/modules/ventcrawl/ventcrawl_multiz.dm
@@ -14,7 +14,7 @@
var/obj/machinery/atmospherics/target = check_ventcrawl(GetBelow(loc))
if(target) ventcrawl_to(usr, target, DOWN)
-/obj/machinery/atmospherics/pipe/zpipe/proc/check_ventcrawl(var/turf/target)
+/obj/machinery/atmospherics/pipe/zpipe/proc/check_ventcrawl(turf/target)
if(!istype(target))
return
if(node1 in target)
diff --git a/code/modules/vore/chat_healthbars.dm b/code/modules/vore/chat_healthbars.dm
index 860428bb9a..e300ce5dba 100644
--- a/code/modules/vore/chat_healthbars.dm
+++ b/code/modules/vore/chat_healthbars.dm
@@ -59,7 +59,7 @@
else
. = span_red(.)
-/mob/living/proc/chat_healthbar(var/mob/living/reciever, onExamine = FALSE, override = FALSE)
+/mob/living/proc/chat_healthbar(mob/living/reciever, onExamine = FALSE, override = FALSE)
if(!reciever) //No one to send it to, don't bother
return
if(!reciever.client) //No one is home, don't bother
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index cfc7b4ece2..3530263bf0 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -1155,7 +1155,7 @@
return list("primary" = primary_bellies, "secondary" = secondary_bellies)
//Autotransfer callback
-/obj/belly/proc/check_autotransfer(var/atom/movable/prey, var/list/transfer_locations)
+/obj/belly/proc/check_autotransfer(atom/movable/prey, list/transfer_locations)
if(!(prey in contents) || !prey.autotransferable)
return FALSE
var/obj/belly/dest_belly
@@ -1193,7 +1193,7 @@
return TRUE
//Autotransfer filter
-/obj/belly/proc/autotransfer_filter(var/atom/movable/prey, var/whitelist, var/blacklist)
+/obj/belly/proc/autotransfer_filter(atom/movable/prey, whitelist, blacklist)
if(ismob(prey))
if(blacklist & autotransfer_flags_list["Absorbed"])
if(isliving(prey))
@@ -1727,7 +1727,7 @@
color = "#664330"
w_class = ITEMSIZE_SMALL
-/obj/belly/proc/recycle(var/obj/item/O)
+/obj/belly/proc/recycle(obj/item/O)
if(!recycling || (!LAZYLEN(O.matter) && !istype(O, /obj/item/ore)))
return FALSE
if(istype(O, /obj/item/ore))
@@ -1769,7 +1769,7 @@
O.possessed_voice = list()
return TRUE
-/obj/belly/proc/owner_adjust_nutrition(var/amount = 0)
+/obj/belly/proc/owner_adjust_nutrition(amount = 0)
if(storing_nutrition && amount > 0)
for(var/obj/item/reagent_containers/food/rawnutrition/R in contents)
if(istype(R))
@@ -1790,7 +1790,7 @@
w_class = ITEMSIZE_SMALL
var/stored_nutrition = 0
-/obj/item/reagent_containers/food/rawnutrition/standard_feed_mob(var/mob/user, var/mob/target)
+/obj/item/reagent_containers/food/rawnutrition/standard_feed_mob(mob/user, mob/target)
if(isliving(target))
var/mob/living/L = target
L.nutrition += stored_nutrition
@@ -1810,7 +1810,7 @@
// Recursive proc that returns all living mobs directly and indirectly inside a belly
// This can also be called more generically to get all living mobs not in bellies within any contents list
-/obj/belly/proc/get_belly_surrounding(var/list/C)
+/obj/belly/proc/get_belly_surrounding(list/C)
var/list/surrounding = list()
for(var/thing in C)
if(istype(thing,/mob/living))
diff --git a/code/modules/vore/eating/belly_obj_liquids.dm b/code/modules/vore/eating/belly_obj_liquids.dm
index 235fee4a35..7046462f23 100644
--- a/code/modules/vore/eating/belly_obj_liquids.dm
+++ b/code/modules/vore/eating/belly_obj_liquids.dm
@@ -19,7 +19,7 @@
return
gen_interval++
-/obj/belly/proc/HandleBellyReagentEffects(var/list/touchable_atoms)
+/obj/belly/proc/HandleBellyReagentEffects(list/touchable_atoms)
if(LAZYLEN(contents))
if(show_liquids && reagent_touches && reagents.total_volume >= 5)
var/affecting_amt = reagents.total_volume / max(LAZYLEN(touchable_atoms), 1)
@@ -338,7 +338,7 @@
return
vore_fx(owner)
-/obj/belly/deserialize(var/list/data)
+/obj/belly/deserialize(list/data)
..()
if(!SSchemistry.chemical_reagents[reagentid])
to_chat(owner, span_warning("Belly reagent with ID \"[reagentid]\" not found, please reselect your liquid reagent"))
diff --git a/code/modules/vore/eating/belly_obj_vfx.dm b/code/modules/vore/eating/belly_obj_vfx.dm
index f1f87efd9b..75a7492c70 100644
--- a/code/modules/vore/eating/belly_obj_vfx.dm
+++ b/code/modules/vore/eating/belly_obj_vfx.dm
@@ -1,7 +1,7 @@
// SEND_SIGNAL(COMSIG_BELLY_UPDATE_VORE_FX) is sometimes used when calling vore_fx() to send belly visuals
// to certain non-belly atoms. Not called here as vore_fx() is usually only called if a mob is in the belly.
// Don't forget it if you need to rework vore_fx().
-/obj/belly/proc/vore_fx(mob/living/living_prey, var/severity = 0)
+/obj/belly/proc/vore_fx(mob/living/living_prey, severity = 0)
if(!istype(living_prey))
return
if(!living_prey.client)
@@ -114,7 +114,7 @@
fullscreen_overlay.update_for_view(living_prey.client.view)
check_hud_disable(living_prey)
-/obj/belly/proc/check_hud_disable(var/mob/living/living_prey)
+/obj/belly/proc/check_hud_disable(mob/living/living_prey)
if(disable_hud && living_prey != owner)
if(living_prey?.hud_used?.hud_shown)
to_chat(living_prey, span_vnotice("((Your pred has disabled huds in their belly. Turn off vore FX and hit F12 to get it back; or relax, and enjoy the serenity.))"))
diff --git a/code/modules/vore/eating/contaminate_vr.dm b/code/modules/vore/eating/contaminate_vr.dm
index 5b0e1417d4..6ffde3e904 100644
--- a/code/modules/vore/eating/contaminate_vr.dm
+++ b/code/modules/vore/eating/contaminate_vr.dm
@@ -62,60 +62,60 @@ GLOBAL_LIST_INIT(gurgled_overlays, list(
//////////////
// Special handling of gurgle_contaminate
//////////////
-/obj/item/card/id/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/card/id/gurgle_contaminate(atom/movable/item_storage = null)
digest_act(item_storage) //Contamination and digestion does same thing to these
return TRUE
-/obj/item/pda/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/pda/gurgle_contaminate(atom/movable/item_storage = null)
return FALSE
-/obj/item/reagent_containers/food/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/reagent_containers/food/gurgle_contaminate(atom/movable/item_storage = null)
return FALSE
-/obj/item/storage/vore_egg/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/storage/vore_egg/gurgle_contaminate(atom/movable/item_storage = null)
return FALSE
-/obj/item/holder/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/holder/gurgle_contaminate(atom/movable/item_storage = null)
if(isbelly(loc))
digest_act(item_storage)
return TRUE
return FALSE
-/obj/item/organ/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/organ/gurgle_contaminate(atom/movable/item_storage = null)
return FALSE
-/obj/item/cell/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/cell/gurgle_contaminate(atom/movable/item_storage = null)
if(!gurgled)
//Don't make them wet, just drain
var/obj/item/cell/C = src
C.charge = 0
return TRUE
-/obj/item/storage/box/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/storage/box/gurgle_contaminate(atom/movable/item_storage = null)
if((. = ..()))
name = "soggy [cleanname]"
desc = "This soggy box is about to fall apart any time."
//Storages that contaminate contents
-/obj/item/storage/backpack/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green")
+/obj/item/storage/backpack/gurgle_contaminate(atom/movable/item_storage = null, contamination_flavor = "Generic", contamination_color = "green")
if(contents)
for(var/obj/item/O in contents)
O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color)
..()
-/obj/item/storage/belt/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green")
+/obj/item/storage/belt/gurgle_contaminate(atom/movable/item_storage = null, contamination_flavor = "Generic", contamination_color = "green")
if(contents)
for(var/obj/item/O in contents)
O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color)
..()
-/obj/item/storage/belt/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green")
+/obj/item/storage/belt/gurgle_contaminate(atom/movable/item_storage = null, contamination_flavor = "Generic", contamination_color = "green")
if(contents)
for(var/obj/item/O in contents)
O.gurgle_contaminate(item_storage, contamination_flavor, contamination_color)
..()
-/obj/item/clothing/suit/storage/gurgle_contaminate(var/atom/movable/item_storage = null, var/contamination_flavor = "Generic", var/contamination_color = "green")
+/obj/item/clothing/suit/storage/gurgle_contaminate(atom/movable/item_storage = null, contamination_flavor = "Generic", contamination_color = "green")
if(pockets)
if(pockets.contents)
for(var/obj/item/O in pockets.contents)
diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm
index 5c424e7bd3..e109800a9e 100644
--- a/code/modules/vore/eating/digest_act_vr.dm
+++ b/code/modules/vore/eating/digest_act_vr.dm
@@ -152,23 +152,23 @@
/////////////
// Some indigestible stuff
/////////////
-/obj/item/hand_tele/digest_act(var/atom/movable/item_storage = null)
+/obj/item/hand_tele/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/aicard/digest_act(var/atom/movable/item_storage = null)
+/obj/item/aicard/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/paicard/digest_act(var/atom/movable/item_storage = null)
+/obj/item/paicard/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/gun/digest_act(var/atom/movable/item_storage = null)
+/obj/item/gun/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/pinpointer/digest_act(var/atom/movable/item_storage = null)
+/obj/item/pinpointer/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/areaeditor/blueprints/digest_act(var/atom/movable/item_storage = null)
+/obj/item/areaeditor/blueprints/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/disk/nuclear/digest_act(var/atom/movable/item_storage = null)
+/obj/item/disk/nuclear/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/perfect_tele_beacon/digest_act(var/atom/movable/item_storage = null)
+/obj/item/perfect_tele_beacon/digest_act(atom/movable/item_storage = null)
return FALSE //Sorta important to not digest your own beacons.
-/obj/item/organ/internal/brain/slime/digest_act(var/atom/movable/item_storage = null)
+/obj/item/organ/internal/brain/slime/digest_act(atom/movable/item_storage = null)
return FALSE //so prometheans can be recovered
/////////////
diff --git a/code/modules/vore/eating/inbelly_spawn.dm b/code/modules/vore/eating/inbelly_spawn.dm
index 7b39fbca66..d489f0af55 100644
--- a/code/modules/vore/eating/inbelly_spawn.dm
+++ b/code/modules/vore/eating/inbelly_spawn.dm
@@ -64,7 +64,7 @@
to_chat(potential_prey, span_notice("Inbelly spawn cancelled."))
to_chat(src, span_notice("Prey cancelled their inbelly spawn request."))
-/proc/inbelly_spawn(client/prey, mob/living/pred, obj/belly/target_belly, var/absorbed = FALSE)
+/proc/inbelly_spawn(client/prey, mob/living/pred, obj/belly/target_belly, absorbed = FALSE)
// All this is basically admin late spawn-in, but skipping all parts related to records and equipment and with predteremined location
var/player_key = prey.key
var/picked_ckey = prey.ckey
diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm
index 360db936c2..70d5321447 100644
--- a/code/modules/vore/eating/leave_remains_vr.dm
+++ b/code/modules/vore/eating/leave_remains_vr.dm
@@ -41,7 +41,7 @@
/datum/species/monkey/sergal
skull_type = /obj/item/digestion_remains/skull/sergal
-/obj/belly/proc/handle_remains_leaving(var/mob/living/M)
+/obj/belly/proc/handle_remains_leaving(mob/living/M)
if(!isliving(M)) //Are we even a living thing? (Sorry ghosts)
return
//Moving some vars here for both borgs and carbons to use
@@ -139,7 +139,7 @@
drop_sound = 'sound/items/drop/device.ogg' //not organic bones, so they get different sounds
pickup_sound = 'sound/items/pickup/device.ogg'
-/obj/item/digestion_remains/Initialize(mapload, var/mob/living/pred, var/mob/living/prey)
+/obj/item/digestion_remains/Initialize(mapload, mob/living/pred, mob/living/prey)
. = ..()
if(!mapload)
pred_ckey = pred?.ckey
diff --git a/code/modules/vore/eating/living_bellies.dm b/code/modules/vore/eating/living_bellies.dm
index e3595c03fa..19f183f318 100644
--- a/code/modules/vore/eating/living_bellies.dm
+++ b/code/modules/vore/eating/living_bellies.dm
@@ -27,7 +27,7 @@
updating_fullness = FALSE
return new_fullness
-/mob/living/proc/vs_animate(var/belly_to_animate)
+/mob/living/proc/vs_animate(belly_to_animate)
return
// use this instead of upsate fullness where you need to directly update a belly size
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index a67154d6be..decc28fa9d 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -271,7 +271,7 @@
//
// Proc for applying vore preferences, given bellies
//
-/mob/proc/copy_from_prefs_vr(var/bellies = TRUE, var/full_vorgans = FALSE) // full_vorgans var to bypass 1-belly load optimization.
+/mob/proc/copy_from_prefs_vr(bellies = TRUE, full_vorgans = FALSE) // full_vorgans var to bypass 1-belly load optimization.
if(!client || !client.prefs_vr)
to_chat(src,span_warning("You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev."))
return FALSE
@@ -367,7 +367,7 @@
return remember_default
-/datum/preferences/proc/return_to_character_slot(mob/user, var/remembered_default)
+/datum/preferences/proc/return_to_character_slot(mob/user, remembered_default)
load_character(remembered_default)
user.client?.prefs_vr.load_vore()
sanitize_preferences()
@@ -375,7 +375,7 @@
//
// Release everything in every vore organ
//
-/mob/living/proc/release_vore_contents(var/include_absorbed = TRUE, var/silent = FALSE)
+/mob/living/proc/release_vore_contents(include_absorbed = TRUE, silent = FALSE)
for(var/obj/belly/B as anything in vore_organs)
B.release_all_contents(include_absorbed, silent)
@@ -700,7 +700,7 @@
/obj/belly/return_air()
return return_air_for_internal_lifeform()
-/obj/belly/return_air_for_internal_lifeform(var/mob/living/lifeform)
+/obj/belly/return_air_for_internal_lifeform(mob/living/lifeform)
//Free air until someone wants to code processing it for reals from predbreaths
var/air_type = /datum/gas_mixture/belly_air
if(istype(lifeform)) // If this doesn't succeed, then 'lifeform' is actually a bag or capture crystal with someone inside
@@ -778,7 +778,7 @@
gas = list(
GAS_CH4 = 100)
-/mob/living/proc/feed_grabbed_to_self_falling_nom(var/mob/living/user, var/mob/living/prey)
+/mob/living/proc/feed_grabbed_to_self_falling_nom(mob/living/user, mob/living/prey)
if(user.is_incorporeal())
return FALSE
var/belly = user.vore_selected
@@ -1580,7 +1580,7 @@
if(soundfile)
playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/preference/toggle/eating_noises)
-/mob/living/proc/vore_bellyrub(var/mob/living/T in view(1,src))
+/mob/living/proc/vore_bellyrub(mob/living/T in view(1,src))
if(!T)
return FALSE
diff --git a/code/modules/vore/eating/silicon_vr.dm b/code/modules/vore/eating/silicon_vr.dm
index c4decb6b41..333ab963cf 100644
--- a/code/modules/vore/eating/silicon_vr.dm
+++ b/code/modules/vore/eating/silicon_vr.dm
@@ -59,7 +59,7 @@
if(do_after(user = eyeobj, delay = 5 SECONDS, target = prey) && holo && hologram) //Didn't move and still projecting and effect exists and no other bellied people
feed_grabbed_to_self(src, prey)
-/mob/living/AIShiftClick(var/mob/user) //Shift-click as AI overridden on mobs to examine.
+/mob/living/AIShiftClick(mob/user) //Shift-click as AI overridden on mobs to examine.
if(user.client)
examine(user)
return
diff --git a/code/modules/vore/eating/simple_animal_vr.dm b/code/modules/vore/eating/simple_animal_vr.dm
index f6356c92b3..cf30663b39 100644
--- a/code/modules/vore/eating/simple_animal_vr.dm
+++ b/code/modules/vore/eating/simple_animal_vr.dm
@@ -85,7 +85,7 @@
vore_selected.fancy_vore = !vore_selected.fancy_vore
to_chat(user, "[src] is now using [vore_selected.fancy_vore ? "Fancy" : "Classic"] vore sounds.")
-/mob/living/simple_mob/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/newspaper) && !(ckey || (ai_holder.hostile && faction != user.faction)) && isturf(user.loc))
if(ai_holder.retaliate && prob(vore_pounce_chance/2)) // This is a gamble!
user.Weaken(5) //They get tackled anyway whether they're edible or not.
diff --git a/code/modules/vore/eating/soulcatcher.dm b/code/modules/vore/eating/soulcatcher.dm
index 60354b3cd0..11d5f14130 100644
--- a/code/modules/vore/eating/soulcatcher.dm
+++ b/code/modules/vore/eating/soulcatcher.dm
@@ -44,7 +44,7 @@
linked_belly = null
owner.recalculate_vis()
-/obj/soulgem/proc/apply_stored_belly(var/belly_string, var/skip_unreg = FALSE)
+/obj/soulgem/proc/apply_stored_belly(belly_string, skip_unreg = FALSE)
for(var/obj/belly in owner.vore_organs)
if(belly.name == belly_string)
update_linked_belly(belly, TRUE)
@@ -52,7 +52,7 @@
return FALSE
// Allows to transfer the soulgem to the given mob
-/obj/soulgem/proc/transfer_self(var/mob/target)
+/obj/soulgem/proc/transfer_self(mob/target)
QDEL_NULL(target.soulgem)
owner.soulgem = null
forceMove(target)
@@ -71,7 +71,7 @@
. = ..()
// Sends messages to the owner of the soulcatcher
-/obj/soulgem/proc/notify_holder(var/message)
+/obj/soulgem/proc/notify_holder(message)
message = span_nif(span_bold("[name]") + " displays, \"" + span_notice("[message]") + "\"")
to_chat(owner, message)
@@ -79,7 +79,7 @@
to_chat(CS, message)
// Forwards the speech of captured souls
-/obj/soulgem/proc/use_speech(var/message, var/mob/living/sender, var/mob/eyeobj, var/whisper)
+/obj/soulgem/proc/use_speech(message, mob/living/sender, mob/eyeobj, whisper)
var/sender_name = eyeobj ? eyeobj.name : sender.name
//AR Projecting
@@ -107,7 +107,7 @@
sender.log_talk("NSAY (SC:[owner.real_name]): [message]", LOG_SAY, color="#ff006f")
// Forwards the emotes of captured souls
-/obj/soulgem/proc/use_emote(var/message, var/mob/living/sender, var/mob/eyeobj, var/whisper)
+/obj/soulgem/proc/use_emote(message, mob/living/sender, mob/eyeobj, whisper)
var/sender_name = eyeobj ? eyeobj.name : sender.name
//AR Projecting
@@ -130,7 +130,7 @@
sender.log_message("NME (SC:[owner.real_name]): [message]", LOG_EMOTE, color="#ff006f")
// The capture function which transfers the given mob's mind into the soulcatcher
-/obj/soulgem/proc/catch_mob(var/mob/M, var/custom_name)
+/obj/soulgem/proc/catch_mob(mob/M, custom_name)
if(!(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_CAPTURE) && !isobserver(M)) return // Bypass pref check for observer join
if(!M.mind) return
if(isbrain(owner)) return
@@ -197,7 +197,7 @@
return TRUE
// Allows to adjust the interior of the soulcatcher
-/obj/soulgem/proc/adjust_interior(var/new_flavor)
+/obj/soulgem/proc/adjust_interior(new_flavor)
new_flavor = sanitize(new_flavor, VORE_SC_DESC_MAX, FALSE, TRUE, FALSE)
inside_flavor = new_flavor
notify_holder("Updating environment...")
@@ -205,7 +205,7 @@
to_chat(CS, span_notice("[transit_message]") + "\n[inside_flavor]")
// Allows to return to the body after being captured by one's own soulcatcher
-/obj/soulgem/proc/return_to_body(var/datum/mind)
+/obj/soulgem/proc/return_to_body(datum/mind)
if(own_mind != mind)
to_chat(src, span_warning("You aren't in your own soulcatcher!"))
return
@@ -224,7 +224,7 @@
qdel(self)
// Sets the custom messages depending on the input
-/obj/soulgem/proc/set_custom_message(var/message, var/target)
+/obj/soulgem/proc/set_custom_message(message, target)
message = sanitize(message, VORE_SC_MAX, FALSE, TRUE, FALSE)
switch(target)
if(SC_CAPTURE_MEESAGE)
@@ -239,7 +239,7 @@
delete_message = message
// Allows to rename the soulgem
-/obj/soulgem/proc/rename(var/new_name)
+/obj/soulgem/proc/rename(new_name)
if(length(new_name) < 3 || length(new_name) > 60)
to_chat(owner, span_warning("Your soulcatcher's name needs to be between 3 and 60 characters long!"))
return FALSE
@@ -248,7 +248,7 @@
return TRUE
// Toggles the given flag
-/obj/soulgem/proc/toggle_setting(var/flag)
+/obj/soulgem/proc/toggle_setting(flag)
setting_flags ^= flag
if(flag & SOULGEM_SHOW_VORE_SFX)
soulgem_show_vfx()
@@ -265,7 +265,7 @@
owner.recalculate_vis()
// Checks a single flag, or if all combined flags are true
-/obj/soulgem/proc/flag_check(var/flag, var/match_all = FALSE)
+/obj/soulgem/proc/flag_check(flag, match_all = FALSE)
if(match_all)
return (setting_flags & flag) == flag
return setting_flags & flag
@@ -312,7 +312,7 @@
// VORE FX Section
// Updates the vore FX signal links to the new given belly
-/obj/soulgem/proc/update_linked_belly(var/obj/belly, var/skip_unreg = FALSE)
+/obj/soulgem/proc/update_linked_belly(obj/belly, skip_unreg = FALSE)
if(!belly && linked_belly)
UnregisterSignal(linked_belly, COMSIG_BELLY_UPDATE_VORE_FX)
linked_belly = null
@@ -330,7 +330,7 @@
RegisterSignal(linked_belly, COMSIG_BELLY_UPDATE_VORE_FX, PROC_REF(soulgem_show_vfx))
// Handles the vore fx updates for the captured souls
-/obj/soulgem/proc/soulgem_show_vfx(var/severity = 0)
+/obj/soulgem/proc/soulgem_show_vfx(severity = 0)
SIGNAL_HANDLER
if(linked_belly)
for(var/mob/living/L in brainmobs)
@@ -340,7 +340,7 @@
clear_vore_fx(L)
// Function to show the vore fx overlay
-/obj/soulgem/proc/show_vore_fx(var/mob/living/L, var/severity = 0)
+/obj/soulgem/proc/show_vore_fx(mob/living/L, severity = 0)
if(!linked_belly || !flag_check(SOULGEM_SHOW_VORE_SFX))
return
if(!istype(L) || L.eyeobj)
@@ -348,7 +348,7 @@
linked_belly.vore_fx(L, severity)
// Function to clear the vore fx overlay
-/obj/soulgem/proc/clear_vore_fx(var/mob/M)
+/obj/soulgem/proc/clear_vore_fx(mob/M)
M.clear_fullscreen("belly")
if(M.hud_used && !M.hud_used.hud_shown)
M.toggle_hud_vis(TRUE)
@@ -383,7 +383,7 @@
own_mind = null
taken_over_name = null
-/obj/soulgem/proc/take_control(var/mob/M)
+/obj/soulgem/proc/take_control(mob/M)
if(!(owner.soulcatcher_pref_flags & SOULCATCHER_ALLOW_CAPTURE) || !(owner.soulcatcher_pref_flags & SOULCATCHER_ALLOW_TAKEOVER)) return
if(!(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_CAPTURE) || !(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_TAKEOVER)) return
if(!own_mind)
@@ -446,7 +446,7 @@
transfer_mob_selector(selected_soul, target)
// Transfer selector proc
-/obj/soulgem/proc/transfer_mob_selector(var/mob/M, var/obj/target)
+/obj/soulgem/proc/transfer_mob_selector(mob/M, obj/target)
if(!M || !target) return
if(istype(target, /obj/soulgem))
transfer_mob_soulcatcher(M, target)
@@ -454,7 +454,7 @@
transfer_mob(M, target)
// Transfers a captured soul to a valid object (sleevemate, mmi)
-/obj/soulgem/proc/transfer_mob(var/mob/M, var/obj/target)
+/obj/soulgem/proc/transfer_mob(mob/M, obj/target)
if(is_taken_over()) return
if(!M || !target) return
if(istype(target, /obj/item/sleevemate))
@@ -483,7 +483,7 @@
qdel(M)
// Transfers a captured soul to another soulcatcher
-/obj/soulgem/proc/transfer_mob_soulcatcher(var/mob/living/carbon/brain/caught_soul/vore/M, var/obj/soulgem/gem)
+/obj/soulgem/proc/transfer_mob_soulcatcher(mob/living/carbon/brain/caught_soul/vore/M, obj/soulgem/gem)
if(is_taken_over()) return
if(!istype(M) || !gem) return
if(!gem.owner) return
@@ -518,7 +518,7 @@
release_mob(M)
// Proc to release the soul as ghost, returns TRUE on success
-/obj/soulgem/proc/release_mob(var/mob/M)
+/obj/soulgem/proc/release_mob(mob/M)
if(is_taken_over()) return FALSE
to_chat(M, span_notice("[release_message]"))
brainmobs -= M
@@ -541,7 +541,7 @@
delete_mob(M)
// The function handling the actual delete, returns TRUE on success
-/obj/soulgem/proc/delete_mob(var/mob/M)
+/obj/soulgem/proc/delete_mob(mob/M)
if(is_taken_over()) return FALSE
if(!(M.soulcatcher_pref_flags & SOULCATCHER_ALLOW_DELETION))
return release_mob(M)
diff --git a/code/modules/vore/eating/soulcatcher_import.dm b/code/modules/vore/eating/soulcatcher_import.dm
index abbc1d75fb..8ac1421eaf 100644
--- a/code/modules/vore/eating/soulcatcher_import.dm
+++ b/code/modules/vore/eating/soulcatcher_import.dm
@@ -1,4 +1,4 @@
-/datum/vore_look/proc/import_soulcatcher(mob/host, var/list/soulcatcher_data)
+/datum/vore_look/proc/import_soulcatcher(mob/host, list/soulcatcher_data)
if(!host.soulgem)
return FALSE
diff --git a/code/modules/vore/eating/soulcatcher_mob.dm b/code/modules/vore/eating/soulcatcher_mob.dm
index 17c9f5d8fd..0dd5a88a4a 100644
--- a/code/modules/vore/eating/soulcatcher_mob.dm
+++ b/code/modules/vore/eating/soulcatcher_mob.dm
@@ -41,12 +41,12 @@
client.screen.Remove(GLOB.global_hud.whitense)
// Say proc for captures souls
-/mob/living/carbon/brain/caught_soul/vore/say(var/message, var/datum/language/speaking = null, var/whispering = 0)
+/mob/living/carbon/brain/caught_soul/vore/say(message, datum/language/speaking = null, whispering = 0)
if(silent) return FALSE
gem.use_speech(message, src, eyeobj)
// Emote proc for captured souls
-/mob/living/carbon/brain/caught_soul/vore/custom_emote(var/m_type, var/message)
+/mob/living/carbon/brain/caught_soul/vore/custom_emote(m_type, message)
if(silent) return FALSE
gem.use_emote(message,src,eyeobj)
@@ -93,7 +93,7 @@
src.nsay_vore_act()
-/mob/proc/nsay_vore_act(var/message)
+/mob/proc/nsay_vore_act(message)
if(stat != CONSCIOUS)
to_chat(src, span_warning("You can't use NSay Vore while unconscious."))
return
@@ -124,7 +124,7 @@
src.nme_vore_act()
-/mob/proc/nme_vore_act(var/message)
+/mob/proc/nme_vore_act(message)
if(stat != CONSCIOUS)
to_chat(src, span_warning("You can't use NMe Vore while unconscious."))
return
diff --git a/code/modules/vore/eating/stumblevore_vr.dm b/code/modules/vore/eating/stumblevore_vr.dm
index 1ef0259c40..955bf0ebd3 100644
--- a/code/modules/vore/eating/stumblevore_vr.dm
+++ b/code/modules/vore/eating/stumblevore_vr.dm
@@ -7,7 +7,7 @@
AM.stumble_into(src)
return ..()
// Because flips toggle density
-/mob/living/Crossed(var/atom/movable/AM)
+/mob/living/Crossed(atom/movable/AM)
if(isliving(AM) && isturf(loc) && AM != src)
var/mob/living/AMV = AM
if(AMV.buckled != src && (((AMV.confused || AMV.is_blind()) && AMV.stat == CONSCIOUS && prob(50) && AMV.m_intent==I_RUN) || AMV.flying && AMV.flight_vore))
diff --git a/code/modules/vore/eating/transforming_vr.dm b/code/modules/vore/eating/transforming_vr.dm
index 7c0234317f..4b4a16012a 100644
--- a/code/modules/vore/eating/transforming_vr.dm
+++ b/code/modules/vore/eating/transforming_vr.dm
@@ -1,4 +1,4 @@
-/obj/belly/proc/put_in_egg(var/atom/movable/M, message=0)
+/obj/belly/proc/put_in_egg(atom/movable/M, message=0)
var/mob/living/carbon/human/O = owner
var/egg_path = /obj/structure/closet/secure_closet/egg
var/egg_name = "odd egg"
diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm
index 969b3d9010..b8d2c98632 100644
--- a/code/modules/vore/eating/vore_vr.dm
+++ b/code/modules/vore/eating/vore_vr.dm
@@ -498,5 +498,5 @@
return TRUE
//Can do conversions here
-/datum/vore_preferences/proc/patch_version(var/list/json_from_file,var/version)
+/datum/vore_preferences/proc/patch_version(list/json_from_file,version)
return json_from_file
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index ad76be137e..b1241666bb 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -1472,7 +1472,7 @@
return TRUE
return FALSE
-/datum/vore_look/proc/sanitize_fixed_list(var/list/messages, type, delim = "\n\n", limit)
+/datum/vore_look/proc/sanitize_fixed_list(list/messages, type, delim = "\n\n", limit)
if(!limit)
CRASH("[type] set message called without limit!")
VPPREF_MESSAGE_SANITY(type)
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index b2216baad8..97e15ab0a7 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -63,7 +63,7 @@
has_hood_sprite = TRUE
default_worn_icon = 'icons/vore/custom_clothes_mob.dmi'
-/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/digest_act(var/atom/movable/item_storage = null)
+/obj/item/clothing/suit/storage/hooded/wintercoat/roiz/digest_act(atom/movable/item_storage = null)
return FALSE
//ketrai:Ketrai
@@ -671,10 +671,10 @@
actions_types = list(/datum/action/item_action/toggle_pom_pom)
special_handling = TRUE
-/obj/item/clothing/head/fluff/pompom/digest_act(var/atom/movable/item_storage = null)
+/obj/item/clothing/head/fluff/pompom/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/clothing/head/fluff/pompom/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/clothing/head/fluff/pompom/gurgle_contaminate(atom/movable/item_storage = null)
return FALSE
/obj/item/clothing/head/fluff/pompom/attack_self(mob/user)
@@ -1462,7 +1462,7 @@ Departamental Swimsuits, for general use
icon = 'icons/vore/custom_clothes_item.dmi'
icon_state = "phi_ring"
-/obj/item/clothing/accessory/ring/seal/signet/fluff/phi/change_name(var/signet_name = "Unknown")
+/obj/item/clothing/accessory/ring/seal/signet/fluff/phi/change_name(signet_name = "Unknown")
name = "[signet_name]'s Bone Signet Ring"
desc = "A signet ring belonging to [signet_name], carved from the bones of something long extinct, as a ward against bad luck."
@@ -1587,10 +1587,10 @@ Departamental Swimsuits, for general use
icon_state = "bracer_xander_sthasha"
default_worn_icon = 'icons/vore/custom_clothes_mob.dmi'
-/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/digest_act(var/atom/movable/item_storage = null)
+/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/digest_act(atom/movable/item_storage = null)
return FALSE
-/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/gurgle_contaminate(var/atom/movable/item_storage = null)
+/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/gurgle_contaminate(atom/movable/item_storage = null)
return FALSE
//Heroman3003:Lauren Zackson
@@ -1657,7 +1657,7 @@ Departamental Swimsuits, for general use
return 1
-/obj/item/clothing/under/fluff/slime_skeleton/digest_act(var/atom/movable/item_storage = null)
+/obj/item/clothing/under/fluff/slime_skeleton/digest_act(atom/movable/item_storage = null)
return FALSE //Indigestible
//Bacon12366:Elly Brown
@@ -1841,7 +1841,7 @@ Departamental Swimsuits, for general use
set src in usr
translocator_unequip(translocator, usr)
-/obj/item/clothing/head/fluff/nikki/proc/translocator_equip(var/obj/item/perfect_tele/T, var/mob/living/carbon/human/user)
+/obj/item/clothing/head/fluff/nikki/proc/translocator_equip(obj/item/perfect_tele/T, mob/living/carbon/human/user)
if (do_after(user, 2 SECONDS, target = T))
user.unEquip(T)
translocator_unequip(translocator, user)
@@ -1850,7 +1850,7 @@ Departamental Swimsuits, for general use
user.show_message("[icon2html(src, user.client)]*click!*")
playsound(src, 'sound/machines/click.ogg', 30, 1)
-/obj/item/clothing/head/fluff/nikki/proc/translocator_unequip(var/obj/item/perfect_tele/T, var/mob/living/carbon/human/user)
+/obj/item/clothing/head/fluff/nikki/proc/translocator_unequip(obj/item/perfect_tele/T, mob/living/carbon/human/user)
if (translocator)
if (user)
user.put_in_hands(T)
@@ -1868,7 +1868,7 @@ Departamental Swimsuits, for general use
user.visible_message(span_bold("\The [src]") + " flops over [user]'s' head for a moment, but they seem alright.", \
span_notice("\The [src] flops over your head for a moment, but you correct it without issue. There we go!"))
-/obj/item/clothing/head/fluff/nikki/proc/hat_warp_checks(var/mob/living/target, mob/user, proximity_flag)
+/obj/item/clothing/head/fluff/nikki/proc/hat_warp_checks(mob/living/target, mob/user, proximity_flag)
if (!proximity_flag)
return 0
@@ -1963,7 +1963,7 @@ Departamental Swimsuits, for general use
add_attack_logs(user, user, "Tried to put on \the [src] and was involuntarily teleported by it (via \the [translocator] within)!")
return
-/obj/item/clothing/head/fluff/nikki/afterattack(var/mob/living/target, mob/user, proximity_flag, click_parameters)
+/obj/item/clothing/head/fluff/nikki/afterattack(mob/living/target, mob/user, proximity_flag, click_parameters)
// If the hat is willing to cooperate with the holder...
if (hat_warp_checks(target, user, proximity_flag))
// Silly fluffed up styles of teleporting people based on user intent.
diff --git a/code/modules/vore/fluffstuff/custom_clothes_yw.dm b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
index 28d6874e54..0fafef5970 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_yw.dm
@@ -1255,7 +1255,7 @@
icon_state = "kentauri_uniform"
item_state = "kentauri_uniform"
-/obj/item/clothing/suit/armor/vest/harpsong/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
+/obj/item/clothing/suit/armor/vest/harpsong/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse/big))
return ..()
@@ -1263,7 +1263,7 @@
to_chat(H,span_warning("You need to have a kentauri half to wear this."))
return 0
-/obj/item/clothing/suit/armor/vest/harpsong/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0, var/icon/clip_mask = null)
+/obj/item/clothing/suit/armor/vest/harpsong/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer = 0, icon/clip_mask = null)
var/image/result = ..()
result.pixel_x = -16
result.layer = BODY_LAYER + 15
@@ -1633,7 +1633,7 @@
update_clothing_icon()
usr.update_action_buttons()
-/obj/item/clothing/glasses/fluff/avigoggles_yw/get_worn_icon_file(var/body_type,var/slot_name,var/default_icon,var/inhands)
+/obj/item/clothing/glasses/fluff/avigoggles_yw/get_worn_icon_file(body_type,slot_name,default_icon,inhands)
if(body_type == SPECIES_TESHARI)
if(!inhands)
return 'icons/vore/custom_clothes_yw_special.dmi'
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index c470f922a2..acf8c405e4 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -175,7 +175,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
-/obj/item/sword/fluff/joanaria/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/sword/fluff/joanaria/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(75))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
@@ -188,7 +188,7 @@
name = "tactical Knife"
desc = "A tactical knife with a small butterly engraved on the blade."
-/obj/item/material/knife/tacknife/combatknife/fluff/katarina/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/knife/tacknife/combatknife/fluff/katarina/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(default_parry_check(user, attacker, damage_source) && prob(75))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
@@ -598,7 +598,7 @@
name = "broken [initial(name)]"
desc = "This seems like a necklace, but the actual pendant is missing."
-/obj/item/clothing/accessory/collar/khcrystal/proc/update_state(var/tostate)
+/obj/item/clothing/accessory/collar/khcrystal/proc/update_state(tostate)
state = tostate
icon_state = "[initial(icon_state)][tostate]"
update_icon()
@@ -986,7 +986,7 @@
update_icon()
..()
-/obj/item/melee/baton/fluff/stunstaff/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/melee/baton/fluff/stunstaff/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(wielded && default_parry_check(user, attacker, damage_source) && prob(30))
user.visible_message(span_danger("\The [user] parries [attack_text] with \the [src]!"))
playsound(src, 'sound/weapons/punchmiss.ogg', 50, 1)
diff --git a/code/modules/vore/fluffstuff/custom_items_yw.dm b/code/modules/vore/fluffstuff/custom_items_yw.dm
index cebfb3cd49..812defca7c 100644
--- a/code/modules/vore/fluffstuff/custom_items_yw.dm
+++ b/code/modules/vore/fluffstuff/custom_items_yw.dm
@@ -641,7 +641,7 @@
icon_state = "implant_melted"
malfunction = MALFUNCTION_PERMANENT
-/obj/item/implant/fluff/coda/proc/coda_implant_resize(var/mob/living/carbon/human/H)
+/obj/item/implant/fluff/coda/proc/coda_implant_resize(mob/living/carbon/human/H)
set name = "Resize (Implant)"
set desc = "Change your size between two different preset options."
set category = "IC.Game" //CHOMPEdit
diff --git a/code/modules/vore/fluffstuff/custom_permits_vr.dm b/code/modules/vore/fluffstuff/custom_permits_vr.dm
index f5eb78a1ff..fc7968d5c6 100644
--- a/code/modules/vore/fluffstuff/custom_permits_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_permits_vr.dm
@@ -2,7 +2,7 @@
owner = 1 // These permits already have owners.
desc = "A card indicating that the owner is allowed to carry a firearm/sidearm. It is issued by CentCom, so it is valid until it expires. This one is just a sample, so it belongs to no one."
-/obj/item/clothing/accessory/permit/gun/fluff/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/clothing/accessory/permit/gun/fluff/emag_act(remaining_charges, mob/user)
to_chat(user, "You cannot reset the naming locks on [src]. It's issued by CentCom and totally tamper-proof!")
return
diff --git a/code/modules/vore/mob_tf.dm b/code/modules/vore/mob_tf.dm
index 4a279a0850..1ef7bfd81a 100644
--- a/code/modules/vore/mob_tf.dm
+++ b/code/modules/vore/mob_tf.dm
@@ -1,6 +1,6 @@
// Procs for living mobs based around mob transformation. Initially made for the mouseray, they are now used in various other places and the main procs are now called from here.
-/mob/living/proc/tf_into(var/A, var/allow_emotes = FALSE, var/object_name)
+/mob/living/proc/tf_into(A, allow_emotes = FALSE, object_name)
if(isliving(A))
var/mob/living/M = A
transform_into_mob(M, FALSE)
@@ -15,7 +15,7 @@
I.unacidable = !digestable
forceMove(possessed_voice)
-/mob/living/proc/mob_belly_transfer(var/mob/living/M)
+/mob/living/proc/mob_belly_transfer(mob/living/M)
for(var/obj/belly/B as anything in M.vore_organs)
B.loc = src
B.forceMove(src)
@@ -23,7 +23,7 @@
M.vore_organs -= B
src.vore_organs += B
-/mob/living/proc/transfer_mob_identity(var/mob/living/new_mob)
+/mob/living/proc/transfer_mob_identity(mob/living/new_mob)
for(var/obj/belly/B as anything in new_mob.vore_organs)
new_mob.vore_organs -= B
qdel(B)
@@ -134,7 +134,7 @@
if(tf_mob_holder.stat == DEAD)
death()
-/mob/living/proc/copy_vore_prefs_to_mob(var/mob/living/new_mob)
+/mob/living/proc/copy_vore_prefs_to_mob(mob/living/new_mob)
//For primarily copying vore preference settings from a carbon mob to a simplemob
//It can be used for other things, but be advised, if you're using it to put a simplemob into a carbon mob, you're gonna be overriding a bunch of prefs
@@ -226,7 +226,7 @@
else
transform_into_mob(tf_form, TRUE, TRUE, TRUE)
-/mob/living/set_dir(var/new_dir)
+/mob/living/set_dir(new_dir)
. = ..()
if(size_multiplier != 1 || icon_scale_x != 1 && center_offset > 0)
update_transform(TRUE)
diff --git a/code/modules/vore/mouseray.dm b/code/modules/vore/mouseray.dm
index 20dc62bf73..dd7d0f59aa 100644
--- a/code/modules/vore/mouseray.dm
+++ b/code/modules/vore/mouseray.dm
@@ -82,7 +82,7 @@
tracer_type = /obj/effect/projectile/tracer/laser_omni
impact_type = /obj/effect/projectile/impact/laser_omni
-/obj/item/projectile/beam/mouselaser/on_hit(var/atom/target)
+/obj/item/projectile/beam/mouselaser/on_hit(atom/target)
var/mob/living/M = target
if(!istype(M))
return
@@ -102,7 +102,7 @@
M.tf_into(new_mob)
-/obj/item/projectile/beam/mouselaser/proc/spawn_mob(var/mob/living/target)
+/obj/item/projectile/beam/mouselaser/proc/spawn_mob(mob/living/target)
if(!ispath(tf_type))
return
var/new_mob = new tf_type(get_turf(target))
@@ -135,7 +135,7 @@
name = "recombobulation beam"
tf_admin_pref_override = FALSE
-/obj/item/projectile/beam/mouselaser/reversion/on_hit(var/atom/target)
+/obj/item/projectile/beam/mouselaser/reversion/on_hit(atom/target)
if(istype(target,/obj/item)) //Are we shooting an item?
var/obj/item/O = target
if(O.possessed_voice.len) //Does the object have a voice? AKA, if someone inhabiting it?
@@ -260,7 +260,7 @@
name = "unstable metamorphosis ray"
tf_allow_select = FALSE
-/obj/item/gun/energy/mouseray/metamorphosis/advanced/random/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/energy/mouseray/metamorphosis/advanced/random/attackby(obj/item/A as obj, mob/user as mob)
if(A.has_tool_quality(TOOL_MULTITOOL))
if(tf_allow_select)
to_chat(user, span_warning("You scramble the stored data on \the [src], making it less reliable."))
diff --git a/code/modules/vore/persist/persist_vr.dm b/code/modules/vore/persist/persist_vr.dm
index 0992e3a9e1..ecaefe9574 100644
--- a/code/modules/vore/persist/persist_vr.dm
+++ b/code/modules/vore/persist/persist_vr.dm
@@ -41,7 +41,7 @@
/**
* Prep for save: returns a preferences object if we're ready and allowed to save this mob.
*/
-/proc/prep_for_persist(var/mob/persister)
+/proc/prep_for_persist(mob/persister)
if(!istype(persister))
stack_trace("Persist (P4P): Given non-mob [persister].")
return
@@ -73,13 +73,13 @@
/**
* Called when mob despawns early (via cryopod)!
*/
-/proc/persist_despawned_mob(var/mob/occupant, var/obj/machinery/cryopod/pod)
+/proc/persist_despawned_mob(mob/occupant, obj/machinery/cryopod/pod)
ASSERT(istype(pod))
ASSERT(ispath(pod.spawnpoint_type, /datum/spawnpoint))
persist_interround_data(occupant, pod.spawnpoint_type)
return 1
-/proc/persist_interround_data(var/mob/occupant, var/datum/spawnpoint/new_spawn_point_type)
+/proc/persist_interround_data(mob/occupant, datum/spawnpoint/new_spawn_point_type)
if(!istype(occupant))
stack_trace("Persist (PID): Given non-mob [occupant].")
return
@@ -117,7 +117,7 @@
// Saves mob's current coloration state to prefs
// This basically needs to be the reverse of /datum/category_item/player_setup_item/general/body/copy_to_mob() ~Leshana
-/proc/apply_coloration_to_prefs(var/mob/living/carbon/human/character, var/datum/preferences/prefs)
+/proc/apply_coloration_to_prefs(mob/living/carbon/human/character, datum/preferences/prefs)
if(!istype(character)) return
prefs.h_style = character.h_style
@@ -134,7 +134,7 @@
// Saves mob's current custom species, ears, tail, wings and digitigrade legs state to prefs
// This basically needs to be the reverse of /datum/category_item/player_setup_item/vore/ears/copy_to_mob() ~Leshana
-/proc/apply_ears_to_prefs(var/mob/living/carbon/human/character, var/datum/preferences/prefs)
+/proc/apply_ears_to_prefs(mob/living/carbon/human/character, datum/preferences/prefs)
if(character.ear_style) prefs.ear_style = character.ear_style.name
if(character.tail_style) prefs.tail_style = character.tail_style.name
if(character.wing_style) prefs.wing_style = character.wing_style.name
@@ -164,7 +164,7 @@
// Saves mob's current organ state to prefs.
// This basically needs to be the reverse of /datum/category_item/player_setup_item/general/body/copy_to_mob() ~Leshana
-/proc/apply_organs_to_prefs(var/mob/living/carbon/human/character, var/datum/preferences/prefs)
+/proc/apply_organs_to_prefs(mob/living/carbon/human/character, datum/preferences/prefs)
if(!istype(character) || !character.species) return
var/list/organ_data = prefs.read_preference(/datum/preference/organ_data) || list()
var/list/rlimb_data = prefs.read_preference(/datum/preference/rlimb_data) || list()
@@ -202,7 +202,7 @@
// Saves mob's current body markings state to prefs.
// This basically needs to be the reverse of /datum/category_item/player_setup_item/general/body/copy_to_mob() ~Leshana
-/proc/apply_markings_to_prefs(var/mob/living/carbon/human/character, var/datum/preferences/prefs)
+/proc/apply_markings_to_prefs(mob/living/carbon/human/character, datum/preferences/prefs)
if(!istype(character)) return
prefs.body_markings = character.get_prioritised_markings() // Overwrite with new list!
@@ -211,7 +211,7 @@
* Normally this would slowly apply during the round; once we get to the end
* we need to apply it all at once.
*/
-/proc/resolve_excess_nutrition(var/mob/living/carbon/C)
+/proc/resolve_excess_nutrition(mob/living/carbon/C)
if(C.stat == DEAD)
return // You don't metabolize if dead
if(!C.metabolism || !C.species || !C.species.hunger_factor)
diff --git a/code/modules/vore/resizing/holder_micro_vr.dm b/code/modules/vore/resizing/holder_micro_vr.dm
index ec2442ce03..d4fbdc8574 100644
--- a/code/modules/vore/resizing/holder_micro_vr.dm
+++ b/code/modules/vore/resizing/holder_micro_vr.dm
@@ -26,7 +26,7 @@
icon_state = "teshariplushie_white"
item_state = "teshariplushie_white"
-/obj/item/holder/micro/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer,var/icon/clip_mask = null)
+/obj/item/holder/micro/make_worn_icon(body_type,slot_name,inhands,default_icon,default_layer,icon/clip_mask = null)
var/mob/living/carbon/human/H = held_mob
// Only proceed if dealing with a tesh (or something shaped like a tesh)
if(istype(H) && H.species.get_bodytype() == SPECIES_TESHARI)
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index 23a76ebd41..3e4cfed3af 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -19,7 +19,7 @@
holder_type = /obj/item/holder/micro
// The reverse lookup of player_sizes_list, number to name.
-/proc/player_size_name(var/size_multiplier)
+/proc/player_size_name(size_multiplier)
// (This assumes list is sorted big->small)
for(var/N in GLOB.player_sizes_list)
. = N // So we return the smallest if we get to the end
@@ -50,13 +50,13 @@
* but in the future we may also incorporate the "mob_size", so that
* a macro mouse is still only effectively "normal" or a micro dragon is still large etc.
*/
-/mob/proc/get_effective_size(var/micro = FALSE)
+/mob/proc/get_effective_size(micro = FALSE)
return 100000 //Whatever it is, it's too big to pick up, or it's a ghost, or something.
-/mob/living/get_effective_size(var/micro = FALSE)
+/mob/living/get_effective_size(micro = FALSE)
return size_multiplier
-/mob/living/carbon/human/get_effective_size(var/micro = FALSE) // Set micro to TRUE for interactions where you're small, to FALSE for ones where you're large.
+/mob/living/carbon/human/get_effective_size(micro = FALSE) // Set micro to TRUE for interactions where you're small, to FALSE for ones where you're large.
var/effective_size = size_multiplier
if(micro)
effective_size += species.micro_size_mod
@@ -91,7 +91,7 @@
* * aura_animation - CHANGE_ME. Default: TRUE
* * allow_stripping - CHANGE_ME. Default: FALSE
*/
-/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = FALSE, var/allow_stripping = FALSE) //CHOMPEdit - Disable aura_animation. Too expensive for something you can't even see.
+/mob/living/proc/resize(new_size, animate = TRUE, uncapped = FALSE, ignore_prefs = FALSE, aura_animation = FALSE, allow_stripping = FALSE) //CHOMPEdit - Disable aura_animation. Too expensive for something you can't even see.
if(!uncapped)
if((z in using_map.station_levels) && CONFIG_GET(flag/pixel_size_limit))
var/size_diff = ((runechat_y_offset() / size_multiplier) * new_size) // This returns 32 multiplied with the new size
@@ -148,7 +148,7 @@
else
update_transform() //Lame way
-/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = FALSE, var/allow_stripping = FALSE) //CHOMPEdit - Disable aura_animation. Too expensive for something you can't even see.
+/mob/living/carbon/human/resize(new_size, animate = TRUE, uncapped = FALSE, ignore_prefs = FALSE, aura_animation = FALSE, allow_stripping = FALSE) //CHOMPEdit - Disable aura_animation. Too expensive for something you can't even see.
if(!resizable && !ignore_prefs)
return 1
var/previous_scale = size_multiplier
@@ -170,7 +170,7 @@
apply_hud(index, HI)
// Optimize mannequins - never a point to animating or doing HUDs on these.
-/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE, var/allow_stripping = FALSE)
+/mob/living/carbon/human/dummy/mannequin/resize(new_size, animate = TRUE, uncapped = FALSE, ignore_prefs = FALSE, aura_animation = TRUE, allow_stripping = FALSE)
size_multiplier = new_size
/**
diff --git a/code/modules/vore/resizing/sizegun_slow_vr.dm b/code/modules/vore/resizing/sizegun_slow_vr.dm
index 0cc70c7c55..86b6317b49 100644
--- a/code/modules/vore/resizing/sizegun_slow_vr.dm
+++ b/code/modules/vore/resizing/sizegun_slow_vr.dm
@@ -24,7 +24,7 @@
if(busy)
icon_state = "[icon_state]-active"
-/obj/item/slow_sizegun/proc/should_stop(var/mob/living/target, var/mob/living/user, var/active_hand)
+/obj/item/slow_sizegun/proc/should_stop(mob/living/target, mob/living/user, active_hand)
if(!target || !user || !active_hand || !istype(target) || !istype(user) || !busy)
return TRUE
diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm
index 416b543915..c12362d3d2 100644
--- a/code/modules/vore/resizing/sizegun_vr.dm
+++ b/code/modules/vore/resizing/sizegun_vr.dm
@@ -62,7 +62,7 @@
if(size_set_to < RESIZE_MINIMUM || size_set_to > RESIZE_MAXIMUM)
to_chat(usr, span_notice("Note: Resizing limited to 25-200% automatically while outside dormatory areas.")) //hint that we clamp it in resize
-/obj/item/gun/energy/sizegun/update_icon(var/ignore_inhands)
+/obj/item/gun/energy/sizegun/update_icon(ignore_inhands)
var/grow_mode = "shrink"
if(size_set_to > 1)
grow_mode = "grow"
@@ -167,7 +167,7 @@
return ..()
-/obj/item/gun/energy/sizegun/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/energy/sizegun/attackby(obj/item/A as obj, mob/user as mob)
if(A.has_tool_quality(TOOL_WIRECUTTER))
if(backfire)
to_chat(user, span_warning("You repair the damage to the \the [src]."))
@@ -203,7 +203,7 @@
tracer_type = /obj/effect/projectile/tracer/xray
impact_type = /obj/effect/projectile/impact/xray
-/obj/item/projectile/beam/sizelaser/on_hit(var/atom/target)
+/obj/item/projectile/beam/sizelaser/on_hit(atom/target)
var/mob/living/M = target
var/ignoring_prefs = (target == firer ? TRUE : FALSE) // Resizing yourself
if(istype(M))
@@ -218,7 +218,7 @@
return
return 1
-/obj/item/projectile/beam/sizelaser/admin/on_hit(var/atom/target)
+/obj/item/projectile/beam/sizelaser/admin/on_hit(atom/target)
var/mob/living/M = target
if(istype(M))
diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm
index ceb6f4a454..4dee57557e 100644
--- a/code/modules/vore/smoleworld/smoleworld_vr.dm
+++ b/code/modules/vore/smoleworld/smoleworld_vr.dm
@@ -250,7 +250,7 @@
dismantle()
return
//checks for projectile damage and does the same as dismaintle but spawns material instead.
-/obj/structure/smolebuilding/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/smolebuilding/bullet_act(obj/item/projectile/Proj)
displode()
return
//is the same as dismaintal but instead of ruins it just makes it all explode
@@ -279,7 +279,7 @@
displode()
return
-/obj/structure/smoleruins/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/smoleruins/bullet_act(obj/item/projectile/Proj)
displode()
return
diff --git a/code/modules/vore/weight/fitness_machines_vr.dm b/code/modules/vore/weight/fitness_machines_vr.dm
index f0eacda3b9..8fb76e8ba3 100644
--- a/code/modules/vore/weight/fitness_machines_vr.dm
+++ b/code/modules/vore/weight/fitness_machines_vr.dm
@@ -100,7 +100,7 @@
idle_power_usage = 0
active_power_usage = 0
-/obj/machinery/scale/attack_hand(var/mob/living/user)
+/obj/machinery/scale/attack_hand(mob/living/user)
if(user.loc != loc)
to_chat(user, span_notice("You need to be standing on top of the scale for it to work!"))
return
diff --git a/code/modules/vote/vote_datum.dm b/code/modules/vote/vote_datum.dm
index 47a749b8f4..aa174c2f70 100644
--- a/code/modules/vote/vote_datum.dm
+++ b/code/modules/vote/vote_datum.dm
@@ -20,7 +20,7 @@
// For how long will it be up
var/vote_time = 60 SECONDS
-/datum/vote/New(var/_initiator, var/_question, list/_choices, var/_is_custom = FALSE)
+/datum/vote/New(_initiator, _question, list/_choices, _is_custom = FALSE)
if(SSvote.active_vote)
CRASH("Attempted to start another vote with one already in progress!")
@@ -63,7 +63,7 @@
return calculate_vote_result(voted, choices, vote_result_type)
-/datum/vote/proc/calculate_vote_result(var/list/voted, var/list/choices, var/vote_result_type)
+/datum/vote/proc/calculate_vote_result(list/voted, list/choices, vote_result_type)
var/list/results = list()
for(var/ck in voted)
@@ -117,7 +117,7 @@
return null
-/datum/vote/proc/announce(start_text, var/time = vote_time)
+/datum/vote/proc/announce(start_text, time = vote_time)
to_chat(world, span_lightpurple("Type vote or click here to place your vote. \
You have [time/10] seconds to vote."))
world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3)
diff --git a/code/modules/whitelist/whitelist.dm b/code/modules/whitelist/whitelist.dm
index 772872eb3e..336249078d 100644
--- a/code/modules/whitelist/whitelist.dm
+++ b/code/modules/whitelist/whitelist.dm
@@ -21,7 +21,7 @@
. += key
-/proc/load_whitelist(var/key)
+/proc/load_whitelist(key)
var/filename = "data/player_saves/[copytext(ckey(key),1,2)]/[ckey(key)]/whitelist.json"
try
// Check the player-specific whitelist file, if it exists.
@@ -50,7 +50,7 @@
// Returns true if the specified path is in the player's whitelists, false otw.
-/client/proc/is_whitelisted(var/path)
+/client/proc/is_whitelisted(path)
if(istext(path))
path = text2path(path)
if(!ispath(path))
@@ -61,7 +61,7 @@
return src.whitelists[path]
-/proc/is_alien_whitelisted(mob/M, var/datum/species/species)
+/proc/is_alien_whitelisted(mob/M, datum/species/species)
//They are admin or the whitelist isn't in use
if(whitelist_overrides(M))
return TRUE
@@ -78,7 +78,7 @@
return C.is_whitelisted(species.type)
-/proc/is_lang_whitelisted(mob/M, var/datum/language/language)
+/proc/is_lang_whitelisted(mob/M, datum/language/language)
//They are admin or the whitelist isn't in use
if(whitelist_overrides(M))
return TRUE
diff --git a/code/modules/xenoarcheaology/anomaly_container.dm b/code/modules/xenoarcheaology/anomaly_container.dm
index cb75abafde..64ce938248 100644
--- a/code/modules/xenoarcheaology/anomaly_container.dm
+++ b/code/modules/xenoarcheaology/anomaly_container.dm
@@ -20,17 +20,17 @@
contain(Ob)
break
-/obj/structure/anomaly_container/proc/can_contain(var/obj/O)
+/obj/structure/anomaly_container/proc/can_contain(obj/O)
return O.is_anomalous()
-/obj/structure/anomaly_container/attack_hand(var/mob/user)
+/obj/structure/anomaly_container/attack_hand(mob/user)
release()
-/obj/structure/anomaly_container/attack_robot(var/mob/user)
+/obj/structure/anomaly_container/attack_robot(mob/user)
if(Adjacent(user))
release()
-/obj/structure/anomaly_container/proc/contain(var/obj/machinery/artifact/artifact)
+/obj/structure/anomaly_container/proc/contain(obj/machinery/artifact/artifact)
if(contained)
return
contained = artifact
@@ -46,7 +46,7 @@
underlays.Cut()
desc = initial(desc)
-/atom/MouseDrop(var/obj/structure/anomaly_container/over_object)
+/atom/MouseDrop(obj/structure/anomaly_container/over_object)
. = ..()
if(istype(over_object))
diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm
index 9a8562a22f..69ea0a57c1 100644
--- a/code/modules/xenoarcheaology/boulder.dm
+++ b/code/modules/xenoarcheaology/boulder.dm
@@ -16,7 +16,7 @@
icon_state = "boulder[rand(1,4)]"
excavation_level = rand(5, 50)
-/obj/structure/boulder/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/boulder/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/core_sampler))
src.geological_data.artifact_distance = rand(-100,100) / 100
src.geological_data.artifact_id = artifact_find.artifact_id
diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm
index d3ec197110..9c730ef2b5 100644
--- a/code/modules/xenoarcheaology/effect.dm
+++ b/code/modules/xenoarcheaology/effect.dm
@@ -34,7 +34,7 @@
else
return master
-/datum/artifact_effect/New(var/datum/component/artifact_master/newmaster)
+/datum/artifact_effect/New(datum/component/artifact_master/newmaster)
..()
master = newmaster
@@ -76,7 +76,7 @@
if(can_start_activated && prob(50))
ToggleActivate(TRUE, TRUE)
-/datum/artifact_effect/proc/ToggleActivate(var/reveal_toggle = TRUE, var/spawn_toggle = FALSE)
+/datum/artifact_effect/proc/ToggleActivate(reveal_toggle = TRUE, spawn_toggle = FALSE)
//so that other stuff happens first
set waitfor = FALSE
@@ -108,9 +108,9 @@
toplevelholder = toplevelholder.loc
toplevelholder.visible_message(span_filter_notice("[span_red("[icon2html(toplevelholder, viewers(toplevelholder))] [toplevelholder] [display_msg]")]"))
-/datum/artifact_effect/proc/DoEffectTouch(var/mob/user)
-/datum/artifact_effect/proc/DoEffectAura(var/atom/holder)
-/datum/artifact_effect/proc/DoEffectPulse(var/atom/holder)
+/datum/artifact_effect/proc/DoEffectTouch(mob/user)
+/datum/artifact_effect/proc/DoEffectAura(atom/holder)
+/datum/artifact_effect/proc/DoEffectPulse(atom/holder)
/datum/artifact_effect/proc/UpdateMove()
/datum/artifact_effect/process()
@@ -208,7 +208,7 @@
. += "
"
//returns 0..1, with 1 being no protection and 0 being fully protected
-/proc/GetAnomalySusceptibility(var/mob/living/carbon/human/H)
+/proc/GetAnomalySusceptibility(mob/living/carbon/human/H)
if(!istype(H))
return 1
var/area/A = get_area(H)
diff --git a/code/modules/xenoarcheaology/effects/animate_anomaly.dm b/code/modules/xenoarcheaology/effects/animate_anomaly.dm
index 49bb4613da..7ab03310ae 100644
--- a/code/modules/xenoarcheaology/effects/animate_anomaly.dm
+++ b/code/modules/xenoarcheaology/effects/animate_anomaly.dm
@@ -7,7 +7,7 @@
effect_state = "pulsing"
effect_color = "#00c3ff"
-/datum/artifact_effect/animate_anomaly/ToggleActivate(var/reveal_toggle = 1)
+/datum/artifact_effect/animate_anomaly/ToggleActivate(reveal_toggle = 1)
..()
find_target()
@@ -15,7 +15,7 @@
..()
effectrange = max(3, effectrange)
-/datum/artifact_effect/animate_anomaly/proc/find_target(var/obj/item/anodevice/utilizer)
+/datum/artifact_effect/animate_anomaly/proc/find_target(obj/item/anodevice/utilizer)
var/atom/masterholder = get_master_holder()
if(utilizer) //We are in an artifact utilizer! Just run from whoever touched us last!
masterholder = utilizer
@@ -36,7 +36,7 @@
target = ClosestMob
-/datum/artifact_effect/animate_anomaly/DoEffectTouch(var/mob/living/user)
+/datum/artifact_effect/animate_anomaly/DoEffectTouch(mob/living/user)
var/atom/holder = get_master_holder()
var/obj/O = holder
var/turf/T = get_step_away(O, user)
diff --git a/code/modules/xenoarcheaology/effects/atmospheric.dm b/code/modules/xenoarcheaology/effects/atmospheric.dm
index fe1c80e5f8..47492a0d80 100644
--- a/code/modules/xenoarcheaology/effects/atmospheric.dm
+++ b/code/modules/xenoarcheaology/effects/atmospheric.dm
@@ -17,7 +17,7 @@
//effect = pick(EFFECT_TOUCH, EFFECT_AURA) //Changed to just AURA for now.
gas_type = pick(GAS_CO2, GAS_N2, GAS_N2O, GAS_O2, GAS_PHORON, GAS_VOLATILE_FUEL) //the only way you will EVER see volatile fuel.
-/datum/artifact_effect/gas/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/gas/DoEffectTouch(mob/user)
var/atom/holder = get_master_holder()
if(holder) //We should always have a holder.
var/turf/holder_loc
diff --git a/code/modules/xenoarcheaology/effects/berserk.dm b/code/modules/xenoarcheaology/effects/berserk.dm
index 23ba3e415e..c270ebb31f 100644
--- a/code/modules/xenoarcheaology/effects/berserk.dm
+++ b/code/modules/xenoarcheaology/effects/berserk.dm
@@ -6,7 +6,7 @@
effect_state = "summoning"
effect_color = "#5f0000"
-/datum/artifact_effect/berserk/proc/apply_berserk(var/mob/living/L)
+/datum/artifact_effect/berserk/proc/apply_berserk(mob/living/L)
if(!isliving(L))
return FALSE
@@ -26,7 +26,7 @@
it quickly passes."))
return FALSE
-/datum/artifact_effect/berserk/DoEffectTouch(var/mob/toucher)
+/datum/artifact_effect/berserk/DoEffectTouch(mob/toucher)
if(toucher && isliving(toucher))
apply_berserk(toucher)
return TRUE
diff --git a/code/modules/xenoarcheaology/effects/cell.dm b/code/modules/xenoarcheaology/effects/cell.dm
index 29ca4c88a9..9dc3dc2f54 100644
--- a/code/modules/xenoarcheaology/effects/cell.dm
+++ b/code/modules/xenoarcheaology/effects/cell.dm
@@ -14,7 +14,7 @@
charge_type = pick(CELL_DRAIN, CELL_CHARGE)
-/datum/artifact_effect/cell/proc/effect_cells(var/amount = 25, var/effect)
+/datum/artifact_effect/cell/proc/effect_cells(amount = 25, effect)
var/atom/holder = get_master_holder()
if(!holder)
return
diff --git a/code/modules/xenoarcheaology/effects/dnaswitch.dm b/code/modules/xenoarcheaology/effects/dnaswitch.dm
index 1fddd43457..6bf63113dc 100644
--- a/code/modules/xenoarcheaology/effects/dnaswitch.dm
+++ b/code/modules/xenoarcheaology/effects/dnaswitch.dm
@@ -17,7 +17,7 @@
else
effect_strength = rand(10,20) //This one is SUPER beneficial to the geneticist, as they can mutate monkeys.
-/datum/artifact_effect/dnaswitch/DoEffectTouch(var/mob/toucher)
+/datum/artifact_effect/dnaswitch/DoEffectTouch(mob/toucher)
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
if(prob(effect_strength))
diff --git a/code/modules/xenoarcheaology/effects/electric_field.dm b/code/modules/xenoarcheaology/effects/electric_field.dm
index f00c406963..562d86fc95 100644
--- a/code/modules/xenoarcheaology/effects/electric_field.dm
+++ b/code/modules/xenoarcheaology/effects/electric_field.dm
@@ -7,7 +7,7 @@
var/last_used = 0
var/use_delay = 5 SECONDS //Time between uses.
-/datum/artifact_effect/electric_field/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/electric_field/DoEffectTouch(mob/user)
var/atom/holder = get_master_holder()
if(last_used >= world.time + use_delay)
return
diff --git a/code/modules/xenoarcheaology/effects/feelings.dm b/code/modules/xenoarcheaology/effects/feelings.dm
index b136487bd8..2351875ea8 100644
--- a/code/modules/xenoarcheaology/effects/feelings.dm
+++ b/code/modules/xenoarcheaology/effects/feelings.dm
@@ -91,7 +91,7 @@
-/datum/artifact_effect/feelings/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/feelings/DoEffectTouch(mob/user)
if(user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/code/modules/xenoarcheaology/effects/feysight.dm b/code/modules/xenoarcheaology/effects/feysight.dm
index a24f99f52c..a1039dd47c 100644
--- a/code/modules/xenoarcheaology/effects/feysight.dm
+++ b/code/modules/xenoarcheaology/effects/feysight.dm
@@ -6,7 +6,7 @@
effect_state = "pulsing"
effect_color = "#00c763"
-/datum/artifact_effect/feysight/proc/apply_modifier(var/mob/living/L)
+/datum/artifact_effect/feysight/proc/apply_modifier(mob/living/L)
if(!isliving(L))
return FALSE
@@ -26,7 +26,7 @@
it quickly passes."))
return FALSE
-/datum/artifact_effect/feysight/DoEffectTouch(var/mob/toucher)
+/datum/artifact_effect/feysight/DoEffectTouch(mob/toucher)
if(toucher && isliving(toucher))
apply_modifier(toucher)
return TRUE
diff --git a/code/modules/xenoarcheaology/effects/gaia.dm b/code/modules/xenoarcheaology/effects/gaia.dm
index c9a1faa7fd..8f940dc571 100644
--- a/code/modules/xenoarcheaology/effects/gaia.dm
+++ b/code/modules/xenoarcheaology/effects/gaia.dm
@@ -7,7 +7,7 @@
effect_color = "#8cd448"
-/datum/artifact_effect/gaia/proc/age_plantlife(var/obj/machinery/portable_atmospherics/hydroponics/Tray = null)
+/datum/artifact_effect/gaia/proc/age_plantlife(obj/machinery/portable_atmospherics/hydroponics/Tray = null)
if(istype(Tray) && Tray.seed)
Tray.health += rand(1,3) * HYDRO_SPEED_MULTIPLIER
Tray.age += 1
@@ -31,7 +31,7 @@
age_plantlife(Tray)
P.update_icon()
-/datum/artifact_effect/gaia/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/gaia/DoEffectTouch(mob/user)
var/atom/holder = get_master_holder()
to_chat(user, span_alien("You feel the presence of something long forgotten."))
for(var/obj/machinery/portable_atmospherics/hydroponics/Tray in view(world.view,get_turf(holder)))
diff --git a/code/modules/xenoarcheaology/effects/gravitational_waves.dm b/code/modules/xenoarcheaology/effects/gravitational_waves.dm
index c665dfb038..59bb7c58c6 100644
--- a/code/modules/xenoarcheaology/effects/gravitational_waves.dm
+++ b/code/modules/xenoarcheaology/effects/gravitational_waves.dm
@@ -28,7 +28,7 @@
pull_power = rand(STAGE_ONE, STAGE_FOUR)
/// BEWARE THOSE WHO TOUCH THIS FILE.
-/datum/artifact_effect/extreme/gravity_wave/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/extreme/gravity_wave/DoEffectTouch(mob/user)
var/atom/holder = get_master_holder()
if(istype(holder, /obj/item/anobattery))
var/obj/item/anodevice/utilizer = holder.loc
@@ -53,7 +53,7 @@
holder.visible_message(span_alien("\The [holder] distorts as local gravity intensifies, and shifts toward it."))
gravwave(get_turf(holder), effectrange, pull_power)
-/datum/artifact_effect/extreme/gravity_wave/proc/gravwave(var/atom/target, var/pull_range = 7, var/pull_power = STAGE_TWO)
+/datum/artifact_effect/extreme/gravity_wave/proc/gravwave(atom/target, pull_range = 7, pull_power = STAGE_TWO)
if(world.time >= last_wave_pull+10) //NO INFINITE LOOPS. do not touch this line or you WILL crash the server. I am not kidding. Go ahead, remove it on a test server and see what happens.
last_wave_pull = world.time
for(var/atom/A in oview(pull_range, target))
diff --git a/code/modules/xenoarcheaology/effects/health.dm b/code/modules/xenoarcheaology/effects/health.dm
index f6b29a02a1..022cf33dd4 100644
--- a/code/modules/xenoarcheaology/effects/health.dm
+++ b/code/modules/xenoarcheaology/effects/health.dm
@@ -15,7 +15,7 @@
else
effect_color = "#6d1212"
-/datum/artifact_effect/health/DoEffectTouch(var/mob/toucher)
+/datum/artifact_effect/health/DoEffectTouch(mob/toucher)
var/atom/holder = get_master_holder()
if(istype(holder, /obj/item/anobattery))
var/obj/item/anobattery/battery = holder
diff --git a/code/modules/xenoarcheaology/effects/poltergeist.dm b/code/modules/xenoarcheaology/effects/poltergeist.dm
index 65208c7ca1..caed779b0e 100644
--- a/code/modules/xenoarcheaology/effects/poltergeist.dm
+++ b/code/modules/xenoarcheaology/effects/poltergeist.dm
@@ -6,7 +6,7 @@
effect_state = "shield2"
effect_color = "#a824c9"
-/datum/artifact_effect/poltergeist/proc/throw_at_mob(var/mob/living/target, var/damage = 20)
+/datum/artifact_effect/poltergeist/proc/throw_at_mob(mob/living/target, damage = 20)
var/list/valid_targets = list()
for(var/obj/O in oview(world.view, target))
@@ -18,7 +18,7 @@
obj_to_throw.visible_message(span_alien("\The [obj_to_throw] levitates, before hurtling toward [target]!"))
obj_to_throw.throw_at(target, world.view, min(40, damage * GetAnomalySusceptibility(target)))
-/datum/artifact_effect/poltergeist/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/poltergeist/DoEffectTouch(mob/user)
throw_at_mob(user, rand(10, 30))
/datum/artifact_effect/poltergeist/DoEffectAura()
diff --git a/code/modules/xenoarcheaology/effects/power_generator.dm b/code/modules/xenoarcheaology/effects/power_generator.dm
index 781f63247a..fe46a6d6e3 100644
--- a/code/modules/xenoarcheaology/effects/power_generator.dm
+++ b/code/modules/xenoarcheaology/effects/power_generator.dm
@@ -25,7 +25,7 @@
/datum/artifact_effect/generator/ToggleActivate()
return //We can not be turned off.
-/datum/artifact_effect/generator/DoEffectTouch(var/mob/living/carbon/human/user)
+/datum/artifact_effect/generator/DoEffectTouch(mob/living/carbon/human/user)
var/obj/holder = get_master_holder()
if (..())
return
@@ -53,7 +53,7 @@
// playsound(holder, 'X', 75, TRUE, 0, 2) //TODO: Get sounds here
holder.set_light(FALSE)
-/datum/artifact_effect/generator/process(var/obj/holder)
+/datum/artifact_effect/generator/process(obj/holder)
holder = get_master_holder()
if(attached)
var/datum/powernet/PN = attached.powernet
diff --git a/code/modules/xenoarcheaology/effects/radiate.dm b/code/modules/xenoarcheaology/effects/radiate.dm
index a68301f788..d6c691913e 100644
--- a/code/modules/xenoarcheaology/effects/radiate.dm
+++ b/code/modules/xenoarcheaology/effects/radiate.dm
@@ -10,7 +10,7 @@
radiation_amount = rand(1, 10)
effect_type = EFFECT_RADIATE
-/datum/artifact_effect/radiate/DoEffectTouch(var/mob/living/user)
+/datum/artifact_effect/radiate/DoEffectTouch(mob/living/user)
if(user)
user.apply_effect(radiation_amount * 5,IRRADIATE,0)
user.updatehealth()
diff --git a/code/modules/xenoarcheaology/effects/resurrect.dm b/code/modules/xenoarcheaology/effects/resurrect.dm
index aaa3ee08b6..0f2084944d 100644
--- a/code/modules/xenoarcheaology/effects/resurrect.dm
+++ b/code/modules/xenoarcheaology/effects/resurrect.dm
@@ -13,7 +13,7 @@
effect = rand(EFFECT_AURA, EFFECT_PULSE)
trigger = pick(TRIGGER_WATER, TRIGGER_ACID, TRIGGER_VOLATILE, TRIGGER_TOXIN, TRIGGER_FORCE, TRIGGER_ENERGY, TRIGGER_HEAT, TRIGGER_COLD) //No trigger touch.
-/datum/artifact_effect/resurrect/proc/steal_life(var/mob/living/target = null)
+/datum/artifact_effect/resurrect/proc/steal_life(mob/living/target = null)
var/atom/holder = get_master_holder()
if(istype(holder, /obj/item/anobattery))
holder = holder.loc
@@ -35,7 +35,7 @@
return 0
-/datum/artifact_effect/resurrect/proc/give_life(var/mob/living/target = null)
+/datum/artifact_effect/resurrect/proc/give_life(mob/living/target = null)
var/atom/holder = get_master_holder()
/// ALRIGHT, LET ME EXPLAIN THIS ABOMINATION.
@@ -67,7 +67,7 @@
attempt_revive(target)
stored_life = 0
-/datum/artifact_effect/resurrect/proc/attempt_revive(var/mob/living/L = null)
+/datum/artifact_effect/resurrect/proc/attempt_revive(mob/living/L = null)
var/atom/holder = get_master_holder()
spawn()
if(isanimal(L))
@@ -107,7 +107,7 @@
else
holder.visible_message(span_alien("\The [H]'s body stays still...Perhaps their mind was not ready to rejoin their body."))
-/datum/artifact_effect/resurrect/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/resurrect/DoEffectTouch(mob/user)
var/atom/holder = get_master_holder()
if(istype(holder, /obj/item/anobattery))
holder = holder.loc
diff --git a/code/modules/xenoarcheaology/effects/robothealth.dm b/code/modules/xenoarcheaology/effects/robothealth.dm
index a280cb5ffd..5f72dd8a87 100644
--- a/code/modules/xenoarcheaology/effects/robothealth.dm
+++ b/code/modules/xenoarcheaology/effects/robothealth.dm
@@ -16,7 +16,7 @@
else
effect_color = "#3879ad"
-/datum/artifact_effect/robohealth/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/robohealth/DoEffectTouch(mob/user)
if(user)
if(isrobot(user))
var/mob/living/silicon/robot/R = user
diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm
index 63978c2e3d..41d0c23890 100644
--- a/code/modules/xenoarcheaology/effects/sleepy.dm
+++ b/code/modules/xenoarcheaology/effects/sleepy.dm
@@ -7,7 +7,7 @@
..()
effect_type = EFFECT_SLEEPY
-/datum/artifact_effect/sleepy/DoEffectTouch(var/mob/toucher)
+/datum/artifact_effect/sleepy/DoEffectTouch(mob/toucher)
if(toucher)
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
diff --git a/code/modules/xenoarcheaology/effects/stun.dm b/code/modules/xenoarcheaology/effects/stun.dm
index d74bfdefbf..13fe305807 100644
--- a/code/modules/xenoarcheaology/effects/stun.dm
+++ b/code/modules/xenoarcheaology/effects/stun.dm
@@ -7,7 +7,7 @@
..()
effect_type = EFFECT_STUN
-/datum/artifact_effect/stun/DoEffectTouch(var/mob/toucher)
+/datum/artifact_effect/stun/DoEffectTouch(mob/toucher)
if(toucher && iscarbon(toucher))
var/mob/living/carbon/C = toucher
var/susceptibility = GetAnomalySusceptibility(C)
diff --git a/code/modules/xenoarcheaology/effects/teleport.dm b/code/modules/xenoarcheaology/effects/teleport.dm
index 0092e6defd..3d11f0d08e 100644
--- a/code/modules/xenoarcheaology/effects/teleport.dm
+++ b/code/modules/xenoarcheaology/effects/teleport.dm
@@ -5,7 +5,7 @@
effect_state = "pulsing"
effect_color = "#88ffdb"
-/datum/artifact_effect/teleport/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/teleport/DoEffectTouch(mob/user)
var/atom/holder = get_master_holder()
var/weakness = GetAnomalySusceptibility(user)
if(prob(100 * weakness))
diff --git a/code/modules/xenoarcheaology/effects/temperature.dm b/code/modules/xenoarcheaology/effects/temperature.dm
index 6a41272aaf..f1102b6e40 100644
--- a/code/modules/xenoarcheaology/effects/temperature.dm
+++ b/code/modules/xenoarcheaology/effects/temperature.dm
@@ -19,7 +19,7 @@
target_temp = rand (0, 150)
effect_type = EFFECT_TEMPERATURE
-/datum/artifact_effect/temperature/DoEffectTouch(var/mob/user) //This still exists in case you VV it.
+/datum/artifact_effect/temperature/DoEffectTouch(mob/user) //This still exists in case you VV it.
var/atom/holder = get_master_holder()
if(holder)
to_chat(user, span_blue("A chill passes up your spine!"))
diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm
index 4391976909..798886a42b 100644
--- a/code/modules/xenoarcheaology/effects/vampire.dm
+++ b/code/modules/xenoarcheaology/effects/vampire.dm
@@ -13,7 +13,7 @@
effect_state = "gravisphere"
effect_color = "#ff0000"
-/datum/artifact_effect/vampire/proc/bloodcall(var/mob/living/carbon/human/M)
+/datum/artifact_effect/vampire/proc/bloodcall(mob/living/carbon/human/M)
var/atom/holder = get_master_holder()
if(istype(holder, /obj/item/anobattery))
holder = holder.loc
@@ -40,7 +40,7 @@
/// In testing, (with it set to effect = 1 aka AURA, it got ~18 charges with 300 anobattery usage, 22% blood loss from the person being drained, and 41 damage to them (plus the resulting 20 oxyloss from low blood)
/// I feel like 22% blood loss and 41 damage is a good exchange for 18 charges. If this seems to be too strong later down the line, just change that /10 above to a /15 (33% less per blood) or /20 (50% less per blood)
-/datum/artifact_effect/vampire/DoEffectTouch(var/mob/user)
+/datum/artifact_effect/vampire/DoEffectTouch(mob/user)
if(world.time - bloodcall_interval*2 > last_bloodcall) //The artifact harvester works by having you massively targeted if you use it as a 'on touch' artifact.
bloodcall(user) // Due to such, things like the 'harm artifact' will just annihilate you if you set it high enough. This will also annihilate you, but it feels really cheesey, so let's not do that, as DoEffectTouch calls DoEffectAura already.
// Additionally, it requires the *2 or it will ALWAYS target the person who activated it
diff --git a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm
index aaa86f3cb7..fca09976f6 100644
--- a/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm
+++ b/code/modules/xenoarcheaology/finds/Weapons/archeo_melee.dm
@@ -185,7 +185,7 @@
summon_item(user, summoned_item)
return
-/obj/item/melee/artifact_blade/proc/consecrate_toggle(mob/user as mob, var/toggle)
+/obj/item/melee/artifact_blade/proc/consecrate_toggle(mob/user as mob, toggle)
switch(toggle)
if("Toggle on")
consecrating = TRUE
@@ -202,7 +202,7 @@
/// The summonables list can be VV'd by admins to allow for adminbus.
/// To add to the list: Add-Item, Multi-line text (Front-facing name), Associated value = yes, Atom Typepath = whatever you want.
/// This should appear something like " Paper = /obj/item/paper " if you did it right, and will let them summon paper!
-/obj/item/melee/artifact_blade/proc/summon_item(mob/user as mob, var/selected_item)
+/obj/item/melee/artifact_blade/proc/summon_item(mob/user as mob, selected_item)
if(selected_item)
if(selected_item == "Soulstone")
var/decision2 = tgui_alert(user, "Do you wish to create a redspace gem? This will take 200 lifeforce from the sword.", "Generate Gem", list("YES", "NO"))
@@ -272,7 +272,7 @@
/// The fancy animation it plays when you hit something to convert it!
-/obj/item/melee/artifact_blade/proc/conjure_animation(var/turf/target) //Taken from occult wizard code.
+/obj/item/melee/artifact_blade/proc/conjure_animation(turf/target) //Taken from occult wizard code.
var/atom/movable/overlay/animation = new /atom/movable/overlay(target)
animation.name = "conjure"
animation.icon = 'icons/effects/effects.dmi'
diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm
index da29703c57..e2b655f71a 100644
--- a/code/modules/xenoarcheaology/finds/find_spawning.dm
+++ b/code/modules/xenoarcheaology/finds/find_spawning.dm
@@ -18,7 +18,7 @@
var/type_to_spawn = tgui_input_number(usr, "Desired type to spawn. Consult xenoarcheaology.dm for the spawn list", "Spawn Artifact", 0)
new /obj/item/archaeological_find(src.loc, type_to_spawn)
-/obj/item/archaeological_find/Initialize(mapload, var/new_item_type)
+/obj/item/archaeological_find/Initialize(mapload, new_item_type)
. = ..()
if(new_item_type)
find_type = new_item_type
diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm
index 958d82ba13..9fa7fdd301 100644
--- a/code/modules/xenoarcheaology/finds/finds.dm
+++ b/code/modules/xenoarcheaology/finds/finds.dm
@@ -4,7 +4,7 @@
var/view_range = 200 //how close excavation has to come to show an overlay on the turf
var/prob_delicate = 0 //probability it requires an active suspension field to not insta-crumble. Set to 0 to nullify the need for suspension field.
-/datum/find/New(var/digsite, var/exc_req)
+/datum/find/New(digsite, exc_req)
excavation_required = exc_req
find_type = get_random_find_type(digsite)
@@ -16,7 +16,7 @@
var/datum/geosample/geologic_data
w_class = ITEMSIZE_SMALL
-/obj/item/strangerock/Initialize(mapload, var/inside_item_type = 0)
+/obj/item/strangerock/Initialize(mapload, inside_item_type = 0)
. = ..()
pixel_x = rand(0,16)-8
pixel_y = rand(0,8)-8
@@ -47,7 +47,7 @@
else //if we somehow glitched
return //do nothing
-/obj/item/strangerock/attackby(var/obj/item/I, var/mob/user)
+/obj/item/strangerock/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/pickaxe)) //Whatever, if you use a hand pick it should work just like a brush. No reason for otherwise.
var/obj/item/inside = locate() in src
if(inside)
diff --git a/code/modules/xenoarcheaology/finds/finds_defines.dm b/code/modules/xenoarcheaology/finds/finds_defines.dm
index f79f276b1b..c424f529b7 100644
--- a/code/modules/xenoarcheaology/finds/finds_defines.dm
+++ b/code/modules/xenoarcheaology/finds/finds_defines.dm
@@ -4,7 +4,7 @@
/// This is called when using the depth_scanner on an artifact tile. It tells you what artifact group type is contained inside.
/// Previously, we only used MERCURY, IRON, NITROGEN, POTASSIUM, CARBON, PHORON. Now, we expanded!
///
-/proc/get_responsive_reagent(var/find_type)
+/proc/get_responsive_reagent(find_type)
switch(find_type)
if(ARCHAEO_STATUETTE, ARCHAEO_INSTRUMENT, ARCHAEO_HANDCUFFS, ARCHAEO_BEARTRAP, ARCHAEO_LIGHTER, ARCHAEO_BOX, ARCHAEO_PEN, ARCHAEO_COIN, ARCHAEO_STOCKPARTS)
return REAGENT_ID_MERCURY
@@ -25,7 +25,7 @@
/proc/get_random_digsite_type()
return pick(100;DIGSITE_GARDEN, 90;DIGSITE_HOUSE, 85;DIGSITE_TECHNICAL, 85;DIGSITE_MIDDEN, 80;DIGSITE_TEMPLE, 75;DIGSITE_WAR)
-/proc/get_random_find_type(var/digsite)
+/proc/get_random_find_type(digsite)
. = 0
switch(digsite)
if(DIGSITE_GARDEN)
diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm
index e8303e1458..951a7c1cd8 100644
--- a/code/modules/xenoarcheaology/finds/special.dm
+++ b/code/modules/xenoarcheaology/finds/special.dm
@@ -135,7 +135,7 @@
if(world.time - last_bloodcall >= bloodcall_interval && (M in view(7, src)))
bloodcall(M)
-/obj/item/vampiric/proc/bloodcall(var/mob/living/carbon/human/M)
+/obj/item/vampiric/proc/bloodcall(mob/living/carbon/human/M)
last_bloodcall = world.time
if(istype(M))
playsound(src, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3)
@@ -225,5 +225,5 @@
STOP_PROCESSING(SSobj, src)
qdel(src) //Let's not just sit in nullspace forever, yeah?
-/obj/effect/shadow_wight/Bump(var/atom/obstacle)
+/obj/effect/shadow_wight/Bump(atom/obstacle)
to_chat(obstacle, span_red("You feel a chill run down your spine!"))
diff --git a/code/modules/xenoarcheaology/finds/talking.dm b/code/modules/xenoarcheaology/finds/talking.dm
index 4c4f809735..e0c7adae26 100644
--- a/code/modules/xenoarcheaology/finds/talking.dm
+++ b/code/modules/xenoarcheaology/finds/talking.dm
@@ -22,7 +22,7 @@
else if(heard_words.len >= 1 && world.time > last_talk_time + talk_interval && prob(talk_chance))
SaySomething()
-/datum/talking_atom/proc/catchMessage(var/msg, var/mob/source)
+/datum/talking_atom/proc/catchMessage(msg, mob/source)
if(!holder_atom)
return
@@ -68,7 +68,7 @@
for(var/X in d)
to_world("[X]")*/
-/datum/talking_atom/proc/SaySomething(var/word = null)
+/datum/talking_atom/proc/SaySomething(word = null)
if(!holder_atom)
return
diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm
index 76edf4e7fb..ad1b75cb8d 100644
--- a/code/modules/xenoarcheaology/sampling.dm
+++ b/code/modules/xenoarcheaology/sampling.dm
@@ -23,10 +23,10 @@
var/source_mineral = REAGENT_ID_CHLORINE
var/list/find_presence = list()
-/datum/geosample/New(var/turf/simulated/mineral/container)
+/datum/geosample/New(turf/simulated/mineral/container)
UpdateTurf(container)
-/datum/geosample/proc/UpdateTurf(var/turf/simulated/mineral/container)
+/datum/geosample/proc/UpdateTurf(turf/simulated/mineral/container)
if(!istype(container))
return
@@ -63,7 +63,7 @@
for(var/carrier in find_presence)
find_presence[carrier] = find_presence[carrier] / total_presence
-/datum/geosample/proc/UpdateNearbyArtifactInfo(var/turf/simulated/mineral/container)
+/datum/geosample/proc/UpdateNearbyArtifactInfo(turf/simulated/mineral/container)
if(!container || !istype(container))
return
@@ -95,12 +95,12 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
-/obj/item/core_sampler/examine(var/mob/user)
+/obj/item/core_sampler/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
. += span_notice("Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.")
-/obj/item/core_sampler/attackby(var/obj/item/I, var/mob/living/user)
+/obj/item/core_sampler/attackby(obj/item/I, mob/living/user)
if(istype(I, /obj/item/evidencebag))
if(I.contents.len)
to_chat(user, span_warning("\The [I] is full."))
@@ -114,7 +114,7 @@
else
return ..()
-/obj/item/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user)
+/obj/item/core_sampler/proc/sample_item(item_to_sample, mob/user)
var/datum/geosample/geo_data
if(ismineralturf(item_to_sample))
diff --git a/code/modules/xenoarcheaology/tools/ano_device_battery.dm b/code/modules/xenoarcheaology/tools/ano_device_battery.dm
index ea736ed6a4..1e057a33ff 100644
--- a/code/modules/xenoarcheaology/tools/ano_device_battery.dm
+++ b/code/modules/xenoarcheaology/tools/ano_device_battery.dm
@@ -45,7 +45,7 @@
p = min(p, 100)
icon_state = "anobattery[round(p,25)]"
-/obj/item/anobattery/proc/use_power(var/amount)
+/obj/item/anobattery/proc/use_power(amount)
stored_charge = max(0, stored_charge - amount)
/obj/item/anodevice
@@ -73,11 +73,11 @@
last_user_touched = null
. = ..()
-/obj/item/anodevice/equipped(var/mob/user, var/slot)
+/obj/item/anodevice/equipped(mob/user, slot)
last_user_touched = user
..()
-/obj/item/anodevice/attackby(var/obj/I as obj, var/mob/user as mob)
+/obj/item/anodevice/attackby(obj/I as obj, mob/user as mob)
if(istype(I, /obj/item/anobattery))
if(!inserted_battery)
to_chat(user, span_blue("You insert the battery."))
diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm
index d026cce208..3d6c64996d 100644
--- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm
+++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm
@@ -137,7 +137,7 @@
scanned_object = null
//hardcoded responses, oh well
-/obj/machinery/artifact_analyser/proc/get_scan_info(var/obj/scanned_obj)
+/obj/machinery/artifact_analyser/proc/get_scan_info(obj/scanned_obj)
switch(scanned_obj.type)
if(/obj/machinery/auto_cloner)
return "Automated cloning pod - appears to rely on an artificial ecosystem formed by semi-organic nanomachines and the contained liquid.
The liquid resembles protoplasmic residue supportive of unicellular organism developmental conditions.
The structure is composed of a titanium alloy."
diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm
index 9348e1f26f..74ab78cef6 100644
--- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm
+++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm
@@ -25,7 +25,7 @@
default_apply_parts()
update_icon()
-/obj/machinery/artifact_harvester/RefreshParts(var/limited = 0)
+/obj/machinery/artifact_harvester/RefreshParts(limited = 0)
harvesting_speed = 0
// Rating goes from 1 to 5 and this bad boy has 5 caps. Let's say we want a normal one to charge a battery in 100 seconds.
// Every machine process happens every 2 seconds. So, we should have it do 5 charge every second. So 10 charge a process.
@@ -47,7 +47,7 @@
if(5)
harvesting_speed += 100
-/obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob)
+/obj/machinery/artifact_harvester/attackby(obj/I as obj, mob/user as mob)
if(istype(I,/obj/item/anobattery))
if(!inserted_battery)
to_chat(user, span_blue("You insert [I] into [src]."))
@@ -67,7 +67,7 @@
else
return..()
-/obj/machinery/artifact_harvester/attack_hand(var/mob/user as mob)
+/obj/machinery/artifact_harvester/attack_hand(mob/user as mob)
if(..())
return 1
add_fingerprint(user)
diff --git a/code/modules/xenoarcheaology/tools/artifact_scanner.dm b/code/modules/xenoarcheaology/tools/artifact_scanner.dm
index 63395b9ce9..846f2b5005 100644
--- a/code/modules/xenoarcheaology/tools/artifact_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/artifact_scanner.dm
@@ -7,7 +7,7 @@
density = FALSE
circuit = /obj/item/circuitboard/artifact_scanpad
-/obj/machinery/artifact_scanpad/attackby(var/obj/I as obj, var/mob/user as mob)
+/obj/machinery/artifact_scanpad/attackby(obj/I as obj, mob/user as mob)
if(default_deconstruction_screwdriver(user, I))
return
if(default_deconstruction_crowbar(user, I))
diff --git a/code/modules/xenoarcheaology/tools/coolant_tank.dm b/code/modules/xenoarcheaology/tools/coolant_tank.dm
index 6cb8226d9c..d8b5cc8fd2 100644
--- a/code/modules/xenoarcheaology/tools/coolant_tank.dm
+++ b/code/modules/xenoarcheaology/tools/coolant_tank.dm
@@ -10,7 +10,7 @@
. = ..()
reagents.add_reagent(REAGENT_ID_COOLANT, 1000)
-/obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj)
+/obj/structure/reagent_dispensers/coolanttank/bullet_act(obj/item/projectile/Proj)
if(Proj.get_structure_damage())
explode()
diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm
index 214526e9da..9d547609ad 100644
--- a/code/modules/xenoarcheaology/tools/suspension_generator.dm
+++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm
@@ -36,7 +36,7 @@
if(cell.charge <= 0)
deactivate()
-/obj/machinery/suspension_gen/attack_hand(var/mob/user)
+/obj/machinery/suspension_gen/attack_hand(mob/user)
if(!panel_open)
tgui_interact(user)
else if(cell)
@@ -130,7 +130,7 @@
else
to_chat(user, span_warning("Remove [auth_card] first."))
-/obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/card/C, var/mob/user)
+/obj/machinery/suspension_gen/proc/attempt_unlock(obj/item/card/C, mob/user)
if(!panel_open)
if(istype(C, /obj/item/card/emag))
C.resolve_attackby(src, user)
@@ -139,7 +139,7 @@
if(!locked)
return 1
-/obj/machinery/suspension_gen/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/suspension_gen/emag_act(remaining_charges, mob/user)
if(cell.charge > 0 && locked)
locked = 0
return 1
diff --git a/code/modules/xenoarcheaology/tools/tools.dm b/code/modules/xenoarcheaology/tools/tools.dm
index 0eeabb53ff..af38cfee8c 100644
--- a/code/modules/xenoarcheaology/tools/tools.dm
+++ b/code/modules/xenoarcheaology/tools/tools.dm
@@ -114,7 +114,7 @@
var/record_index = 1
var/material = "unknown"
-/obj/item/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A)
+/obj/item/depth_scanner/proc/scan_atom(mob/user, atom/A)
user.visible_message(span_bold("\The [user]") + " scans \the [A], the air around them humming gently.")
if(istype(A, /turf/simulated/mineral))
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index f8ed344c2c..19eac49508 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -43,14 +43,14 @@
/datum/decl/chemical_reaction/instant/slime
var/required = null
-/datum/decl/chemical_reaction/instant/slime/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/can_happen(datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, required))
var/obj/item/slime_extract/T = holder.my_atom
if(T.uses > 0)
return ..()
return FALSE
-/datum/decl/chemical_reaction/instant/slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/on_reaction(datum/reagents/holder)
var/obj/item/slime_extract/T = holder.my_atom
T.uses--
if(T.uses <= 0)
@@ -76,7 +76,7 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/datum/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom))
..()
@@ -89,7 +89,7 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/datum/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(datum/reagents/holder)
for(var/i = 1 to 5) //CHOMPedit Increased number of monkey cubes from 4 to 5
new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
..()
@@ -275,7 +275,7 @@
result_amount = 1
required = /obj/item/slime_extract/blue
-/datum/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/stabilizer(get_turf(holder.my_atom))
..()
@@ -299,7 +299,7 @@
result_amount = 1
required = /obj/item/slime_extract/purple
-/datum/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/steroid(get_turf(holder.my_atom))
..()
@@ -321,7 +321,7 @@
result_amount = 1
required = /obj/item/slime_extract/orange
-/datum/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(datum/reagents/holder)
log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -358,7 +358,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.fingerprintslast]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -376,7 +376,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(datum/reagents/holder)
new /obj/item/cell/slime(get_turf(holder.my_atom))
..()
@@ -388,7 +388,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(datum/reagents/holder)
new /obj/item/flashlight/slime(get_turf(holder.my_atom))
..()
@@ -471,7 +471,7 @@
required = /obj/item/slime_extract/dark_blue
// This iterates over a ZAS zone's contents, so that things seperated in other zones aren't subjected to the temperature drop.
-/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(datum/reagents/holder)
var/turf/simulated/T = get_turf(holder.my_atom)
if(!T) // Nullspace lacks zones.
return
@@ -552,7 +552,7 @@
result_amount = 1
required = /obj/item/slime_extract/red
-/datum/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(datum/reagents/holder)
for(var/mob/living/simple_mob/slime/S in view(get_turf(holder.my_atom)))
if(S.stat)
continue
@@ -588,7 +588,7 @@
result_amount = 1
required = /obj/item/slime_extract/red
-/datum/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/mutator(get_turf(holder.my_atom))
..()
@@ -692,7 +692,7 @@
required = /obj/item/slime_extract/oil
-/datum/decl/chemical_reaction/instant/slime/oil_griff/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oil_griff/on_reaction(datum/reagents/holder)
..()
var/obj/item/slime_extract/E = holder.my_atom
var/power = 1
@@ -729,7 +729,7 @@
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/datum/decl/chemical_reaction/instant/slime/bluespace_lesser/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_lesser/on_reaction(datum/reagents/holder)
for(var/i = 1 to 5)
new /obj/item/slime_crystal(get_turf(holder.my_atom))
..()
@@ -741,7 +741,7 @@
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/datum/decl/chemical_reaction/instant/slime/bluespace_greater/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_greater/on_reaction(datum/reagents/holder)
new /obj/item/disposable_teleporter/slime(get_turf(holder.my_atom))
..()
@@ -763,7 +763,7 @@
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/enhancer(get_turf(holder.my_atom))
..()
@@ -785,7 +785,7 @@
result_amount = 1
required = /obj/item/slime_extract/amber
-/datum/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/feeding(get_turf(holder.my_atom))
..()
@@ -797,7 +797,7 @@
result_amount = 1
required = /obj/item/slime_extract/amber
-/datum/decl/chemical_reaction/instant/slime/amber_peoplefood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_peoplefood/on_reaction(datum/reagents/holder)
new /obj/item/reagent_containers/food/snacks/slime(get_turf(holder.my_atom))
..()
@@ -820,7 +820,7 @@
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/datum/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(datum/reagents/holder)
new /obj/item/slime_cube(get_turf(holder.my_atom))
..()
@@ -841,7 +841,7 @@
result_amount = 1
required = /obj/item/slime_extract/ruby
-/datum/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_strength, 10 MINUTES, src)
..()
@@ -869,7 +869,7 @@
result_amount = 1
required = /obj/item/slime_extract/ruby
-/datum/decl/chemical_reaction/instant/slime/ruby_loyalty/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_loyalty/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/loyalty(get_turf(holder.my_atom))
..()
@@ -890,7 +890,7 @@
result_amount = 1
required = /obj/item/slime_extract/emerald
-/datum/decl/chemical_reaction/instant/slime/emerald_fast/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_fast/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_agility, 10 MINUTES, src)
..()
@@ -927,7 +927,7 @@
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/datum/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/docility(get_turf(holder.my_atom))
..()
@@ -939,7 +939,7 @@
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/datum/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/friendship(get_turf(holder.my_atom))
..()
@@ -964,7 +964,7 @@
required = /obj/item/slime_extract/rainbow
-/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(datum/reagents/holder)
var/mob/living/simple_mob/slime/xenobio/S
var/list/slime_types = typesof(/mob/living/simple_mob/slime/xenobio)
@@ -987,6 +987,6 @@
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/datum/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/unity(get_turf(holder.my_atom))
..()
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index 84ba7b9115..dd76b9795d 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -48,14 +48,14 @@
/datum/decl/chemical_reaction/instant/slime
var/required = null
-/datum/decl/chemical_reaction/instant/slime/can_happen(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/can_happen(datum/reagents/holder)
if(holder.my_atom && istype(holder.my_atom, required))
var/obj/item/slime_extract/T = holder.my_atom
if(T.uses > 0)
return ..()
return FALSE
-/datum/decl/chemical_reaction/instant/slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/on_reaction(datum/reagents/holder)
var/obj/item/slime_extract/T = holder.my_atom
T.uses--
if(T.uses <= 0)
@@ -83,7 +83,7 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/datum/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_new_slime/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with phoron, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio(get_turf(holder.my_atom))
..()
@@ -97,7 +97,7 @@
result_amount = 1
required = /obj/item/slime_extract/grey
-/datum/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/grey_monkey/on_reaction(datum/reagents/holder)
for(var/i = 1 to 5) //CHOMPedit Increased number of monkey cubes from 4 to 5
new /obj/item/reagent_containers/food/snacks/monkeycube(get_turf(holder.my_atom))
..()
@@ -131,7 +131,7 @@
result_amount = 1
required = /obj/item/slime_extract/metal
-/datum/decl/chemical_reaction/instant/slime/metal_materials_basic/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_basic/on_reaction(datum/reagents/holder)
for(var/i = 1 to 3)
var/type_to_spawn = pickweight(GLOB.xenobio_metal_materials_normal)
new type_to_spawn(get_turf(holder.my_atom), 10)
@@ -145,7 +145,7 @@
result_amount = 1
required = /obj/item/slime_extract/metal
-/datum/decl/chemical_reaction/instant/slime/metal_materials_adv/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_adv/on_reaction(datum/reagents/holder)
for(var/i = 1 to 2)
var/type_to_spawn = pickweight(GLOB.xenobio_metal_materials_adv)
new type_to_spawn(get_turf(holder.my_atom), 10)
@@ -159,7 +159,7 @@
result_amount = 1
required = /obj/item/slime_extract/metal
-/datum/decl/chemical_reaction/instant/slime/metal_materials_weird/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_weird/on_reaction(datum/reagents/holder)
for(var/i = 1 to 3)
var/type_to_spawn = pickweight(GLOB.xenobio_metal_materials_weird)
new type_to_spawn(get_turf(holder.my_atom), 5)
@@ -173,7 +173,7 @@
result_amount = 1
required = /obj/item/slime_extract/metal
-/datum/decl/chemical_reaction/instant/slime/metal_materials_steel/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/metal_materials_steel/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/steel(get_turf(holder.my_atom), 25)
..()
@@ -205,7 +205,7 @@
result_amount = 1
required = /obj/item/slime_extract/blue
-/datum/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/blue_stability/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/stabilizer(get_turf(holder.my_atom))
..()
@@ -217,7 +217,7 @@
result_amount = 1
required = /obj/item/slime_extract/blue
-/datum/decl/chemical_reaction/instant/slime/blue_calm/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/blue_calm/on_reaction(datum/reagents/holder)
for(var/mob/living/simple_mob/slime/S in view(get_turf(holder.my_atom)))
if(S.stat)
continue
@@ -271,7 +271,7 @@
result_amount = 1
required = /obj/item/slime_extract/purple
-/datum/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_steroid/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/steroid(get_turf(holder.my_atom))
..()
@@ -283,7 +283,7 @@
result_amount = 1
required = /obj/item/slime_extract/purple
-/datum/decl/chemical_reaction/instant/slime/purple_infertility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_infertility/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/infertility(get_turf(holder.my_atom))
..()
@@ -295,7 +295,7 @@
result_amount = 1
required = /obj/item/slime_extract/purple
-/datum/decl/chemical_reaction/instant/slime/purple_shrink/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_shrink/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/shrink(get_turf(holder.my_atom))
..()
@@ -307,7 +307,7 @@
result_amount = 1
required = /obj/item/slime_extract/purple
-/datum/decl/chemical_reaction/instant/slime/purple_fertility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/purple_fertility/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/fertility(get_turf(holder.my_atom))
..()
@@ -330,7 +330,7 @@
result_amount = 1
required = /obj/item/slime_extract/orange
-/datum/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_fire/on_reaction(datum/reagents/holder)
log_and_message_admins("Orange extract reaction (fire) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -357,7 +357,7 @@
result_amount = 1
required = /obj/item/slime_extract/orange
-/datum/decl/chemical_reaction/instant/slime/orange_heatwave/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_heatwave/on_reaction(datum/reagents/holder)
var/turf/simulated/T = get_turf(holder.my_atom)
if(!T) // Nullspace lacks zones.
return
@@ -413,7 +413,7 @@
result_amount = 1
required = /obj/item/slime_extract/orange
-/datum/decl/chemical_reaction/instant/slime/orange_smoke/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/orange_smoke/on_reaction(datum/reagents/holder)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
@@ -451,7 +451,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_lightning/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_lightning/on_reaction(datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (lightning) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -470,7 +470,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_flashlight/on_reaction(datum/reagents/holder)
new /obj/item/flashlight/slime(get_turf(holder.my_atom))
..()
@@ -482,7 +482,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_emp/on_reaction(datum/reagents/holder)
log_and_message_admins("Yellow extract reaction (emp) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
holder.my_atom.visible_message(span_danger("\The [src] begins to vibrate violently!"))
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
@@ -500,7 +500,7 @@
result_amount = 1
required = /obj/item/slime_extract/yellow
-/datum/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/yellow_battery/on_reaction(datum/reagents/holder)
new /obj/item/cell/slime(get_turf(holder.my_atom))
..()
@@ -523,7 +523,7 @@
result_amount = 1
required = /obj/item/slime_extract/gold
-/datum/decl/chemical_reaction/instant/slime/gold_random_mobs/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_random_mobs/on_reaction(datum/reagents/holder)
log_and_message_admins("Gold extract reaction (random mobs) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
var/type_to_spawn
var/list/all_spawnable_types = list()
@@ -549,7 +549,7 @@
result_amount = 1
required = /obj/item/slime_extract/gold
-/datum/decl/chemical_reaction/instant/slime/gold_hostile_mob/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_hostile_mob/on_reaction(datum/reagents/holder)
log_and_message_admins("Gold extract reaction (dangerous mob) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
var/type_to_spawn = pickweight(GLOB.xenobio_gold_mobs_hostile)
var/mob/living/C = new type_to_spawn(get_turf(holder.my_atom))
@@ -565,7 +565,7 @@
result_amount = 1
required = /obj/item/slime_extract/gold
-/datum/decl/chemical_reaction/instant/slime/gold_safe_mob/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_safe_mob/on_reaction(datum/reagents/holder)
var/type_to_spawn
if(prob(100/(GLOB.xenobio_gold_mobs_safe.len + 1)))
type_to_spawn = pickweight(GLOB.xenobio_gold_mobs_birds)
@@ -584,7 +584,7 @@
result_amount = 1
required = /obj/item/slime_extract/gold
-/datum/decl/chemical_reaction/instant/slime/gold_materials_gold/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/gold_materials_gold/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/gold(get_turf(holder.my_atom), 10)
..()
@@ -607,7 +607,7 @@
result_amount = 1
required = /obj/item/slime_extract/silver
-/datum/decl/chemical_reaction/instant/slime/silver_materials_basic/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_basic/on_reaction(datum/reagents/holder)
for(var/i = 1 to 2)
var/type_to_spawn = pickweight(GLOB.xenobio_silver_materials_basic)
new type_to_spawn(get_turf(holder.my_atom), 5)
@@ -621,7 +621,7 @@
result_amount = 1
required = /obj/item/slime_extract/silver
-/datum/decl/chemical_reaction/instant/slime/silver_materials_adv/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_adv/on_reaction(datum/reagents/holder)
var/type_to_spawn = pickweight(GLOB.xenobio_silver_materials_adv)
new type_to_spawn(get_turf(holder.my_atom), 3)
..()
@@ -634,7 +634,7 @@
result_amount = 1
required = /obj/item/slime_extract/silver
-/datum/decl/chemical_reaction/instant/slime/silver_materials_random/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_random/on_reaction(datum/reagents/holder)
var/type_to_spawn
var/amount = 5
var/all_spawnable_types = list()
@@ -659,7 +659,7 @@
result_amount = 1
required = /obj/item/slime_extract/silver
-/datum/decl/chemical_reaction/instant/slime/silver_materials_silver/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/silver_materials_silver/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/silver(get_turf(holder.my_atom), 10)
..()
@@ -711,7 +711,7 @@
required = /obj/item/slime_extract/dark_blue
// This iterates over a ZAS zone's contents, so that things seperated in other zones aren't subjected to the temperature drop.
-/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_cold_snap/on_reaction(datum/reagents/holder)
var/turf/simulated/T = get_turf(holder.my_atom)
if(!T) // Nullspace lacks zones.
return
@@ -780,7 +780,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark_blue
-/datum/decl/chemical_reaction/instant/slime/dark_blue_temp_resist/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_temp_resist/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_temp_resist, 5 MINUTES, src)
..()
@@ -815,7 +815,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark_blue
-/datum/decl/chemical_reaction/instant/slime/dark_blue_death/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blue_death/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/death(get_turf(holder.my_atom))
..()
@@ -839,7 +839,7 @@
result_amount = 1
required = /obj/item/slime_extract/red
-/datum/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_mutation/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/mutator(get_turf(holder.my_atom))
..()
@@ -851,7 +851,7 @@
result_amount = 1
required = /obj/item/slime_extract/red
-/datum/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_enrage/on_reaction(datum/reagents/holder)
for(var/mob/living/simple_mob/slime/S in view(get_turf(holder.my_atom)))
if(S.stat)
continue
@@ -895,7 +895,7 @@
result_amount = 1
required = /obj/item/slime_extract/red
-/datum/decl/chemical_reaction/instant/slime/red_ferality/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/red_ferality/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/ferality(get_turf(holder.my_atom))
..()
@@ -946,7 +946,7 @@
result_amount = 1
required = /obj/item/slime_extract/green
-/datum/decl/chemical_reaction/instant/slime/green_radpulse/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_radpulse/on_reaction(datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation pulse) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
@@ -963,7 +963,7 @@
result_amount = 1
required = /obj/item/slime_extract/green
-/datum/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation emitter) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
new /obj/item/slime_irradiator(get_turf(holder.my_atom))
..()
@@ -985,7 +985,7 @@
result_amount = 1
required = /obj/item/slime_extract/green
-/datum/decl/chemical_reaction/instant/slime/green_uranium/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_uranium/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/uranium(get_turf(holder.my_atom), 10)
..()
@@ -1035,7 +1035,7 @@
result_amount = 1
required = /obj/item/slime_extract/pink
-/datum/decl/chemical_reaction/instant/slime/pink_heal_pulse/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/pink_heal_pulse/on_reaction(datum/reagents/holder)
for(var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
to_chat(C, span_notice("A wave of energy suddenly invigorates you."))
C.adjustBruteLoss(-25)
@@ -1084,7 +1084,7 @@
result_amount = 1
required = /obj/item/slime_extract/oil
-/datum/decl/chemical_reaction/instant/slime/oil_fakesplosion/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oil_fakesplosion/on_reaction(datum/reagents/holder)
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
explosion(get_turf(holder.my_atom), 0, 0, 0)
..()
@@ -1097,7 +1097,7 @@
result_amount = 1
required = /obj/item/slime_extract/oil
-/datum/decl/chemical_reaction/instant/slime/oil_explosion/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oil_explosion/on_reaction(datum/reagents/holder)
..()
var/obj/item/slime_extract/E = holder.my_atom
var/power = 1
@@ -1135,7 +1135,7 @@
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/datum/decl/chemical_reaction/instant/slime/bluespace_crystals/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_crystals/on_reaction(datum/reagents/holder)
for(var/i = 1 to 5)
new /obj/item/slime_crystal(get_turf(holder.my_atom))
..()
@@ -1148,7 +1148,7 @@
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/datum/decl/chemical_reaction/instant/slime/bluespace_pouch/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_pouch/on_reaction(datum/reagents/holder)
new /obj/item/storage/backpack/holding/slime(get_turf(holder.my_atom))
..()
@@ -1160,7 +1160,7 @@
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/datum/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_chaotic_tele/on_reaction(datum/reagents/holder)
log_and_message_admins("Bluespace extract reaction (chaos teleport) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
for(var/mob/living/M in range(2,get_turf(holder.my_atom)))
if(M.buckled)
@@ -1185,7 +1185,7 @@
result_amount = 1
required = /obj/item/slime_extract/bluespace
-/datum/decl/chemical_reaction/instant/slime/bluespace_teleporter/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/bluespace_teleporter/on_reaction(datum/reagents/holder)
new /obj/item/disposable_teleporter/slime(get_turf(holder.my_atom))
..()
@@ -1209,7 +1209,7 @@
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_enhancer/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/enhancer(get_turf(holder.my_atom))
..()
@@ -1221,7 +1221,7 @@
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/datum/decl/chemical_reaction/instant/slime/cerulean_reinvigoration/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_reinvigoration/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/reinvigoration(get_turf(holder.my_atom))
..()
@@ -1233,7 +1233,7 @@
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/datum/decl/chemical_reaction/instant/slime/cerulean_potion_mimic/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_potion_mimic/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/mimic(get_turf(holder.my_atom))
..()
@@ -1245,7 +1245,7 @@
result_amount = 1
required = /obj/item/slime_extract/cerulean
-/datum/decl/chemical_reaction/instant/slime/cerulean_random_potion/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/cerulean_random_potion/on_reaction(datum/reagents/holder)
var/spawn_type = pickweight(GLOB.xenobio_cerulean_potions)
new spawn_type(get_turf(holder.my_atom))
..()
@@ -1269,7 +1269,7 @@
result_amount = 1
required = /obj/item/slime_extract/amber
-/datum/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_slimefood/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/feeding(get_turf(holder.my_atom))
..()
@@ -1281,7 +1281,7 @@
result_amount = 1
required = /obj/item/slime_extract/amber
-/datum/decl/chemical_reaction/instant/slime/amber_random_food/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_random_food/on_reaction(datum/reagents/holder)
var/list/edibles = subtypesof(/obj/item/reagent_containers/food/snacks)
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 100, 1)
@@ -1304,7 +1304,7 @@
result_amount = 1
required = /obj/item/slime_extract/amber
-/datum/decl/chemical_reaction/instant/slime/amber_snack/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/amber_snack/on_reaction(datum/reagents/holder)
for(var/i = 1 to rand(3, 5))
new /obj/item/reagent_containers/food/snacks/slime(get_turf(holder.my_atom))
..()
@@ -1338,7 +1338,7 @@
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/datum/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_promethean/on_reaction(datum/reagents/holder)
new /obj/item/slime_cube(get_turf(holder.my_atom))
..()
@@ -1359,7 +1359,7 @@
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/datum/decl/chemical_reaction/instant/slime/sapphire_plushies/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_plushies/on_reaction(datum/reagents/holder)
var/spawn_type
var/list/possible_types = subtypesof(/obj/item/toy/plushie)
possible_types -= subtypesof(/obj/item/toy/plushie/fluff)
@@ -1377,7 +1377,7 @@
result_amount = 1
required = /obj/item/slime_extract/sapphire
-/datum/decl/chemical_reaction/instant/slime/sapphire_sapience/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sapphire_sapience/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/sapience(get_turf(holder.my_atom))
..()
@@ -1399,7 +1399,7 @@
result_amount = 1
required = /obj/item/slime_extract/ruby
-/datum/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_swole/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_strength, 10 MINUTES, src)
..()
@@ -1426,7 +1426,7 @@
result_amount = 1
required = /obj/item/slime_extract/ruby
-/datum/decl/chemical_reaction/instant/slime/ruby_pull/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_pull/on_reaction(datum/reagents/holder)
var/location = get_turf(holder.my_atom)
playsound(location, 'sound/weapons/gauss_shoot.ogg', 50, 1)
var/datum/effect/effect/system/grav_pull/s = new /datum/effect/effect/system/grav_pull
@@ -1451,7 +1451,7 @@
result_amount = 1
required = /obj/item/slime_extract/ruby
-/datum/decl/chemical_reaction/instant/slime/ruby_push/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/ruby_push/on_reaction(datum/reagents/holder)
var/location = get_turf(holder.my_atom)
for(var/X in orange(3, location))
var/atom/movable/AM = X
@@ -1488,7 +1488,7 @@
result_amount = 1
required = /obj/item/slime_extract/emerald
-/datum/decl/chemical_reaction/instant/slime/emerald_agility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_agility/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_agility, 10 MINUTES, src)
..()
@@ -1514,7 +1514,7 @@
result_amount = 1
required = /obj/item/slime_extract/emerald
-/datum/decl/chemical_reaction/instant/slime/emerald_speed/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_speed/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/slime_speed, 1 MINUTE, src)
..()
@@ -1547,7 +1547,7 @@
result_amount = 1
required = /obj/item/slime_extract/emerald
-/datum/decl/chemical_reaction/instant/slime/emerald_hell/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/emerald_hell/on_reaction(datum/reagents/holder)
log_and_message_admins("Emerald extract reaction (slip hell) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
for(var/turf/simulated/T in trange(5, get_turf(holder.my_atom)))
if(!istype(T))
@@ -1576,7 +1576,7 @@
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/datum/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_friendship/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/friendship(get_turf(holder.my_atom))
..()
@@ -1588,7 +1588,7 @@
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/datum/decl/chemical_reaction/instant/slime/light_pink_loyalty/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_loyalty/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/loyalty(get_turf(holder.my_atom))
..()
@@ -1600,7 +1600,7 @@
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/datum/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_docility/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/docility(get_turf(holder.my_atom))
..()
@@ -1612,7 +1612,7 @@
result_amount = 1
required = /obj/item/slime_extract/light_pink
-/datum/decl/chemical_reaction/instant/slime/light_pink_obedience/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/light_pink_obedience/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/obedience(get_turf(holder.my_atom))
..()
@@ -1636,7 +1636,7 @@
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_slime/on_reaction(datum/reagents/holder)
var/mob/living/simple_mob/slime/xenobio/S
var/list/slime_types = typesof(/mob/living/simple_mob/slime/xenobio)
@@ -1660,7 +1660,7 @@
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/datum/decl/chemical_reaction/instant/slime/rainbow_random_extract/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_random_extract/on_reaction(datum/reagents/holder)
var/spawn_type = pickweight(GLOB.xenobio_rainbow_extracts)
new spawn_type(get_turf(holder.my_atom))
..()
@@ -1673,7 +1673,7 @@
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/datum/decl/chemical_reaction/instant/slime/rainbow_colors/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_colors/on_reaction(datum/reagents/holder)
for(var/mob/living/carbon/human/H in range(3, holder.my_atom))
H.druggy = max(H.druggy, 30)
..()
@@ -1686,6 +1686,6 @@
result_amount = 1
required = /obj/item/slime_extract/rainbow
-/datum/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(datum/reagents/holder)
new /obj/item/slimepotion/unity(get_turf(holder.my_atom))
..()
diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm
index 21453c9ff9..9f3795053c 100644
--- a/code/modules/xenobio/items/slime_objects.dm
+++ b/code/modules/xenobio/items/slime_objects.dm
@@ -28,7 +28,7 @@
if(O.client.prefs.be_special & BE_ALIEN)
question(O.client)
-/obj/item/slime_cube/proc/question(var/client/C)
+/obj/item/slime_cube/proc/question(client/C)
spawn(0)
if(!C)
return
@@ -50,7 +50,7 @@
for (var/mob/M in viewers(T))
M.show_message(span_warning("The activity in the cube dies down. Maybe it will spark another time."))
-/obj/item/slime_cube/proc/transfer_personality(var/mob/candidate)
+/obj/item/slime_cube/proc/transfer_personality(mob/candidate)
announce_ghost_joinleave(candidate, 0, "They are a promethean now.")
src.searching = 2
var/mob/living/carbon/human/S = new(get_turf(src))
@@ -81,7 +81,7 @@
w_class = ITEMSIZE_TINY
force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things
-/obj/item/slime_crystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/slime_crystal/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
target.visible_message(span_warning("\The [target] has been teleported with \the [src] by \the [user]!"))
safe_blink(target, 14)
qdel(src)
diff --git a/code/modules/xenobio/items/weapons.dm b/code/modules/xenobio/items/weapons.dm
index 6db2565aa8..f64cf3c77a 100644
--- a/code/modules/xenobio/items/weapons.dm
+++ b/code/modules/xenobio/items/weapons.dm
@@ -80,7 +80,7 @@ VORESTATION REMOVAL
/obj/item/projectile/beam/stun/xeno/weak //Weaker variant for non-research equipment, turrets, or rapid fire types.
agony = 3
-/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
+/obj/item/projectile/beam/stun/xeno/on_hit(atom/target, blocked = 0, def_zone = null)
if(isliving(target))
var/mob/living/L = target
if(L.mob_class & MOB_CLASS_SLIME)
diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm
index fb3322abae..a1b57d44c3 100644
--- a/code/modules/xenobio/items/weapons_vr.dm
+++ b/code/modules/xenobio/items/weapons_vr.dm
@@ -7,7 +7,7 @@
var/loaded_item = null
var/loadable_name = null
var/firable = TRUE
-/obj/item/xenobio/examine(var/mob/user)
+/obj/item/xenobio/examine(mob/user)
. = ..()
if(loaded_item)
.+= "A [loaded_item] is slotted into the side."
@@ -107,7 +107,7 @@
var/monkeys_recycled = 0
description_info = "Click a monkey or slime to begin processing."
-/obj/item/slime_grinder/proc/extract(var/atom/movable/AM, var/mob/living/user)
+/obj/item/slime_grinder/proc/extract(atom/movable/AM, mob/living/user)
processing = TRUE
if(istype(AM, /mob/living/simple_mob/slime))
var/mob/living/simple_mob/slime/S = AM
@@ -135,7 +135,7 @@
sleep(1 SECOND)
processing = FALSE
-/obj/item/slime_grinder/proc/can_insert(var/atom/movable/AM)
+/obj/item/slime_grinder/proc/can_insert(atom/movable/AM)
if(istype(AM, /mob/living/simple_mob/slime))
var/mob/living/simple_mob/slime/S = AM
if(S.stat != DEAD)
diff --git a/code/modules/xenobio/machinery/processor.dm b/code/modules/xenobio/machinery/processor.dm
index 81a65ea517..bf6bbec6b0 100644
--- a/code/modules/xenobio/machinery/processor.dm
+++ b/code/modules/xenobio/machinery/processor.dm
@@ -48,7 +48,7 @@
AM.forceMove(get_turf(src))
// Ejects all the things out of the machine.
-/obj/machinery/processor/proc/insert(var/atom/movable/AM, var/mob/living/user)
+/obj/machinery/processor/proc/insert(atom/movable/AM, mob/living/user)
if(!Adjacent(AM))
return
if(!can_insert(AM))
@@ -77,7 +77,7 @@
processing = FALSE
playsound(src, 'sound/machines/ding.ogg', 50, 1)
-/obj/machinery/processor/proc/extract(var/atom/movable/AM)
+/obj/machinery/processor/proc/extract(atom/movable/AM)
if(istype(AM, /mob/living/simple_mob/slime))
var/mob/living/simple_mob/slime/S = AM
while(S.cores)
@@ -97,7 +97,7 @@
monkeys_recycled++
sleep(1 SECOND)
-/obj/machinery/processor/proc/can_insert(var/atom/movable/AM)
+/obj/machinery/processor/proc/can_insert(atom/movable/AM)
if(istype(AM, /mob/living/simple_mob/slime))
var/mob/living/simple_mob/slime/S = AM
if(S.stat != DEAD)
@@ -112,7 +112,7 @@
return TRUE
return FALSE
-/obj/machinery/processor/MouseDrop_T(var/atom/movable/AM, var/mob/living/user)
+/obj/machinery/processor/MouseDrop_T(atom/movable/AM, mob/living/user)
if(user.stat || user.incapacitated(INCAPACITATION_DISABLED) || !istype(user))
return
insert(AM, user)
diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm
index 64f6b5ca68..0e9a331af0 100644
--- a/code/modules/xenobio2/_xeno_setup.dm
+++ b/code/modules/xenobio2/_xeno_setup.dm
@@ -54,15 +54,15 @@
var/list/chems = list()
var/source = "unknown"
-/datum/xeno/traits/proc/set_trait(var/trait, var/newval)
+/datum/xeno/traits/proc/set_trait(trait, newval)
traits["[trait]"] = newval
return
-/datum/xeno/traits/proc/get_trait(var/trait)
+/datum/xeno/traits/proc/get_trait(trait)
var/val = traits["[trait]"]
return val
-/datum/xeno/traits/proc/copy_traits(var/datum/xeno/traits/target)
+/datum/xeno/traits/proc/copy_traits(datum/xeno/traits/target)
target.traits = traits
target.chemlist = chemlist
target.chems = chems
@@ -92,7 +92,7 @@
set_trait(TRAIT_XENO_STRENGTH, 0)
set_trait(TRAIT_XENO_STR_RANGE, 0)
-/datum/xeno/traits/proc/get_gene(var/genetype)
+/datum/xeno/traits/proc/get_gene(genetype)
if(!genetype) return 0
@@ -137,7 +137,7 @@
return G
-/datum/xeno/traits/proc/apply_gene(var/datum/xeno/genes/genes)
+/datum/xeno/traits/proc/apply_gene(datum/xeno/genes/genes)
if(!genes.genetype) return 0
switch(genes.genetype)
diff --git a/code/modules/xenobio2/machinery/core_extractor.dm b/code/modules/xenobio2/machinery/core_extractor.dm
index 5972d2fe52..523d3ffbc3 100644
--- a/code/modules/xenobio2/machinery/core_extractor.dm
+++ b/code/modules/xenobio2/machinery/core_extractor.dm
@@ -23,7 +23,7 @@
default_apply_parts()
update_light_color()
-/obj/machinery/slime/extractor/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/slime/extractor/attackby(obj/item/W, mob/user)
//Let's try to deconstruct first.
if(W.has_tool_quality(TOOL_SCREWDRIVER) && !inuse)
@@ -53,7 +53,7 @@
return
move_into_extractor(user,target)
-/obj/machinery/slime/extractor/proc/move_into_extractor(var/mob/user,var/mob/living/victim)
+/obj/machinery/slime/extractor/proc/move_into_extractor(mob/user,mob/living/victim)
if(src.occupant)
to_chat(user, span_danger("The core extractor is full, empty it first!"))
diff --git a/code/modules/xenobio2/machinery/gene_manipulators.dm b/code/modules/xenobio2/machinery/gene_manipulators.dm
index 4ee4bc2ad8..4ea8da1d10 100644
--- a/code/modules/xenobio2/machinery/gene_manipulators.dm
+++ b/code/modules/xenobio2/machinery/gene_manipulators.dm
@@ -20,7 +20,7 @@
var/list/genes = list()
var/genesource = "unknown"
-/obj/item/disk/xenobio/attack_self(var/mob/user as mob)
+/obj/item/disk/xenobio/attack_self(mob/user as mob)
. = ..(user)
if(.)
return TRUE
@@ -145,7 +145,7 @@
return
..()
-/obj/machinery/xenobio/extractor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/xenobio/extractor/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
if(!user)
return
@@ -285,7 +285,7 @@
..()
-/obj/machinery/xenobio/editor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/xenobio/editor/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
if(!user)
return
@@ -360,7 +360,7 @@
return
move_into_editor(user,target)
-/obj/machinery/xenobio/editor/proc/move_into_editor(var/mob/user,var/mob/living/victim)
+/obj/machinery/xenobio/editor/proc/move_into_editor(mob/user,mob/living/victim)
if(src.occupant)
to_chat(user, span_danger("The [src] is full, empty it first!"))
diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm
index bb1b82f818..cda61c9b70 100644
--- a/code/modules/xenobio2/machinery/injector.dm
+++ b/code/modules/xenobio2/machinery/injector.dm
@@ -41,7 +41,7 @@
return
move_into_injector(user,target)
-/obj/machinery/xenobio2/manualinjector/proc/move_into_injector(var/mob/user,var/mob/living/victim)
+/obj/machinery/xenobio2/manualinjector/proc/move_into_injector(mob/user,mob/living/victim)
if(src.occupant)
to_chat(user, span_danger("The injector is full, empty it first!"))
return
@@ -82,7 +82,7 @@
else
beaker.reagents.trans_to_mob(occupant, computer.transfer_amount)
-/obj/machinery/xenobio2/manualinjector/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/xenobio2/manualinjector/attackby(obj/item/W, mob/user)
//Let's try to deconstruct first.
if(W.has_tool_quality(TOOL_SCREWDRIVER))
diff --git a/code/modules/xenobio2/machinery/injector_computer.dm b/code/modules/xenobio2/machinery/injector_computer.dm
index 0977e24d07..3e921d6def 100644
--- a/code/modules/xenobio2/machinery/injector_computer.dm
+++ b/code/modules/xenobio2/machinery/injector_computer.dm
@@ -28,7 +28,7 @@
return 1
ui_interact(user)
-/obj/machinery/computer/xenobio2/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/computer/xenobio2/attackby(obj/item/W, mob/user)
//Did you want to link it?
if(istype(W, /obj/item/multitool))
@@ -47,7 +47,7 @@
..()
//Is missing a tgui interface?
-/obj/machinery/computer/xenobio2/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/computer/xenobio2/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
if(!user)
return
if(!injector)
diff --git a/code/modules/xenobio2/machinery/slime_replicator.dm b/code/modules/xenobio2/machinery/slime_replicator.dm
index 5c38ea09de..7e1d72ab2d 100644
--- a/code/modules/xenobio2/machinery/slime_replicator.dm
+++ b/code/modules/xenobio2/machinery/slime_replicator.dm
@@ -22,7 +22,7 @@
default_apply_parts()
update_light_color()
-/obj/machinery/slime/replicator/attackby(var/obj/item/W, var/mob/user)
+/obj/machinery/slime/replicator/attackby(obj/item/W, mob/user)
//Let's try to deconstruct first.
if(W.has_tool_quality(TOOL_SCREWDRIVER) && !inuse)
default_deconstruction_screwdriver(user, W)
diff --git a/code/modules/xenobio2/mob/slime/slime_monkey.dm b/code/modules/xenobio2/mob/slime/slime_monkey.dm
index 43929d7db0..1057aac24f 100644
--- a/code/modules/xenobio2/mob/slime/slime_monkey.dm
+++ b/code/modules/xenobio2/mob/slime/slime_monkey.dm
@@ -36,7 +36,7 @@ Slime cube lives here.
for(var/mob/M in viewers(T))
M.show_message(span_warning("The activity in the cube dies down. Maybe it will spark another time."))
-/obj/item/slime_cube/proc/transfer_personality(var/mob/candidate)
+/obj/item/slime_cube/proc/transfer_personality(mob/candidate)
announce_ghost_joinleave(candidate, 0, "They are a promethean now.")
src.searching = 2
var/mob/living/carbon/human/S = new(get_turf(src))
diff --git a/code/modules/xenobio2/mob/xeno procs.dm b/code/modules/xenobio2/mob/xeno procs.dm
index cd3edab8ba..73ce6dd20e 100644
--- a/code/modules/xenobio2/mob/xeno procs.dm
+++ b/code/modules/xenobio2/mob/xeno procs.dm
@@ -112,7 +112,7 @@ Divergence proc, used in mutation to make unique datums.
/mob/living/simple_mob/xeno/proc/RandomizeTraits()
return
-/mob/living/simple_mob/xeno/hear_say(var/list/message_pieces, var/verb = "says", var/italics = 0, var/mob/speaker = null)
+/mob/living/simple_mob/xeno/hear_say(list/message_pieces, verb = "says", italics = 0, mob/speaker = null)
if(traitdat.traits[TRAIT_XENO_CANLEARN])
if(!(message in speak))
speech_buffer.Add(multilingual_to_message(message_pieces))
@@ -131,7 +131,7 @@ Divergence proc, used in mutation to make unique datums.
/mob/living/simple_mob/xeno/proc/BuildReagentLists()
return
-/mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/xeno/bullet_act(obj/item/projectile/P)
//Shamelessly stolen from ablative armor.
if((traitdat.traits[TRAIT_XENO_CHROMATIC]) && istype(P, /obj/item/projectile/beam))
visible_message(span_danger(")\The beam reflects off of the [src]!"))
diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm
index d6196b1ddf..86152db1bc 100644
--- a/code/modules/xenobio2/mob/xeno.dm
+++ b/code/modules/xenobio2/mob/xeno.dm
@@ -95,7 +95,7 @@ Also includes Life and New
if(!health)
set_stat(DEAD)
-/mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/xeno/bullet_act(obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam/stun/xeno))
var/obj/item/projectile/beam/stun/xeno/hit = Proj
stasis += hit.stasisforce
diff --git a/code/modules/xenobio2/tools/xeno_trait_scanner.dm b/code/modules/xenobio2/tools/xeno_trait_scanner.dm
index f7311b85e9..f51df20a03 100644
--- a/code/modules/xenobio2/tools/xeno_trait_scanner.dm
+++ b/code/modules/xenobio2/tools/xeno_trait_scanner.dm
@@ -19,7 +19,7 @@
if(href_list["print"])
print_report(usr)
-/obj/item/analyzer/xeno_analyzer/proc/print_report(var/mob/living/user)
+/obj/item/analyzer/xeno_analyzer/proc/print_report(mob/living/user)
if(!last_data)
to_chat(user, "There is no scan data to print.")
return
@@ -38,7 +38,7 @@
print_report(user)
return 0
-/obj/item/analyzer/xeno_analyzer/afterattack(var/target, mob/user, flag)
+/obj/item/analyzer/xeno_analyzer/afterattack(target, mob/user, flag)
if(!flag) return
var/datum/xeno/traits/trait_info
diff --git a/code/modules/xgm/xgm_gas_mixture.dm b/code/modules/xgm/xgm_gas_mixture.dm
index e88de6919c..71dc1e03ef 100644
--- a/code/modules/xgm/xgm_gas_mixture.dm
+++ b/code/modules/xgm/xgm_gas_mixture.dm
@@ -132,7 +132,7 @@
//Adds or removes thermal energy. Returns the actual thermal energy change, as in the case of removing energy we can't go below TCMB.
-/datum/gas_mixture/proc/add_thermal_energy(var/thermal_energy)
+/datum/gas_mixture/proc/add_thermal_energy(thermal_energy)
if (total_moles == 0)
return 0
@@ -147,7 +147,7 @@
return thermal_energy
//Returns the thermal energy change required to get to a new temperature
-/datum/gas_mixture/proc/get_thermal_energy_change(var/new_temperature)
+/datum/gas_mixture/proc/get_thermal_energy_change(new_temperature)
return heat_capacity()*(max(new_temperature, 0) - temperature)
@@ -177,7 +177,7 @@
So returning a constant/(partial pressure) would probably do what most players expect. Although the version I have implemented below is a bit more nuanced than simply 1/P in that it scales in a way
which is bit more realistic (natural log), and returns a fairly accurate entropy around room temperatures and pressures.
*/
-/datum/gas_mixture/proc/specific_entropy_gas(var/gasid)
+/datum/gas_mixture/proc/specific_entropy_gas(gasid)
if (!(gasid in gas) || gas[gasid] == 0)
return SPECIFIC_ENTROPY_VACUUM //that gas isn't here
@@ -297,7 +297,7 @@
//Checks if we are within acceptable range of another gas_mixture to suspend processing or merge.
-/datum/gas_mixture/proc/compare(const/datum/gas_mixture/sample, var/vacuum_exception = 0)
+/datum/gas_mixture/proc/compare(const/datum/gas_mixture/sample, vacuum_exception = 0)
if(!sample) return 0
if(vacuum_exception)
@@ -493,7 +493,7 @@
// Global proc in this file so we can check for null turfs too
// This was copypastaed three times for multiple gas sensors checking for default safe atmos... Lets not.
-/proc/get_gas_mixture_default_scan_data(var/turf/T)
+/proc/get_gas_mixture_default_scan_data(turf/T)
if(isturf(T))
var/datum/gas_mixture/environment = T.return_air()
var/pressure = environment.return_pressure()
diff --git a/code/unit_tests/zas_tests.dm b/code/unit_tests/zas_tests.dm
index 674fc2dd13..3fc74a445c 100644
--- a/code/unit_tests/zas_tests.dm
+++ b/code/unit_tests/zas_tests.dm
@@ -7,7 +7,7 @@
var/area_path = null
var/expectation = UT_NORMAL
-/datum/unit_test/zas_area_test/proc/test_air_in_area(var/test_area, var/expectation = UT_NORMAL)
+/datum/unit_test/zas_area_test/proc/test_air_in_area(test_area, expectation = UT_NORMAL)
var/test_result = list("result" = 0, "msg" = "")
var/area/A = locate(test_area)
diff --git a/maps/common/common_things.dm b/maps/common/common_things.dm
index 572f943da1..f59512c888 100644
--- a/maps/common/common_things.dm
+++ b/maps/common/common_things.dm
@@ -55,7 +55,7 @@
invisibility = INVISIBILITY_NONE
var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out."
-/obj/effect/step_trigger/lost_in_space/Trigger(var/atom/movable/A) //replacement for shuttle dump zones because there's no empty space levels to dump to
+/obj/effect/step_trigger/lost_in_space/Trigger(atom/movable/A) //replacement for shuttle dump zones because there's no empty space levels to dump to
if(ismob(A))
to_chat(A, span_danger("[deathmessage]"))
qdel(A)
@@ -100,18 +100,18 @@
shock_area = locate(shock_area)
// Walking on maglev tracks will shock you! Horray!
-/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc)
+/turf/simulated/floor/maglev/Entered(atom/movable/AM, atom/old_loc)
if(!isliving(AM) || prob(50))
return
if(locate(/obj/structure/catwalk) in src) // safe to walk over as a bridge!
return
track_zap(AM)
-/turf/simulated/floor/maglev/attack_hand(var/mob/user)
+/turf/simulated/floor/maglev/attack_hand(mob/user)
if(prob(75))
track_zap(user)
-/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user)
+/turf/simulated/floor/maglev/proc/track_zap(mob/living/user)
if(!istype(user) || user.is_incorporeal())
return
if (electrocute_mob(user, shock_area, src))
@@ -158,7 +158,7 @@
// Otherwise just operate normally
return ..()
-/obj/machinery/cryopod/robot/door/tram/Bumped(var/atom/movable/AM)
+/obj/machinery/cryopod/robot/door/tram/Bumped(atom/movable/AM)
if(!isliving(AM))
return
diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm
index cf52918005..10a100229c 100644
--- a/maps/expedition_vr/aerostat/_aerostat.dm
+++ b/maps/expedition_vr/aerostat/_aerostat.dm
@@ -15,7 +15,7 @@
/datum/random_map/noise/ore/virgo2/check_map_sanity()
return 1 //Totally random, but probably beneficial.
-/datum/random_map/noise/ore/virgo2/apply_to_turf(var/x,var/y) //Same as normal + Rutile
+/datum/random_map/noise/ore/virgo2/apply_to_turf(x,y) //Same as normal + Rutile
var/tx = ((origin_x-1)+x)*chunk_size
var/ty = ((origin_y-1)+y)*chunk_size
diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
index 840a654c49..2072dd370f 100644
--- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
+++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
@@ -48,7 +48,7 @@
. = ..()
/////Copied from Virgo3b's ore generation, since there was concern about not being able to get the ore they need on V2
-/turf/simulated/mineral/virgo2/make_ore(var/rare_ore)
+/turf/simulated/mineral/virgo2/make_ore(rare_ore)
if(mineral)
return
var/mineral_name
diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm
index ec55d44b2c..1d3caa39db 100644
--- a/maps/expedition_vr/alienship/_alienship.dm
+++ b/maps/expedition_vr/alienship/_alienship.dm
@@ -139,7 +139,7 @@
did_entry = TRUE
-/area/shuttle/excursion/away_alienship/proc/abduct(var/mob/living/mob)
+/area/shuttle/excursion/away_alienship/proc/abduct(mob/living/mob)
if(isliving(mob))
var/mob/living/L = mob
diff --git a/maps/gateway_vr/wildwest.dm b/maps/gateway_vr/wildwest.dm
index 88b3cb9929..e14ac0a915 100644
--- a/maps/gateway_vr/wildwest.dm
+++ b/maps/gateway_vr/wildwest.dm
@@ -24,7 +24,7 @@
var/chargesa = 1
var/insistinga = 0
-/obj/machinery/wish_granter_dark/attack_hand(var/mob/living/carbon/human/user)
+/obj/machinery/wish_granter_dark/attack_hand(mob/living/carbon/human/user)
user.set_machine(src)
if(chargesa <= 0)
diff --git a/maps/groundbase/groundbase_events.dm b/maps/groundbase/groundbase_events.dm
index 86e9fca61a..1e64e26cdb 100644
--- a/maps/groundbase/groundbase_events.dm
+++ b/maps/groundbase/groundbase_events.dm
@@ -11,7 +11,7 @@
// Adds a list of pre-disabled events to the available events list.
// This keeps them in the rotation, but disabled, so they can be enabled with a click if desired that round.
-/datum/event_container/proc/add_disabled_events(var/list/disabled_events)
+/datum/event_container/proc/add_disabled_events(list/disabled_events)
for(var/datum/event_meta/EM in disabled_events)
EM.enabled = 0
available_events += EM
diff --git a/maps/groundbase/groundbase_mining.dm b/maps/groundbase/groundbase_mining.dm
index d11a65c34e..d3d5a6991a 100644
--- a/maps/groundbase/groundbase_mining.dm
+++ b/maps/groundbase/groundbase_mining.dm
@@ -1,4 +1,4 @@
-/turf/simulated/mineral/vacuum/gb_mine/make_ore(var/rare_ore)
+/turf/simulated/mineral/vacuum/gb_mine/make_ore(rare_ore)
if(mineral)
return
var/mineral_name
diff --git a/maps/groundbase/groundbase_shuttles.dm b/maps/groundbase/groundbase_shuttles.dm
index ed3f9d8024..59636207eb 100644
--- a/maps/groundbase/groundbase_shuttles.dm
+++ b/maps/groundbase/groundbase_shuttles.dm
@@ -62,7 +62,7 @@
signal.data["command"] = "secure_close"
post_signal(signal)
-/datum/shuttle/autodock/ferry/emergency/proc/post_signal(datum/signal/signal, var/filter = null)
+/datum/shuttle/autodock/ferry/emergency/proc/post_signal(datum/signal/signal, filter = null)
signal.transmission_method = TRANSMISSION_RADIO
if(radio_connection)
return radio_connection.post_signal(src, signal, filter)
diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm
index a6fa6fabd7..11163a036c 100644
--- a/maps/offmap_vr/common_offmaps.dm
+++ b/maps/offmap_vr/common_offmaps.dm
@@ -457,7 +457,7 @@
src:target_z = z
return INITIALIZE_HINT_QDEL
-/obj/effect/step_trigger/zlevel_fall/Trigger(var/atom/movable/A) //mostly from /obj/effect/step_trigger/teleporter/planetary_fall, step_triggers.dm L160
+/obj/effect/step_trigger/zlevel_fall/Trigger(atom/movable/A) //mostly from /obj/effect/step_trigger/teleporter/planetary_fall, step_triggers.dm L160
if(!src:target_z)
return
diff --git a/maps/om_adventure/grasscave.dm b/maps/om_adventure/grasscave.dm
index 7e5d1ac352..bc2b588fe5 100644
--- a/maps/om_adventure/grasscave.dm
+++ b/maps/om_adventure/grasscave.dm
@@ -58,7 +58,7 @@
/obj/effect/overmap/visitable/simplemob/spacewhale/grasscave
initial_generic_waypoints = list("om-grasscave-center", "om-grasscave-center2", "om-grasscave-southeast", "om-grasscave-southeast2")
-/turf/simulated/mineral/omadventure/make_ore(var/rare_ore)
+/turf/simulated/mineral/omadventure/make_ore(rare_ore)
if(mineral)
return
var/mineral_name
diff --git a/maps/redgate/casino_canal/casino_canal.dm b/maps/redgate/casino_canal/casino_canal.dm
index 2999c20540..a9c237fde3 100644
--- a/maps/redgate/casino_canal/casino_canal.dm
+++ b/maps/redgate/casino_canal/casino_canal.dm
@@ -16,7 +16,7 @@
var/amt_chips_to_dispense = 250
var/speaking = FALSE // Whether or not we are saying one message (to prevent overlap)
-/obj/machinery/oneuse_chipmachine/proc/state_message(var/message, var/delay=0)
+/obj/machinery/oneuse_chipmachine/proc/state_message(message, delay=0)
PROTECTED_PROC(TRUE)
SHOULD_NOT_SLEEP(TRUE)
// If we don't want a delay, say the message
diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm
index 733a496f39..3ec9950431 100644
--- a/maps/redgate/fantasy_items.dm
+++ b/maps/redgate/fantasy_items.dm
@@ -214,7 +214,7 @@
icon_state = "cookingpot"
return TRUE
-/obj/machinery/microwave/cookingpot/broke(var/spark = FALSE)
+/obj/machinery/microwave/cookingpot/broke(spark = FALSE)
. = ..()
// Magic bluespace stuff
@@ -304,7 +304,7 @@
icon = 'icons/obj/props/fantasy.dmi'
icon_state = "page"
-/obj/item/perfect_tele/magic/attack_self(mob/user, var/radial_menu_anchor = src)
+/obj/item/perfect_tele/magic/attack_self(mob/user, radial_menu_anchor = src)
. = ..(user, radial_menu_anchor)
if(.)
return TRUE
@@ -369,7 +369,7 @@ This device records all warnings given and teleport events for admin review in c
//locked door
-/obj/structure/simple_door/dungeon/Initialize(mapload,var/material_name)
+/obj/structure/simple_door/dungeon/Initialize(mapload,material_name)
. = ..(mapload, material_name || MAT_CULT)
/obj/structure/simple_door/dungeon/locked
diff --git a/maps/stellar_delight/stellar_delight_defines.dm b/maps/stellar_delight/stellar_delight_defines.dm
index b860b6c71e..a35884a990 100644
--- a/maps/stellar_delight/stellar_delight_defines.dm
+++ b/maps/stellar_delight/stellar_delight_defines.dm
@@ -363,15 +363,15 @@
for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in GLOB.all_stellar_delights)
sd.forceMove(loc, SOUTH)
-/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/virgo3b/Crossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = FALSE)
-/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = TRUE)
-/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(var/atom/movable/AM, var/going = FALSE)
+/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(atom/movable/AM, going = FALSE)
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
if(world.time < mob_announce_cooldown)
return
diff --git a/maps/stellar_delight/stellar_delight_events.dm b/maps/stellar_delight/stellar_delight_events.dm
index 85f458ca73..3bb254c763 100644
--- a/maps/stellar_delight/stellar_delight_events.dm
+++ b/maps/stellar_delight/stellar_delight_events.dm
@@ -11,7 +11,7 @@
// Adds a list of pre-disabled events to the available events list.
// This keeps them in the rotation, but disabled, so they can be enabled with a click if desired that round.
-/datum/event_container/proc/add_disabled_events(var/list/disabled_events)
+/datum/event_container/proc/add_disabled_events(list/disabled_events)
for(var/datum/event_meta/EM in disabled_events)
EM.enabled = 0
available_events += EM
diff --git a/maps/stellar_delight/stellar_delight_shuttle_defs.dm b/maps/stellar_delight/stellar_delight_shuttle_defs.dm
index 23d381be65..92fc7be9c0 100644
--- a/maps/stellar_delight/stellar_delight_shuttle_defs.dm
+++ b/maps/stellar_delight/stellar_delight_shuttle_defs.dm
@@ -144,15 +144,15 @@
for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in GLOB.all_stellar_delights)
sd.forceMove(loc, SOUTH)
-/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/virgo3b/Crossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = FALSE)
-/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = TRUE)
-/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(var/atom/movable/AM, var/going = FALSE)
+/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(atom/movable/AM, going = FALSE)
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
if(world.time < mob_announce_cooldown)
return
diff --git a/maps/stellar_delight/stellar_delight_turfs.dm b/maps/stellar_delight/stellar_delight_turfs.dm
index 754d11d6e0..bbc6c50b0f 100644
--- a/maps/stellar_delight/stellar_delight_turfs.dm
+++ b/maps/stellar_delight/stellar_delight_turfs.dm
@@ -1,4 +1,4 @@
-/turf/simulated/mineral/virgo2/make_ore(var/rare_ore) // Override V2 ore generation
+/turf/simulated/mineral/virgo2/make_ore(rare_ore) // Override V2 ore generation
if(mineral || ignore_mapgen)
return
var/mineral_name
diff --git a/maps/submaps/_helpers.dm b/maps/submaps/_helpers.dm
index 1e2991cfad..a8b383b287 100644
--- a/maps/submaps/_helpers.dm
+++ b/maps/submaps/_helpers.dm
@@ -73,12 +73,12 @@
target = null
return ..()
-/obj/structure/fake_stairs/Bumped(var/atom/movable/AM)
+/obj/structure/fake_stairs/Bumped(atom/movable/AM)
if(!target)
return
target.take(AM)
-/obj/structure/fake_stairs/proc/take(var/atom/movable/AM)
+/obj/structure/fake_stairs/proc/take(atom/movable/AM)
var/dir_to_use = stepoff_dir ? stepoff_dir : dir
var/turf/T = get_step(src, dir_to_use)
if(!T)
diff --git a/maps/submaps/admin_use_vr/fun.dm b/maps/submaps/admin_use_vr/fun.dm
index eb684721fd..5ff1e775ba 100644
--- a/maps/submaps/admin_use_vr/fun.dm
+++ b/maps/submaps/admin_use_vr/fun.dm
@@ -291,7 +291,7 @@
skybox_pixel_x = 0
skybox_pixel_y = 0
-/obj/effect/overmap/visitable/ship/admin_use/space_dog/Crossed(var/obj/effect/overmap/visitable/ship/enterer)
+/obj/effect/overmap/visitable/ship/admin_use/space_dog/Crossed(obj/effect/overmap/visitable/ship/enterer)
. = ..()
if(istype(enterer))
for(var/mob/potential_mob as anything in GLOB.player_list)
diff --git a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm
index 1dbdc48cc0..e3dfdada30 100644
--- a/maps/submaps/pois_vr/debris_field/debrisfield_things.dm
+++ b/maps/submaps/pois_vr/debris_field/debrisfield_things.dm
@@ -51,7 +51,7 @@
max_n2 = 0
minbodytemp = 0
-/mob/living/simple_mob/tomato/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/tomato/space/Process_Spacemove(check_drift = 0)
return TRUE
//Begin tourist ship stuff
@@ -66,7 +66,7 @@
max_n2 = 0
minbodytemp = 0
-/mob/living/simple_mob/animal/giant_spider/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/animal/giant_spider/space/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/animal/giant_spider/nurse/space
@@ -80,7 +80,7 @@
max_n2 = 0
minbodytemp = 0
-/mob/living/simple_mob/animal/giant_spider/nurse/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/animal/giant_spider/nurse/space/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/animal/giant_spider/hunter/space
@@ -94,7 +94,7 @@
max_n2 = 0
minbodytemp = 0
-/mob/living/simple_mob/animal/giant_spider/hunter/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/animal/giant_spider/hunter/space/Process_Spacemove(check_drift = 0)
return TRUE
/mob/living/simple_mob/animal/giant_spider/tunneler/space
@@ -108,7 +108,7 @@
max_n2 = 0
minbodytemp = 0
-/mob/living/simple_mob/animal/giant_spider/tunneler/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/animal/giant_spider/tunneler/space/Process_Spacemove(check_drift = 0)
return TRUE
/obj/structure/ghost_pod/manual/survivor/spidership
diff --git a/maps/submaps/space_rocks/space_rocks.dm b/maps/submaps/space_rocks/space_rocks.dm
index c0beb295c3..42b3e88164 100644
--- a/maps/submaps/space_rocks/space_rocks.dm
+++ b/maps/submaps/space_rocks/space_rocks.dm
@@ -1,6 +1,6 @@
#include "space_rocks_pois.dm"
-/turf/simulated/mineral/vacuum/sdmine/make_ore(var/rare_ore)
+/turf/simulated/mineral/vacuum/sdmine/make_ore(rare_ore)
if(mineral)
return
var/mineral_name
diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm
index 4e30b5d0df..f2e5660bc2 100644
--- a/maps/tether/submaps/_tether_submaps.dm
+++ b/maps/tether/submaps/_tether_submaps.dm
@@ -173,7 +173,7 @@
src:target_z = z
return INITIALIZE_HINT_QDEL
-/obj/effect/step_trigger/zlevel_fall/Trigger(var/atom/movable/A) //mostly from /obj/effect/step_trigger/teleporter/planetary_fall, step_triggers.dm L160
+/obj/effect/step_trigger/zlevel_fall/Trigger(atom/movable/A) //mostly from /obj/effect/step_trigger/teleporter/planetary_fall, step_triggers.dm L160
if(!src:target_z)
return
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index 811f6a9242..b1003d0e73 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -278,18 +278,18 @@
levels_for_distress = list(Z_NAME_OFFMAP1, Z_NAME_BEACH, Z_NAME_AEROSTAT, Z_NAME_DEBRISFIELD, Z_NAME_FUELDEPOT)
-/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/virgo3b/Crossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = FALSE)
-/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = TRUE)
/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels()
return list(Z_LEVEL_TETHER_SPACE_LOW)
-/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(var/atom/movable/AM, var/going = FALSE)
+/obj/effect/overmap/visitable/sector/virgo3b/announce_atc(atom/movable/AM, going = FALSE)
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
if(world.time < mob_announce_cooldown)
return
diff --git a/maps/tether/tether_events.dm b/maps/tether/tether_events.dm
index 8467a1a64b..2b58b9e865 100644
--- a/maps/tether/tether_events.dm
+++ b/maps/tether/tether_events.dm
@@ -11,7 +11,7 @@
// Adds a list of pre-disabled events to the available events list.
// This keeps them in the rotation, but disabled, so they can be enabled with a click if desired that round.
-/datum/event_container/proc/add_disabled_events(var/list/disabled_events)
+/datum/event_container/proc/add_disabled_events(list/disabled_events)
for(var/datum/event_meta/EM in disabled_events)
EM.enabled = 0
available_events += EM
diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm
index a065ae8ac3..f38c2b5b01 100644
--- a/maps/tether/tether_phoronlock.dm
+++ b/maps/tether/tether_phoronlock.dm
@@ -156,7 +156,7 @@
/datum/embedded_program/airlock/phoron
var/tag_scrubber
-/datum/embedded_program/airlock/phoron/New(var/obj/machinery/embedded_controller/M)
+/datum/embedded_program/airlock/phoron/New(obj/machinery/embedded_controller/M)
..(M)
memory["chamber_sensor_phoron"] = 0
memory["external_sensor_pressure"] = VIRGO3B_ONE_ATMOSPHERE
@@ -263,7 +263,7 @@
signalPump(tag_airpump, 0)
signalScrubber(tag_scrubber, 0)
-/datum/embedded_program/airlock/phoron/proc/signalScrubber(var/tag, var/power)
+/datum/embedded_program/airlock/phoron/proc/signalScrubber(tag, power)
var/datum/signal/signal = new
signal.data = list(
"tag" = tag,
diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm
index 1d9e4b63a4..88b29ce5cf 100644
--- a/maps/tether/tether_shuttles.dm
+++ b/maps/tether/tether_shuttles.dm
@@ -285,7 +285,7 @@
signal.data["command"] = "secure_close"
post_signal(signal)
-/datum/shuttle/autodock/ferry/emergency/proc/post_signal(datum/signal/signal, var/filter = null)
+/datum/shuttle/autodock/ferry/emergency/proc/post_signal(datum/signal/signal, filter = null)
signal.transmission_method = TRANSMISSION_RADIO
if(radio_connection)
return radio_connection.post_signal(src, signal, filter)
@@ -310,7 +310,7 @@
for(var/obj/machinery/computer/shuttle_control/tether_backup/comp in current_area)
computer = comp
-/datum/shuttle/ferry/tether_backup/process_longjump(var/area/origin, var/area/intended_destination)
+/datum/shuttle/ferry/tether_backup/process_longjump(area/origin, area/intended_destination)
var/failures = engines.len
for(var/obj/structure/shuttle/engine/E as anything in engines)
failures -= E.jump()
@@ -379,7 +379,7 @@
//TODO require a multitool to diagnose and open engine panels or something
-/obj/structure/shuttle/engine/proc/repair_welder(var/mob/user, var/obj/item/weldingtool/WT)
+/obj/structure/shuttle/engine/proc/repair_welder(mob/user, obj/item/weldingtool/WT)
if(!istype(WT))
return 0
if(wear <= 20)
diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm
index a1379e147a..0362eb724b 100644
--- a/maps/tether/tether_turfs.dm
+++ b/maps/tether/tether_turfs.dm
@@ -33,7 +33,7 @@
temperature = TCMB
//This proc is responsible for ore generation on surface turfs
-/turf/simulated/mineral/virgo3b/make_ore(var/rare_ore)
+/turf/simulated/mineral/virgo3b/make_ore(rare_ore)
if(mineral || ignore_mapgen)
return
var/mineral_name
@@ -72,7 +72,7 @@
UpdateMineral()
update_icon()
-/turf/simulated/mineral/virgo3b/rich/make_ore(var/rare_ore)
+/turf/simulated/mineral/virgo3b/rich/make_ore(rare_ore)
if(mineral || ignore_mapgen)
return
var/mineral_name
diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm
index f62247c81d..53c4922d5e 100644
--- a/maps/~map_system/maps.dm
+++ b/maps/~map_system/maps.dm
@@ -161,7 +161,7 @@ GLOBAL_LIST_EMPTY(all_maps)
default_skybox = new()
// Gets the current time on a current zlevel, and returns a time datum
-/datum/map/proc/get_zlevel_time(var/z)
+/datum/map/proc/get_zlevel_time(z)
if(!z)
z = 1
var/datum/planet/P = z <= SSplanets.z_to_planet.len ? SSplanets.z_to_planet[z] : null
@@ -175,7 +175,7 @@ GLOBAL_LIST_EMPTY(all_maps)
return T
// Returns a boolean for if it's night or not on a particular zlevel
-/datum/map/proc/get_night(var/z)
+/datum/map/proc/get_night(z)
if(!z)
z = 1
var/datum/time/now = get_zlevel_time(z)
@@ -198,11 +198,11 @@ GLOBAL_LIST_EMPTY(all_maps)
/datum/map/proc/perform_map_generation()
return
-/datum/map/proc/get_network_access(var/network)
+/datum/map/proc/get_network_access(network)
return 0
// By default transition randomly to another zlevel
-/datum/map/proc/get_transit_zlevel(var/current_z_level)
+/datum/map/proc/get_transit_zlevel(current_z_level)
var/list/candidates = using_map.accessible_z_levels.Copy()
candidates.Remove(num2text(current_z_level))
@@ -223,12 +223,12 @@ GLOBAL_LIST_EMPTY(all_maps)
empty_levels += world.maxz
return pick_n_take(empty_levels)
-/datum/map/proc/cache_empty_zlevel(var/z)
+/datum/map/proc/cache_empty_zlevel(z)
if(z) // Else, it's not a valid z and we want to expunge it
empty_levels |= z
//CHOMPAdd Start restricted map view
-/datum/map/proc/get_visible_map_levels(var/srcz, var/long_range = FALSE)
+/datum/map/proc/get_visible_map_levels(srcz, long_range = FALSE)
if (long_range && (srcz in contact_levels))
return contact_levels.Copy() - admin_levels
//If in station levels, return station levels
@@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(all_maps)
// Get a list of 'nearby' or 'connected' zlevels.
// You should at least return a list with the given z if nothing else.
-/datum/map/proc/get_map_levels(var/srcz, var/long_range = FALSE, var/om_range = -1)
+/datum/map/proc/get_map_levels(srcz, long_range = FALSE, om_range = -1)
//Get what sector we're in
var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
if(istype(O))
@@ -269,7 +269,7 @@ GLOBAL_LIST_EMPTY(all_maps)
else
return list(srcz)
-/datum/map/proc/get_zlevel_name(var/index)
+/datum/map/proc/get_zlevel_name(index)
var/datum/map_z_level/Z = zlevels["[index]"]
return Z?.name
@@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY(all_maps)
var/datum/skybox_settings/custom_skybox // Can override skybox type here for this z
// Default constructor applies itself to the parent map datum
-/datum/map_z_level/New(var/datum/map/map)
+/datum/map_z_level/New(datum/map/map)
if(!z) return
map.zlevels["[z]"] = src
if(flags & MAP_LEVEL_STATION) map.station_levels += z
@@ -361,7 +361,7 @@ GLOBAL_LIST_EMPTY(all_maps)
if(custom_skybox)
custom_skybox = new custom_skybox()
-/datum/map_z_level/Destroy(var/force)
+/datum/map_z_level/Destroy(force)
stack_trace("Attempt to delete a map_z_level instance [log_info_line(src)]")
if(!force)
return QDEL_HINT_LETMELIVE // No.
diff --git a/modular_chomp/code/ZAS/Fire.dm b/modular_chomp/code/ZAS/Fire.dm
index daf93d3c5b..04f5cfac2c 100644
--- a/modular_chomp/code/ZAS/Fire.dm
+++ b/modular_chomp/code/ZAS/Fire.dm
@@ -27,10 +27,10 @@
zone.fire_tiles |= src
return FALSE
-/turf/proc/feed_lingering_fire(var/amnt)
+/turf/proc/feed_lingering_fire(amnt)
return
-/turf/simulated/feed_lingering_fire(var/amnt)
+/turf/simulated/feed_lingering_fire(amnt)
if(fire && istype(fire, /obj/fire/lingering))
var/obj/fire/lingering/F = fire
F.firelevel += amnt
diff --git a/modular_chomp/code/datums/components/squeak.dm b/modular_chomp/code/datums/components/squeak.dm
index 56f346a38d..8a2ede13d9 100644
--- a/modular_chomp/code/datums/components/squeak.dm
+++ b/modular_chomp/code/datums/components/squeak.dm
@@ -84,7 +84,7 @@
qdel(GetComponent(/datum/component/connect_loc_behalf))
*/
-/datum/component/squeak/proc/play_squeak(var/volume_mod = 1)
+/datum/component/squeak/proc/play_squeak(volume_mod = 1)
SIGNAL_HANDLER
if(prob(squeak_chance))
@@ -93,7 +93,7 @@
else
playsound(parent, pick_weight(override_squeak_sounds), volume * volume_mod, TRUE, sound_extra_range)
-/datum/component/squeak/proc/step_squeak(obj/item/clothing/shoes/source, var/running)
+/datum/component/squeak/proc/step_squeak(obj/item/clothing/shoes/source, running)
SIGNAL_HANDLER
/*
diff --git a/modular_chomp/code/datums/crafting/items.dm b/modular_chomp/code/datums/crafting/items.dm
index 5df5b9b239..bc6babc2bd 100644
--- a/modular_chomp/code/datums/crafting/items.dm
+++ b/modular_chomp/code/datums/crafting/items.dm
@@ -138,7 +138,7 @@
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
-/obj/item/clothing/suit/armor/firecloak/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/firecloak/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(istype(damage_source, /obj/item/projectile))
return FALSE
if(attacker && attacker != user)
@@ -160,7 +160,7 @@
force_divisor = 0.50
color = "#F13C00"
-/obj/item/material/sword/rapier/solar/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/material/sword/rapier/solar/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
target.adjust_fire_stacks(10)
target.ignite_mob()
@@ -205,7 +205,7 @@
force_wielded = 25
applies_material_colour = 1
-/obj/item/material/twohanded/sledgehammer/gravity/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/material/twohanded/sledgehammer/gravity/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
. = ..()
var/atom/target_zone = get_edge_target_turf(user,get_dir(user, target))
if(!target.anchored)
@@ -233,7 +233,7 @@
slowdown = -0.5
//uggg, why isnt this apart of the base material melee weapons
-/obj/item/material/twohanded/fireaxe/scythe/harvester/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/material/twohanded/fireaxe/scythe/harvester/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(.)
return .
if(default_parry_check(user, attacker, damage_source) && prob(defend_chance))
diff --git a/modular_chomp/code/datums/underwear/socks.dm b/modular_chomp/code/datums/underwear/socks.dm
index 06967beee2..af47d9a2b8 100644
--- a/modular_chomp/code/datums/underwear/socks.dm
+++ b/modular_chomp/code/datums/underwear/socks.dm
@@ -1,4 +1,4 @@
-/datum/category_item/underwear/socks/generate_image(var/list/metadata, var/layer = FLOAT_LAYER, var/digitigrade = FALSE) //CHOMPEdit
+/datum/category_item/underwear/socks/generate_image(list/metadata, layer = FLOAT_LAYER, digitigrade = FALSE) //CHOMPEdit
if(!icon_state)
return
diff --git a/modular_chomp/code/game/gamemodes/meteor/meteors.dm b/modular_chomp/code/game/gamemodes/meteor/meteors.dm
index e90ee8346b..62653a9d77 100644
--- a/modular_chomp/code/game/gamemodes/meteor/meteors.dm
+++ b/modular_chomp/code/game/gamemodes/meteor/meteors.dm
@@ -18,7 +18,7 @@
..()
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
-/obj/effect/meteor/medium/meatyore/meteor_effect(var/gib)
+/obj/effect/meteor/medium/meatyore/meteor_effect(gib)
..()
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
@@ -33,7 +33,7 @@
..()
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
-/obj/effect/meteor/big/meteor_effect(var/gib)
+/obj/effect/meteor/big/meteor_effect(gib)
..()
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
@@ -48,7 +48,7 @@
..()
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
-/obj/effect/meteor/flaming/meatyore/meteor_effect(var/gib)
+/obj/effect/meteor/flaming/meatyore/meteor_effect(gib)
..()
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
@@ -63,7 +63,7 @@
..()
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
-/obj/effect/meteor/irradiated/meatyore/meteor_effect(var/gib)
+/obj/effect/meteor/irradiated/meatyore/meteor_effect(gib)
..()
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
@@ -78,7 +78,7 @@
..()
new /obj/effect/decal/cleanable/blood/splatter(get_turf(src))
-/obj/effect/meteor/emp/meatyore/meteor_effect(var/gib)
+/obj/effect/meteor/emp/meatyore/meteor_effect(gib)
..()
if(gib)
new /obj/effect/gibspawner/human
@@ -89,7 +89,7 @@
icon_state = "meaty_flaming"
meteordrop = /obj/item/reagent_containers/food/snacks/phorondragonmeat
-/obj/effect/meteor/tunguska/meatyore/meteor_effect(var/gib)
+/obj/effect/meteor/tunguska/meatyore/meteor_effect(gib)
..()
if(gib)
new /obj/effect/gibspawner/human(get_turf(src))
diff --git a/modular_chomp/code/game/jobs/job/noncrew.dm b/modular_chomp/code/game/jobs/job/noncrew.dm
index 4a3b4e6fda..5bfb340e07 100644
--- a/modular_chomp/code/game/jobs/job/noncrew.dm
+++ b/modular_chomp/code/game/jobs/job/noncrew.dm
@@ -70,7 +70,7 @@
else
return FALSE
-/datum/job/shadekin/update_limit(var/comperator)
+/datum/job/shadekin/update_limit(comperator)
var/current_limit = spawn_positions + round(comperator / 50)
if(current_limit > total_positions)
total_positions = current_limit
diff --git a/modular_chomp/code/game/machinery/buttons.dm b/modular_chomp/code/game/machinery/buttons.dm
index 66282ebb31..66bc153eb0 100644
--- a/modular_chomp/code/game/machinery/buttons.dm
+++ b/modular_chomp/code/game/machinery/buttons.dm
@@ -33,6 +33,6 @@
/obj/machinery/button/mob_spawner_button/second
link = "MOBSPAWNSECOND"
-/obj/machinery/button/remote/noemag/emag_act(var/remaining_charges, var/mob/user)
+/obj/machinery/button/remote/noemag/emag_act(remaining_charges, mob/user)
to_chat(usr, span_warning("The cryptographic sequencer seems to do nothing."))
return 0
diff --git a/modular_chomp/code/game/machinery/food_replicator.dm b/modular_chomp/code/game/machinery/food_replicator.dm
index 5bc0b00618..28e9dafe09 100644
--- a/modular_chomp/code/game/machinery/food_replicator.dm
+++ b/modular_chomp/code/game/machinery/food_replicator.dm
@@ -145,7 +145,7 @@
return ..()
-/obj/machinery/food_replicator/proc/foodcheck(var/obj/item/reagent_containers/food)
+/obj/machinery/food_replicator/proc/foodcheck(obj/item/reagent_containers/food)
var/mob/living/mob = locate(/mob/living) in food
if(mob)
playsound(src, "sound/machines/buzz-two.ogg", 25, 0)
diff --git a/modular_chomp/code/game/objects/effects/dark_growth.dm b/modular_chomp/code/game/objects/effects/dark_growth.dm
index d42527845d..ab8fb96573 100644
--- a/modular_chomp/code/game/objects/effects/dark_growth.dm
+++ b/modular_chomp/code/game/objects/effects/dark_growth.dm
@@ -87,7 +87,7 @@
if(!linked_node)
qdel(src)
-/obj/effect/dark/floor/Initialize(mapload, check_glow, var/node)
+/obj/effect/dark/floor/Initialize(mapload, check_glow, node)
. = ..(mapload, !isspace(loc))
if(isspace(loc))
diff --git a/modular_chomp/code/game/objects/effects/simple_portals.dm b/modular_chomp/code/game/objects/effects/simple_portals.dm
index d4ca52fe55..7ac05158ba 100644
--- a/modular_chomp/code/game/objects/effects/simple_portals.dm
+++ b/modular_chomp/code/game/objects/effects/simple_portals.dm
@@ -42,7 +42,7 @@ GLOBAL_LIST_EMPTY(simple_portals)
playsound(get_turf(src),teleport_sound,60,1)
playsound(get_turf(destination),teleport_sound,60,1)
-/obj/effect/simple_portal/attack_ghost(var/mob/observer/dead/user)
+/obj/effect/simple_portal/attack_ghost(mob/observer/dead/user)
. = ..()
handle_teleport(user)
@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(simple_portals)
break
. = ..()
-/obj/effect/simple_portal/linked/proc/valid_destination(var/turf/dest,var/atom/movable/AM)
+/obj/effect/simple_portal/linked/proc/valid_destination(turf/dest,atom/movable/AM)
if(!dest)
return FALSE
if(dest.density)
diff --git a/modular_chomp/code/game/objects/effects/step_triggers.dm b/modular_chomp/code/game/objects/effects/step_triggers.dm
index 7f99eb6ad6..d2c9d207f6 100644
--- a/modular_chomp/code/game/objects/effects/step_triggers.dm
+++ b/modular_chomp/code/game/objects/effects/step_triggers.dm
@@ -2,7 +2,7 @@
. = ..()
teleport_z = src.z //This is for use in gateways, so mappers can hard map the X and Y without worrying about going to brazil
-/obj/effect/step_trigger/teleporter/deathfall/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/teleporter/deathfall/Trigger(atom/movable/A)
var/turf/simulated/T = locate(teleport_x, teleport_y, teleport_z)
if(!istype(T))
log_mapping("[src] failed to find destination turf.")
diff --git a/modular_chomp/code/game/objects/items/devices/radio/headset.dm b/modular_chomp/code/game/objects/items/devices/radio/headset.dm
index 11b5e75107..6f7a3ab15d 100644
--- a/modular_chomp/code/game/objects/items/devices/radio/headset.dm
+++ b/modular_chomp/code/game/objects/items/devices/radio/headset.dm
@@ -62,7 +62,7 @@
H.species.slowdown = slowdown_reset
H.species.item_slowdown_mod = item_slowdown_reset
-/obj/item/radio/headset/event/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/radio/headset/event/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(!telez)
return FALSE
tele_threshold -= damage
diff --git a/modular_chomp/code/game/objects/items/weapons/RCD.dm b/modular_chomp/code/game/objects/items/weapons/RCD.dm
index 1da98002d7..106d46c8c0 100644
--- a/modular_chomp/code/game/objects/items/weapons/RCD.dm
+++ b/modular_chomp/code/game/objects/items/weapons/RCD.dm
@@ -35,7 +35,7 @@ borosilicate = 9
rborosilicate = 12
*/
-/obj/item/rcd/emag_act(var/remaining_charges, var/mob/user)
+/obj/item/rcd/emag_act(remaining_charges, mob/user)
..()
if(!emagged)
emagged = 1
diff --git a/modular_chomp/code/game/objects/structures/tyr_project_props.dm b/modular_chomp/code/game/objects/structures/tyr_project_props.dm
index 9f2cdf6ba2..d129716c63 100644
--- a/modular_chomp/code/game/objects/structures/tyr_project_props.dm
+++ b/modular_chomp/code/game/objects/structures/tyr_project_props.dm
@@ -9,7 +9,7 @@
var/descendx
var/descendy
-/obj/structure/prop/tyr_elevator/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/structure/prop/tyr_elevator/attackby(obj/item/W as obj, mob/user as mob)
if (do_after(user, 30, target = src))
do_teleport(user, locate(descendx,descendy,src.z), channel = TELEPORT_CHANNEL_QUANTUM)
@@ -61,7 +61,7 @@
visible_message(span_warning("A red light on \the [src]'s control panel flashes briefly."))
..()
-/obj/machinery/door/blast/puzzle/tyrdoor/keypad/proc/check_input(var/input)
+/obj/machinery/door/blast/puzzle/tyrdoor/keypad/proc/check_input(input)
if(length(input) != codelen)
return 0
@@ -112,7 +112,7 @@
var/mob/living/carbon/occupant = null
-/obj/machinery/restoration_cell/attackby(var/obj/item/G as obj, var/mob/user as mob)
+/obj/machinery/restoration_cell/attackby(obj/item/G as obj, mob/user as mob)
if(istype(G, /obj/item/grab))
var/obj/item/grab/grab = G
if(!ismob(grab.affecting))
diff --git a/modular_chomp/code/game/objects/structures/watercloset_ch.dm b/modular_chomp/code/game/objects/structures/watercloset_ch.dm
index 6fdd8c0713..14334048d3 100644
--- a/modular_chomp/code/game/objects/structures/watercloset_ch.dm
+++ b/modular_chomp/code/game/objects/structures/watercloset_ch.dm
@@ -53,7 +53,7 @@
else
muffin_mode = FALSE
-/obj/structure/biowaste_tank/attack_hand(var/mob/user as mob)
+/obj/structure/biowaste_tank/attack_hand(mob/user as mob)
if(contents.len)
var/atom/movable/choice = tgui_input_list(usr, "It appears the machine has caught some items in the lost-and-found filter system. Would you like to eject something?", "Item Retrieval Console", contents)
if(choice)
@@ -74,7 +74,7 @@
else
choice.forceMove(get_turf(src))
-/obj/structure/biowaste_tank/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
+/obj/structure/biowaste_tank/emag_act(remaining_charges, mob/user, emag_source)
if(muffinmonster && muffin_mode)
muffinmonster.name = "Muffin Monster"
muffinmonster.forceMove(get_turf(src))
diff --git a/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm b/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
index 5ffbb7f590..bb9294f68f 100644
--- a/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
+++ b/modular_chomp/code/game/turfs/simulated/outdoors/desert_planet.dm
@@ -20,7 +20,7 @@
. = ..()
icon_state = "sand[rand(0,2)]"
-/turf/simulated/floor/outdoors/desert_planet/sand/attackby(var/obj/item/W, var/mob/user)
+/turf/simulated/floor/outdoors/desert_planet/sand/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/shovel))
to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
if(do_after(user, 4 SECONDS * W.toolspeed, src))
diff --git a/modular_chomp/code/game/turfs/simulated/shuttlewalls.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls.dm
index 0079737c8b..74d77266cb 100644
--- a/modular_chomp/code/game/turfs/simulated/shuttlewalls.dm
+++ b/modular_chomp/code/game/turfs/simulated/shuttlewalls.dm
@@ -52,7 +52,7 @@
/turf/simulated/shuttlewalls/proc/get_material()
return material
-/turf/simulated/shuttlewalls/bullet_act(var/obj/item/projectile/Proj)
+/turf/simulated/shuttlewalls/bullet_act(obj/item/projectile/Proj)
if(istype(Proj,/obj/item/projectile/beam))
burn(2500)
else if(istype(Proj,/obj/item/projectile/ion))
@@ -116,7 +116,7 @@
plant.pixel_y = 0
plant.update_neighbors()
-/turf/simulated/shuttlewalls/ChangeTurf(var/turf/N, var/tell_universe, var/force_lighting_update, var/preserve_outdoors)
+/turf/simulated/shuttlewalls/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors)
clear_plants()
..(N, tell_universe, force_lighting_update, preserve_outdoors)
@@ -186,7 +186,7 @@
return ..()
-/turf/simulated/shuttlewalls/proc/dismantle_wall(var/devastated, var/explode, var/no_product)
+/turf/simulated/shuttlewalls/proc/dismantle_wall(devastated, explode, no_product)
playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(!no_product)
diff --git a/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm
index 2ef8177d08..daca03d3fe 100644
--- a/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm
+++ b/modular_chomp/code/game/turfs/simulated/shuttlewalls_attacks.dm
@@ -1,5 +1,5 @@
//Interactions
-/turf/simulated/shuttlewalls/proc/toggle_open(var/mob/user)
+/turf/simulated/shuttlewalls/proc/toggle_open(mob/user)
if(can_open == WALL_OPENING)
return
@@ -41,14 +41,14 @@
SSair.mark_for_update(turf)
-/turf/simulated/shuttlewalls/proc/update_thermal(var/turf/simulated/source)
+/turf/simulated/shuttlewalls/proc/update_thermal(turf/simulated/source)
if(istype(source))
if(density && opacity)
source.thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
else
source.thermal_conductivity = initial(source.thermal_conductivity)
-/turf/simulated/shuttlewalls/proc/fail_smash(var/mob/user)
+/turf/simulated/shuttlewalls/proc/fail_smash(mob/user)
var/damage_lower = 25
var/damage_upper = 75
if(isanimal(user))
@@ -63,7 +63,7 @@
user.do_attack_animation(src)
take_damage(rand(damage_lower,damage_upper))
-/turf/simulated/shuttlewalls/proc/success_smash(var/mob/user)
+/turf/simulated/shuttlewalls/proc/success_smash(mob/user)
to_chat(user, span_danger("You smash through the wall!"))
user.do_attack_animation(src)
if(isanimal(user))
@@ -72,7 +72,7 @@
spawn(1)
dismantle_wall(1)
-/turf/simulated/shuttlewalls/proc/try_touch(var/mob/user, var/rotting)
+/turf/simulated/shuttlewalls/proc/try_touch(mob/user, rotting)
if(rotting)
if(reinf_material)
@@ -91,7 +91,7 @@
return 0
-/turf/simulated/shuttlewalls/attack_hand(var/mob/user)
+/turf/simulated/shuttlewalls/attack_hand(mob/user)
radiate()
add_fingerprint(user)
@@ -106,7 +106,7 @@
try_touch(user, rotting)
-/turf/simulated/shuttlewalls/attack_generic(var/mob/user, var/damage, var/attack_message)
+/turf/simulated/shuttlewalls/attack_generic(mob/user, damage, attack_message)
radiate()
user.setClickCooldown(user.get_attack_speed())
@@ -125,7 +125,7 @@
return success_smash(user)
return fail_smash(user)
-/turf/simulated/shuttlewalls/attackby(var/obj/item/W, var/mob/user)
+/turf/simulated/shuttlewalls/attackby(obj/item/W, mob/user)
user.setClickCooldown(user.get_attack_speed(W))
diff --git a/modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm b/modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm
index 200da4fb18..39be8e3dbd 100644
--- a/modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm
+++ b/modular_chomp/code/game/turfs/simulated/shuttlewalls_icon.dm
@@ -30,7 +30,7 @@
update_icon()
-/turf/simulated/shuttlewalls/proc/set_material(var/datum/material/newmaterial, var/datum/material/newrmaterial, var/datum/material/newgmaterial)
+/turf/simulated/shuttlewalls/proc/set_material(datum/material/newmaterial, datum/material/newrmaterial, datum/material/newgmaterial)
material = newmaterial
reinf_material = newrmaterial
if(!newgmaterial)
@@ -82,7 +82,7 @@
if ((additional_dirs & diag_dir) == diag_dir)
dirs += diag_dir
-/turf/simulated/shuttlewalls/proc/can_join_with_wall(var/turf/simulated/wall/W)
+/turf/simulated/shuttlewalls/proc/can_join_with_wall(turf/simulated/wall/W)
//No blending if no material
if(!material || !W.material)
return 0
@@ -94,5 +94,5 @@
return 1
return 0
-/turf/simulated/shuttlewalls/proc/can_join_with_low_wall(var/obj/structure/low_wall/WF)
+/turf/simulated/shuttlewalls/proc/can_join_with_low_wall(obj/structure/low_wall/WF)
return FALSE
diff --git a/modular_chomp/code/modules/blob2/agate_blob.dm b/modular_chomp/code/modules/blob2/agate_blob.dm
index 2b0b6bf73e..bced58cc6d 100644
--- a/modular_chomp/code/modules/blob2/agate_blob.dm
+++ b/modular_chomp/code/modules/blob2/agate_blob.dm
@@ -36,7 +36,7 @@
spore_type = /mob/living/simple_mob/blob/spore/infesting
-/datum/blob_type/living_agate/on_received_damage(var/obj/structure/blob/B, damage, damage_type, mob/living/attacker)
+/datum/blob_type/living_agate/on_received_damage(obj/structure/blob/B, damage, damage_type, mob/living/attacker)
if(damage > 0 && attacker && get_dist(B, attacker) <= 1)
B.visible_message(span_danger("The [name] retaliates, lashing out at \the [attacker]!"))
B.blob_attack_animation(attacker, B.overmind)
diff --git a/modular_chomp/code/modules/clothing/clothing_icons.dm b/modular_chomp/code/modules/clothing/clothing_icons.dm
index 0fe79f6601..2af2c57557 100644
--- a/modular_chomp/code/modules/clothing/clothing_icons.dm
+++ b/modular_chomp/code/modules/clothing/clothing_icons.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/shoes/apply_blood(var/image/standing)
+/obj/item/clothing/shoes/apply_blood(image/standing)
if(forensic_data?.has_blooddna() && blood_sprite_state && ishuman(loc))
var/mob/living/carbon/human/H = loc
var/image/bloodsies = image(icon = H.digitigrade ? 'icons/mob/human_races/masks/blood_digitigrade.dmi' : H.species.get_blood_mask(H), icon_state = blood_sprite_state)
diff --git a/modular_chomp/code/modules/clothing/gateway/gateway.dm b/modular_chomp/code/modules/clothing/gateway/gateway.dm
index c3b13fd7b3..a0926e84ad 100644
--- a/modular_chomp/code/modules/clothing/gateway/gateway.dm
+++ b/modular_chomp/code/modules/clothing/gateway/gateway.dm
@@ -62,7 +62,7 @@
brainloss_cost = 0
armor = list(melee = 70, bullet = 60, laser = 50, energy = 50, bomb = 0, bio = 0, rad = 0)
-/obj/item/clothing/head/psy_crown/candycrown/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/head/psy_crown/candycrown/activate_ability(mob/living/wearer)
..()
wearer.add_modifier(/datum/modifier/aura/candy_orange, 30 SECONDS)
diff --git a/modular_chomp/code/modules/clothing/gloves/antagonist.dm b/modular_chomp/code/modules/clothing/gloves/antagonist.dm
index 00a5b6b850..d52132a1c3 100644
--- a/modular_chomp/code/modules/clothing/gloves/antagonist.dm
+++ b/modular_chomp/code/modules/clothing/gloves/antagonist.dm
@@ -17,12 +17,12 @@
if(!battery)
battery = new battery_type(src)
-/obj/item/clothing/gloves/ring/buzzer/Touch(var/atom/A, var/proximity)
+/obj/item/clothing/gloves/ring/buzzer/Touch(atom/A, proximity)
if(proximity && istype(usr, /mob/living/carbon/human))
return zap(usr, A, proximity)
return 0
-/obj/item/clothing/gloves/ring/buzzer/proc/zap(var/mob/living/carbon/human/user, var/atom/movable/target, var/proximity)
+/obj/item/clothing/gloves/ring/buzzer/proc/zap(mob/living/carbon/human/user, atom/movable/target, proximity)
. = FALSE
if(user.a_intent == I_HURT && battery.percent() >= 50)
if(isliving(target))
@@ -45,7 +45,7 @@
return 0
-/obj/item/clothing/gloves/ring/buzzer/proc/do_defib(var/mob/living/carbon/human/H = null)
+/obj/item/clothing/gloves/ring/buzzer/proc/do_defib(mob/living/carbon/human/H = null)
if(!istype(H))
return 0
diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/.behemoth.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/.behemoth.dm
index bb60881201..80651b6e5d 100644
--- a/modular_chomp/code/modules/clothing/spacesuits/rig/.behemoth.dm
+++ b/modular_chomp/code/modules/clothing/spacesuits/rig/.behemoth.dm
@@ -38,7 +38,7 @@
icon_state = "aegis_rig"
desc = "A pair of grabby boots"
-/obj/item/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+/obj/item/rig/ch/aegis/bullet_act(obj/item/projectile/P)
var/reflectchance = 70 - round(P.damage)
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
@@ -58,7 +58,7 @@
return (..(P))
-/obj/item/clothing/suit/space/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+/obj/item/clothing/suit/space/rig/ch/aegis/bullet_act(obj/item/projectile/P)
var/reflectchance = 70 - round(P.damage)
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
@@ -78,7 +78,7 @@
return (..(P))
-/obj/item/clothing/head/helmet/space/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+/obj/item/clothing/head/helmet/space/rig/ch/aegis/bullet_act(obj/item/projectile/P)
var/reflectchance = 70 - round(P.damage)
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
@@ -99,7 +99,7 @@
return (..(P))
-/obj/item/clothing/gloves/gauntlets/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+/obj/item/clothing/gloves/gauntlets/rig/ch/aegis/bullet_act(obj/item/projectile/P)
var/reflectchance = 70 - round(P.damage)
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
@@ -120,7 +120,7 @@
return (..(P))
-/obj/item/clothing/shoes/magboots/rig/ch/aegis/bullet_act(var/obj/item/projectile/P)
+/obj/item/clothing/shoes/magboots/rig/ch/aegis/bullet_act(obj/item/projectile/P)
var/reflectchance = 70 - round(P.damage)
if(prob(reflectchance))
visible_message(span_danger("The [P.name] gets reflected by [src]'s shell!"), \
diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/defib.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/defib.dm
index 95d0b7351d..a36bcbde96 100644
--- a/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/defib.dm
+++ b/modular_chomp/code/modules/clothing/spacesuits/rig/modules/specific/defib.dm
@@ -17,7 +17,7 @@
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
. = ..()
-/obj/item/shockpaddles/standalone/rig/checked_use(var/charge_amt)
+/obj/item/shockpaddles/standalone/rig/checked_use(charge_amt)
return 1
/obj/item/shockpaddles/standalone/rig/attack_self(mob/user)
diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/precursor.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/precursor.dm
index 8d3e92b93f..20054f7a9f 100644
--- a/modular_chomp/code/modules/clothing/spacesuits/rig/precursor.dm
+++ b/modular_chomp/code/modules/clothing/spacesuits/rig/precursor.dm
@@ -45,31 +45,31 @@
desc = "A pair of grabby boots"
var/block_chance = 15
-/obj/item/rig/ch/precursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/rig/ch/precursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
return TRUE
return FALSE
-/obj/item/clothing/suit/space/rig/ch/precursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/space/rig/ch/precursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
return TRUE
return FALSE
-/obj/item/clothing/head/helmet/space/rig/ch/precursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/head/helmet/space/rig/ch/precursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
return TRUE
return FALSE
-/obj/item/clothing/gloves/gauntlets/rig/ch/precursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/gloves/gauntlets/rig/ch/precursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
return TRUE
return FALSE
-/obj/item/clothing/shoes/magboots/rig/ch/precursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/shoes/magboots/rig/ch/precursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
return TRUE
diff --git a/modular_chomp/code/modules/clothing/spacesuits/rig/tyr.dm b/modular_chomp/code/modules/clothing/spacesuits/rig/tyr.dm
index 24c8fda931..2554b73323 100644
--- a/modular_chomp/code/modules/clothing/spacesuits/rig/tyr.dm
+++ b/modular_chomp/code/modules/clothing/spacesuits/rig/tyr.dm
@@ -27,7 +27,7 @@
var/cooldown = null // world.time of when this was last triggered.
var/cooldown_duration = 2 MINUTES
-/obj/item/clothing/suit/space/rig/ch/tyrprecursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/space/rig/ch/tyrprecursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(shieldhealth < 75)
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
shieldhealth -= damage
@@ -35,16 +35,16 @@
return TRUE
return FALSE
-/obj/item/clothing/suit/space/rig/ch/tyrprecursor/proc/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/suit/space/rig/ch/tyrprecursor/proc/activate_ability(mob/living/wearer)
cooldown = world.time + cooldown_duration
shieldhealth = 75
-/obj/item/clothing/suit/space/rig/ch/tyrprecursor/equipped(var/mob/living/carbon/human/H)
+/obj/item/clothing/suit/space/rig/ch/tyrprecursor/equipped(mob/living/carbon/human/H)
..()
if(istype(H) && H.head == src && H.is_sentient())
START_PROCESSING(SSobj, src)
-/obj/item/clothing/suit/space/rig/ch/tyrprecursor/dropped(var/mob/living/carbon/human/H)
+/obj/item/clothing/suit/space/rig/ch/tyrprecursor/dropped(mob/living/carbon/human/H)
..()
STOP_PROCESSING(SSobj, src)
@@ -68,7 +68,7 @@
var/cooldown = null // world.time of when this was last triggered.
var/cooldown_duration = 2 MINUTES
-/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(shieldhealth < 75)
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
shieldhealth -= damage
@@ -76,16 +76,16 @@
return TRUE
return FALSE
-/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/proc/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/proc/activate_ability(mob/living/wearer)
cooldown = world.time + cooldown_duration
shieldhealth = 75
-/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/equipped(var/mob/living/carbon/human/H)
+/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/equipped(mob/living/carbon/human/H)
..()
if(istype(H) && H.head == src && H.is_sentient())
START_PROCESSING(SSobj, src)
-/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/dropped(var/mob/living/carbon/human/H)
+/obj/item/clothing/head/helmet/space/rig/ch/tyrprecursor/dropped(mob/living/carbon/human/H)
..()
STOP_PROCESSING(SSobj, src)
@@ -108,7 +108,7 @@
var/cooldown = null // world.time of when this was last triggered.
var/cooldown_duration = 2 MINUTES
-/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(shieldhealth < 75)
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
shieldhealth -= damage
@@ -116,16 +116,16 @@
return TRUE
return FALSE
-/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/proc/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/proc/activate_ability(mob/living/wearer)
cooldown = world.time + cooldown_duration
shieldhealth = 75
-/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/equipped(var/mob/living/carbon/human/H)
+/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/equipped(mob/living/carbon/human/H)
..()
if(istype(H) && H.head == src && H.is_sentient())
START_PROCESSING(SSobj, src)
-/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/dropped(var/mob/living/carbon/human/H)
+/obj/item/clothing/gloves/gauntlets/rig/ch/tyrprecursor/dropped(mob/living/carbon/human/H)
..()
STOP_PROCESSING(SSobj, src)
@@ -148,7 +148,7 @@
var/cooldown = null // world.time of when this was last triggered.
var/cooldown_duration = 2 MINUTES
-/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(shieldhealth < 75)
user.visible_message(span_danger("\The [src] completely absorbs [attack_text]!"))
shieldhealth -= damage
@@ -156,16 +156,16 @@
return TRUE
return FALSE
-/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/proc/activate_ability(var/mob/living/wearer)
+/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/proc/activate_ability(mob/living/wearer)
cooldown = world.time + cooldown_duration
shieldhealth = 75
-/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/equipped(var/mob/living/carbon/human/H)
+/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/equipped(mob/living/carbon/human/H)
..()
if(istype(H) && H.head == src && H.is_sentient())
START_PROCESSING(SSobj, src)
-/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/dropped(var/mob/living/carbon/human/H)
+/obj/item/clothing/shoes/magboots/rig/ch/tyrprecursor/dropped(mob/living/carbon/human/H)
..()
STOP_PROCESSING(SSobj, src)
diff --git a/modular_chomp/code/modules/emotes/definitions/audiable.dm b/modular_chomp/code/modules/emotes/definitions/audiable.dm
index f7482c6e21..50a7e5c459 100644
--- a/modular_chomp/code/modules/emotes/definitions/audiable.dm
+++ b/modular_chomp/code/modules/emotes/definitions/audiable.dm
@@ -9,7 +9,7 @@
emote_message_3p_target = "prbts at TARGET."
emote_sound = 'sound/voice/prbt2.ogg'
-/datum/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/gasp/get_emote_sound(atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -105,7 +105,7 @@
'sound/voice/pain/scientist/sci_pain5.ogg',
)
-/datum/decl/emote/audible/scientist/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/scientist/get_emote_sound(atom/user)
. = ..()
.["vol"] *= 0.4 //these boys are pretty loud on their own lol
diff --git a/modular_chomp/code/modules/emotes/definitions/audible_pain.dm b/modular_chomp/code/modules/emotes/definitions/audible_pain.dm
index 2735f2ee08..287f3162f4 100644
--- a/modular_chomp/code/modules/emotes/definitions/audible_pain.dm
+++ b/modular_chomp/code/modules/emotes/definitions/audible_pain.dm
@@ -3,7 +3,7 @@
emote_message_1p = "You yell in pain!"
emote_message_3p = "yells in pain!"
-/datum/decl/emote/audible/pain/get_emote_message_1p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_1p(atom/user, atom/target, extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "You [pick(H.species.pain_verb_1p)] in pain!"
@@ -13,7 +13,7 @@
return "You [pick(M.pain_emote_1p)]!"
. = ..()
-/datum/decl/emote/audible/pain/get_emote_message_3p(var/atom/user, var/atom/target, var/extra_params)
+/datum/decl/emote/audible/pain/get_emote_message_3p(atom/user, atom/target, extra_params)
if(ishuman(user))
var/mob/living/carbon/human/H = user
return "[pick(H.species.pain_verb_3p)] in pain!"
@@ -23,7 +23,7 @@
return "[pick(M.pain_emote_3p)]!"
. = ..()
-/datum/decl/emote/audible/pain/get_emote_sound(var/atom/user)
+/datum/decl/emote/audible/pain/get_emote_sound(atom/user)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user
diff --git a/modular_chomp/code/modules/event/bluespacelocker.dm b/modular_chomp/code/modules/event/bluespacelocker.dm
index c8a2d87087..5fda31847f 100644
--- a/modular_chomp/code/modules/event/bluespacelocker.dm
+++ b/modular_chomp/code/modules/event/bluespacelocker.dm
@@ -31,7 +31,7 @@
kill()
return
-/datum/event/bluespace_locker/proc/pick_locker(var/list/areas, var/crates = FALSE, var/sealed = FALSE)
+/datum/event/bluespace_locker/proc/pick_locker(list/areas, crates = FALSE, sealed = FALSE)
var/area/picked_area = pick(areas)
var/list/obj/structure/closet/valid_lockers = list()
diff --git a/modular_chomp/code/modules/event/event_container_ch.dm b/modular_chomp/code/modules/event/event_container_ch.dm
index 05fd321445..44bfcaa841 100644
--- a/modular_chomp/code/modules/event/event_container_ch.dm
+++ b/modular_chomp/code/modules/event/event_container_ch.dm
@@ -11,7 +11,7 @@
// Adds a list of pre-disabled events to the available events list.
// This keeps them in the rotation, but disabled, so they can be enabled with a click if desired that round.
-/datum/event_container/proc/add_disabled_events(var/list/disabled_events)
+/datum/event_container/proc/add_disabled_events(list/disabled_events)
for(var/datum/event_meta/EM in disabled_events)
EM.enabled = 0
available_events += EM
diff --git a/modular_chomp/code/modules/exploration/bossloots.dm b/modular_chomp/code/modules/exploration/bossloots.dm
index 7cfe1db9bf..57f09a0338 100644
--- a/modular_chomp/code/modules/exploration/bossloots.dm
+++ b/modular_chomp/code/modules/exploration/bossloots.dm
@@ -13,7 +13,7 @@
icon_state = "whip"
item_state = "chain"
-/obj/item/melee/jellyfishwhip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/jellyfishwhip/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(user.a_intent == I_HURT) //Healy mode
. = ..()
target.adjustFireLoss(10)
@@ -58,7 +58,7 @@
slot_r_hand_str = 'modular_chomp/icons/obj/guns/precursor/righthand.dmi',
)
-/obj/item/melee/energy/tyr_sabre/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/energy/tyr_sabre/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(user.a_intent == I_GRAB) //Anti-Heal mode
. = ..()
if(active)
diff --git a/modular_chomp/code/modules/exploration/lootsafe.dm b/modular_chomp/code/modules/exploration/lootsafe.dm
index 5f0d190a8d..f0f5f464e3 100644
--- a/modular_chomp/code/modules/exploration/lootsafe.dm
+++ b/modular_chomp/code/modules/exploration/lootsafe.dm
@@ -9,7 +9,7 @@
locked = 1
var/hackguard = 10
-/obj/structure/closet/crate/secure/lootsafe/emag_act(var/remaining_charges, var/mob/user)
+/obj/structure/closet/crate/secure/lootsafe/emag_act(remaining_charges, mob/user)
if (locked)
if(prob(60 - hackguard))
to_chat(user, span_notice("The safe unlocks!"))
@@ -145,7 +145,7 @@
explosion(T, 0, 0, 1, 2)
qdel(src)
-/obj/structure/closet/crate/secure/lootsafe/numberlock/proc/check_input(var/input)
+/obj/structure/closet/crate/secure/lootsafe/numberlock/proc/check_input(input)
if(length(input) != codelen)
return 0
@@ -247,7 +247,7 @@
explosion(T, 0, 0, 1, 2)
qdel(src)
-/obj/structure/closet/crate/secure/lootsafe/devillock/proc/check_input(var/input)
+/obj/structure/closet/crate/secure/lootsafe/devillock/proc/check_input(input)
if(length(input) != codelen)
return 0
diff --git a/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm b/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm
index 6ea2763883..823786c6ca 100644
--- a/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm
+++ b/modular_chomp/code/modules/exploration/tyr_tribal_gear.dm
@@ -158,7 +158,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS //Head be vunerable but cloak covers the other bits.
var/block_chance = 20
-/obj/item/clothing/suit/armor/tyrtribalcloak/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/clothing/suit/armor/tyrtribalcloak/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(prob(block_chance))
user.visible_message(span_danger("\The [src] completely deflects [attack_text]!"))
return TRUE
@@ -279,7 +279,7 @@
slot_r_hand_str = 'modular_chomp/icons/obj/guns/precursor/righthand.dmi',
)
-/obj/item/melee/energy/tyr_katar/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/energy/tyr_katar/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(active)
. = ..()
switch(user.a_intent)
@@ -328,7 +328,7 @@
slot_r_hand_str = 'modular_chomp/icons/obj/guns/precursor/righthand.dmi',
)
-/obj/item/melee/energy/tyr_hammer/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
+/obj/item/melee/energy/tyr_hammer/apply_hit_effect(mob/living/target, mob/living/user, hit_zone)
if(active)
. = ..()
switch(user.a_intent)
@@ -389,7 +389,7 @@
attack_verb = list("shoved", "bashed")
base_block_chance = 15
-/obj/item/shield/tyr_shield/handle_shield(mob/user, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
+/obj/item/shield/tyr_shield/handle_shield(mob/user, damage, atom/damage_source = null, mob/attacker = null, def_zone = null, attack_text = "the attack")
if(user.incapacitated())
return 0
var/bad_arc = reverse_direction(user.dir) //arc of directions from which we cannot block
diff --git a/modular_chomp/code/modules/lore_codex/codex_tree.dm b/modular_chomp/code/modules/lore_codex/codex_tree.dm
index b067a79b9a..e8a10fcfb8 100644
--- a/modular_chomp/code/modules/lore_codex/codex_tree.dm
+++ b/modular_chomp/code/modules/lore_codex/codex_tree.dm
@@ -8,7 +8,7 @@
var/list/indexed_pages = list() // Assoc list with search terms pointing to a ref of the page. It's created on New().
var/list/history = list() // List of pages we previously visited. // now a 2D list
-/datum/codex_tree/New(var/new_holder, var/new_root_type)
+/datum/codex_tree/New(new_holder, new_root_type)
holder = new_holder
root_type = new_root_type
generate_pages()
@@ -20,13 +20,13 @@
indexed_pages = home.index_page() // changed from current_page to home.
// Changes current_page to its parent, assuming one exists.
-/datum/codex_tree/proc/go_to_parent(var/mob/user)
+/datum/codex_tree/proc/go_to_parent(mob/user)
var/datum/lore/codex/D = current_page["[user]"]
if(istype(D) && D.parent)
current_page["[user]"] = D.parent
// Changes current_page to a specific page or category.
-/datum/codex_tree/proc/go_to_page(var/datum/lore/codex/new_page, var/dont_record_history = FALSE, var/mob/user)
+/datum/codex_tree/proc/go_to_page(datum/lore/codex/new_page, dont_record_history = FALSE, mob/user)
var/datum/lore/codex/D = current_page["[user]"]
if(new_page && istype(D)) // Make sure we're not going to a null page for whatever reason.
current_page["[user]"] = new_page
@@ -37,13 +37,13 @@
H.Add(new_page)
history["[user]"] = H
-/datum/codex_tree/proc/quick_link(var/search_word, var/mob/user)
+/datum/codex_tree/proc/quick_link(search_word, mob/user)
for(var/word in indexed_pages)
if(lowertext(search_word) == lowertext(word)) // Exact matches unfortunately limit our ability to perform SEOs.
go_to_page(indexed_pages[word], FALSE, user)
return
-/datum/codex_tree/proc/get_page_from_type(var/desired_type)
+/datum/codex_tree/proc/get_page_from_type(desired_type)
for(var/word in indexed_pages)
var/datum/lore/codex/C = indexed_pages[word]
if(C.type == desired_type)
@@ -51,7 +51,7 @@
return null
// Returns to the last visited page, based on the history list.
-/datum/codex_tree/proc/go_back(var/mob/user)
+/datum/codex_tree/proc/go_back(mob/user)
var/list/H = history["[user]"]
var/datum/lore/codex/D = current_page["[user]"]
if(!LAZYLEN(H) || !istype(D))
@@ -67,7 +67,7 @@
else
go_to_page(H[H.len], TRUE, user)
-/datum/codex_tree/proc/get_tree_position(var/mob/user)
+/datum/codex_tree/proc/get_tree_position(mob/user)
var/datum/lore/codex/checked = current_page["[user]"]
if(istype(checked))
var/output = ""
diff --git a/modular_chomp/code/modules/mob/language/language.dm b/modular_chomp/code/modules/mob/language/language.dm
index 965baa26c6..bd073730ec 100644
--- a/modular_chomp/code/modules/mob/language/language.dm
+++ b/modular_chomp/code/modules/mob/language/language.dm
@@ -1,7 +1,7 @@
#define SCRAMBLE_CACHE_LEN 40
//basically, how many words can it store that it remembers to use? Upped from 20 to 40, because 20 is very s m a l l
-/datum/language/proc/partial_scramble(var/input, var/capitalize = FALSE)
+/datum/language/proc/partial_scramble(input, capitalize = FALSE)
if(!syllables || !syllables.len)
return capitalize ? capitalize(input) : input
@@ -30,7 +30,7 @@
return input_start + input + input_ending
-/datum/language/proc/scramble(var/input, var/list/known_languages)
+/datum/language/proc/scramble(input, list/known_languages)
var/understand_chance = 0
for(var/datum/language/L in known_languages)
if(partial_understanding && partial_understanding[L.name])
@@ -61,7 +61,7 @@
return scrambled_text
-/datum/language/proc/scramble_word(var/input, var/capitalize = FALSE)
+/datum/language/proc/scramble_word(input, capitalize = FALSE)
if(!syllables || !syllables.len)
return capitalize ? capitalize(stars(input)) : stars(input)
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/species.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/species.dm
index 5103b276eb..597fee5002 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/species.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/species.dm
@@ -1,4 +1,4 @@
-/datum/species/can_shred(var/mob/living/carbon/human/H, var/ignore_intent)
+/datum/species/can_shred(mob/living/carbon/human/H, ignore_intent)
if(!ignore_intent && H.a_intent != I_HURT)
return FALSE
if(H.get_feralness())
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/species_vr.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/species_vr.dm
index b452877e35..7796ede932 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/species_vr.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/species_vr.dm
@@ -1,4 +1,4 @@
-/datum/species/proc/copy_species_sounds(var/datum/species/S, var/species_sounds, var/custom_base)
+/datum/species/proc/copy_species_sounds(datum/species/S, species_sounds, custom_base)
switch(species_sounds)
get_species_sound(species_sounds)
if("Canine")
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm
index 2727289fa8..4a89b89c63 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/species_attack.dm
@@ -1,10 +1,10 @@
/datum/unarmed_attack/punch/chimera //special feral attack that gets stronger as they get angrier. YR3 strain deals slightly more damage, but doesn't cause bleeding
damage = 3
-/datum/unarmed_attack/punch/chimera/get_unarmed_damage(var/mob/living/carbon/human/user)
+/datum/unarmed_attack/punch/chimera/get_unarmed_damage(mob/living/carbon/human/user)
return damage + user.species.unarmed_bonus + min((user.get_feralness() / 5), 40)
-/datum/unarmed_attack/punch/chimera/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armour,var/attack_damage,var/zone)
+/datum/unarmed_attack/punch/chimera/apply_effects(mob/living/carbon/human/user,mob/living/carbon/human/target,armour,attack_damage,zone)
..()
if(user.get_feralness() && !(target == user))
var/selfdamage = (min((user.get_feralness() / 10), 20) - 10)
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm
index d51243d1e9..6be2872964 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_ch.dm
@@ -174,7 +174,7 @@
var/weeds_plasma_rate = 3 // Plasma regen. Much lower than actual xenos. Faster on weeds.
var/weeds_heal_rate = 0.5 // Health regen on weeds. No healing unless resting.
-/datum/species/xenomorph_hybrid/handle_environment_special(var/mob/living/carbon/human/H)
+/datum/species/xenomorph_hybrid/handle_environment_special(mob/living/carbon/human/H)
var/turf/T = H.loc
if(!T) return
@@ -188,7 +188,7 @@
P.stored_plasma = min(max(P.stored_plasma,0),P.max_plasma)
..()
-/datum/species/xenomorph_hybrid/proc/regenerate(var/mob/living/carbon/human/H)
+/datum/species/xenomorph_hybrid/proc/regenerate(mob/living/carbon/human/H)
var/heal_rate = weeds_heal_rate
var/mend_prob = 10 // Much lower than regular xenos. Bumped from 5 to 10 as medical changes allowed all carbons to passively heal damage after a long delay.
if (!H.resting)
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_special_ch.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_special_ch.dm
index 5a9a0e0810..9fd97ac475 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_special_ch.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/station_special_ch.dm
@@ -1,39 +1,39 @@
-/datum/species/xenochimera/get_bodytype(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_bodytype(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_bodytype(H)
-/datum/species/xenochimera/get_icobase(var/mob/living/carbon/human/H, var/get_deform)
+/datum/species/xenochimera/get_icobase(mob/living/carbon/human/H, get_deform)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_icobase(H, get_deform)
-/datum/species/xenochimera/get_tail(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_tail(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_tail(H)
-/datum/species/xenochimera/get_tail_animation(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_tail_animation(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_tail_animation(H)
-/datum/species/xenochimera/get_tail_hair(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_tail_hair(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_tail_hair(H)
-/datum/species/xenochimera/get_blood_mask(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_blood_mask(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_blood_mask(H)
-/datum/species/xenochimera/get_damage_mask(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_damage_mask(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_damage_mask(H)
-/datum/species/xenochimera/get_damage_overlays(var/mob/living/carbon/human/H)
+/datum/species/xenochimera/get_damage_overlays(mob/living/carbon/human/H)
if(!H || base_species == name) return ..()
var/datum/species/S = GLOB.all_species[base_species]
return S.get_damage_overlays(H)
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm
index e72adf68b3..4c46df67a2 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/teshari.dm
@@ -1,5 +1,5 @@
// allow teshari to always be scooped, as long as pref is enabled
-/mob/living/MouseDrop(var/atom/over_object)
+/mob/living/MouseDrop(atom/over_object)
// make sure src (The dragged) is human
if(!istype(src, /mob/living/carbon/human))
return ..()
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm
index d6864d10bc..1169c603a4 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm
@@ -39,7 +39,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/mobegglaying/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/mobegglaying/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H,/mob/living/proc/mobegglaying)
@@ -49,7 +49,7 @@
cost = 0
custom_only = FALSE
-/datum/trait/neutral/succubus_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+/datum/trait/neutral/succubus_bite/apply(datum/species/S,mob/living/carbon/human/H)
..()
add_verb(H,/mob/living/proc/succubus_bite)
diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/xenomorph_hybrid_trait.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/xenomorph_hybrid_trait.dm
index ef1cce59e9..b0a05ddbc2 100644
--- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/xenomorph_hybrid_trait.dm
+++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/xenomorph_hybrid_trait.dm
@@ -41,7 +41,7 @@
var_changes = list("slowdown" = -0.5, "item_slowdown_mod" = 0.5, "total_health" = 125) // Much faster and carry-capable, but slightly less tanky.
has_preferences = list("pass_table" = list(TRAIT_PREF_TYPE_BOOLEAN, "On spawn", TRAIT_NO_VAREDIT_TARGET, TRUE))
-/datum/trait/neutral/xenomorph_hunter/apply(var/datum/species/S,var/mob/living/carbon/human/H, var/list/trait_prefs)
+/datum/trait/neutral/xenomorph_hunter/apply(datum/species/S,mob/living/carbon/human/H, list/trait_prefs)
..()
if (trait_prefs?["pass_table"] || !trait_prefs)
H.pass_flags |= PASSTABLE
diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/robot.dm b/modular_chomp/code/modules/mob/living/silicon/robot/robot.dm
index 6d76ff90db..3889d40474 100644
--- a/modular_chomp/code/modules/mob/living/silicon/robot/robot.dm
+++ b/modular_chomp/code/modules/mob/living/silicon/robot/robot.dm
@@ -19,31 +19,31 @@
else
to_chat(src, span_filter_notice("Insufficient water reserves."))
-/obj/machinery/door/airlock/BorgCtrlShiftClick(var/mob/living/silicon/robot/user)
+/obj/machinery/door/airlock/BorgCtrlShiftClick(mob/living/silicon/robot/user)
if(check_access(user.idcard))
..()
-/obj/machinery/door/airlock/BorgShiftClick(var/mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
+/obj/machinery/door/airlock/BorgShiftClick(mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
if(check_access(user.idcard))
..()
-/obj/machinery/door/airlock/BorgCtrlClick(var/mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
+/obj/machinery/door/airlock/BorgCtrlClick(mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
if(check_access(user.idcard))
..()
-/obj/machinery/power/apc/BorgCtrlClick(var/mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
+/obj/machinery/power/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
if(allowed(user))
..()
-/obj/machinery/turretid/BorgCtrlClick(var/mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
+/obj/machinery/turretid/BorgCtrlClick(mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
if(allowed(user))
..()
-/obj/machinery/door/airlock/BorgAltClick(var/mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
+/obj/machinery/door/airlock/BorgAltClick(mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
if(check_access(user.idcard))
..()
-/obj/machinery/turretid/BorgAltClick(var/mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
+/obj/machinery/turretid/BorgAltClick(mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
if(allowed(user))
..()
@@ -53,25 +53,25 @@
return FALSE
. = ..()
-/obj/machinery/computer/atmoscontrol/attack_robot(var/mob/user)
+/obj/machinery/computer/atmoscontrol/attack_robot(mob/user)
if(allowed(user))
..()
else if(Adjacent(user))
attack_hand(user)
-/obj/machinery/computer/robotics/attack_robot(var/mob/user)
+/obj/machinery/computer/robotics/attack_robot(mob/user)
if(allowed(user))
..()
else if(Adjacent(user))
attack_hand(user)
-/obj/machinery/turretid/attack_robot(var/mob/user)
+/obj/machinery/turretid/attack_robot(mob/user)
if(allowed(user))
..()
else if(Adjacent(user))
attack_hand(user)
-/obj/machinery/door/airlock/attack_robot(var/mob/user)
+/obj/machinery/door/airlock/attack_robot(mob/user)
var/mob/living/silicon/robot/R = user
if(!istype(R))
return //why are you here
@@ -80,7 +80,7 @@
else if(Adjacent(user))
attack_hand(user)
-/obj/machinery/porta_turret/attack_robot(var/mob/user)
+/obj/machinery/porta_turret/attack_robot(mob/user)
if(allowed(user))
..()
else if(Adjacent(user))
diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm
index ac1ba207d6..2e3f3ab741 100644
--- a/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/modular_chomp/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -3,12 +3,12 @@
/mob/living/silicon/robot
var/step_count = 0
-/mob/living/silicon/robot/handle_footstep(var/turf/T)
+/mob/living/silicon/robot/handle_footstep(turf/T)
if(step_count++ % 2)
check_vorefootstep(I_RUN, T) //CHOMPstation edit: sloshing reagent belly walk system
// Handle footstep sounds
-/mob/living/silicon/robot/handle_vorefootstep(var/m_intent, var/turf/T)
+/mob/living/silicon/robot/handle_vorefootstep(m_intent, turf/T)
if(!CONFIG_GET(number/vorefootstep_volume) || !T.vorefootstep_sounds || !T.vorefootstep_sounds.len || !vore_footstep_volume)
return
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm b/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm
index 5b67282ea5..c7f4846ac2 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/butchering.dm
@@ -12,7 +12,7 @@
meat_amount = 6
meat_type = /obj/item/reagent_containers/food/snacks/metroidmeat
-/mob/living/simple_mob/metroid/can_butcher(var/mob/user, var/obj/item/I) // Override for special butchering checks.
+/mob/living/simple_mob/metroid/can_butcher(mob/user, obj/item/I) // Override for special butchering checks.
. = ..()
if(. && (!is_sharp(I) || !has_edge(I)))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm
index 323e7d4b6d..6b60944868 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -11,7 +11,7 @@
//no stripping of simplemobs
strip_pref = FALSE
-/mob/living/simple_mob/RangedAttack(var/atom/A)
+/mob/living/simple_mob/RangedAttack(atom/A)
if(!isnull(spit_projectile) && spitting)
Spit(A)
. = ..()
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm
index 12f7c60325..bd52100cd1 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob_abilities.dm
@@ -176,7 +176,7 @@
. = ..()
// callback to terminate leap mode. Reset passflag if passflag = 0 (Mob doesn't already have it)
-/mob/living/simple_mob/proc/pouncefinish(var/pt, var/pm, var/atom/T)
+/mob/living/simple_mob/proc/pouncefinish(pt, pm, atom/T)
if(status_flags & LEAPING)
status_flags &= ~LEAPING
flying = 0
@@ -222,7 +222,7 @@
// ported from mob/living/carbon/human/species/xenomorph/alien_powers
-/mob/living/simple_mob/proc/Spit(var/atom/A)
+/mob/living/simple_mob/proc/Spit(atom/A)
if(isnull(spit_projectile))
return
@@ -310,7 +310,7 @@
return
// spin blatantly stolen from BlackMajor's bigdragon
-/mob/living/simple_mob/proc/speen(var/range = 2)
+/mob/living/simple_mob/proc/speen(range = 2)
set name = "Spin Attack"
set desc = "Spins to strike enemies away from you."
set category = "Abilities.Mob"
@@ -331,7 +331,7 @@
addtimer(CALLBACK(src, PROC_REF(speen_throw), am), 1)
playsound(src, "sound/weapons/punchmiss.ogg", 50, 1)
-/mob/living/simple_mob/proc/speen_throw(var/atom/movable/AM, var/gentle = 0, var/damage = 10)
+/mob/living/simple_mob/proc/speen_throw(atom/movable/AM, gentle = 0, damage = 10)
var/maxthrow = 7
var/atom/throwtarget
throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(AM, src)))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
index f2bfb6e37b..a76aebe438 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm
@@ -466,7 +466,7 @@ ANT STRUCTURES
density = FALSE
var/health = 15 //1 thwack with sword, 2 with spear
-/obj/effect/ant_structure/attackby(var/obj/item/W, var/mob/user)
+/obj/effect/ant_structure/attackby(obj/item/W, mob/user)
user.setClickCooldown(user.get_attack_speed(W))
if(LAZYLEN(W.attack_verb))
@@ -487,7 +487,7 @@ ANT STRUCTURES
healthcheck()
-/obj/effect/ant_structure/bullet_act(var/obj/item/projectile/Proj)
+/obj/effect/ant_structure/bullet_act(obj/item/projectile/Proj)
..()
health -= Proj.get_structure_damage()
healthcheck()
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/bullet_patterns.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/bullet_patterns.dm
index 494a637151..e9a8b2f040 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/bullet_patterns.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/bullet_patterns.dm
@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/singleproj/(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/singleproj/(atom/target, next_cycle)
if(!target)
return
var/obj/item/projectile/P = new specialattackprojectile(get_turf(src))
@@ -6,112 +6,112 @@
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_heck(atom/target, var/horix, var/vertiy) //horix is the X vaule, vertix is the Y vaule
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_heck(atom/target, horix, vertiy) //horix is the X vaule, vertix is the Y vaule
var/obj/item/projectile/P = new specialattackprojectile(get_turf(src))
var/turf = locate(src.x+horix, src.y+vertiy, src.z)
target = turf
P.launch_projectile(target, BP_TORSO, src)
//spinny dual blades
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spin(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spin(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, -7)
bullet_heck(target, 0, 7)
bullet_heck(target, -7, 0)
bullet_heck(target, 7, 0)
addtimer(CALLBACK(src, PROC_REF(dual_spinA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, -7)
bullet_heck(target, 1, 7)
bullet_heck(target, -7, 1)
bullet_heck(target, 7, -1)
addtimer(CALLBACK(src, PROC_REF(dual_spinB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, -7)
bullet_heck(target, 2, 7)
bullet_heck(target, -7, 2)
bullet_heck(target, 7, -2)
addtimer(CALLBACK(src, PROC_REF(dual_spinC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, -7)
bullet_heck(target, 3, 7)
bullet_heck(target, -7, 3)
bullet_heck(target, 7, -3)
addtimer(CALLBACK(src, PROC_REF(dual_spinD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, -7)
bullet_heck(target, 4, 7)
bullet_heck(target, -7, 4)
bullet_heck(target, 7, -4)
addtimer(CALLBACK(src, PROC_REF(dual_spinE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, -7)
bullet_heck(target, 5, 7)
bullet_heck(target, -7, 5)
bullet_heck(target, 7, -5)
addtimer(CALLBACK(src, PROC_REF(dual_spinF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, -7)
bullet_heck(target, 6, 7)
bullet_heck(target, -7, 6)
bullet_heck(target, 7, -6)
addtimer(CALLBACK(src, PROC_REF(dual_spinG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -7)
bullet_heck(target, 7, 7)
bullet_heck(target, -7, 7)
bullet_heck(target, 7, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinH(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -6)
bullet_heck(target, 7, 6)
bullet_heck(target, -6, 7)
bullet_heck(target, 6, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinI(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -5)
bullet_heck(target, 7, 5)
bullet_heck(target, -5, 7)
bullet_heck(target, 5, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -4)
bullet_heck(target, 7, 4)
bullet_heck(target, -4, 7)
bullet_heck(target, 4, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinK(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -3)
bullet_heck(target, 7, 3)
bullet_heck(target, -3, 7)
bullet_heck(target, 3, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinL(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -2)
bullet_heck(target, 7, 2)
bullet_heck(target, -2, 7)
bullet_heck(target, 2, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinM(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -1)
bullet_heck(target, 7, 1)
bullet_heck(target, -1, 7)
bullet_heck(target, 1, -7)
addtimer(CALLBACK(src, PROC_REF(dual_spinN), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinN(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_spinN(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 0)
bullet_heck(target, 7, 0)
bullet_heck(target, 0, 7)
@@ -122,98 +122,98 @@
addtimer(CALLBACK(src, PROC_REF(rdual_spin), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
//the four spin finish
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spin(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spin(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 1)
bullet_heck(target, 7, -1)
bullet_heck(target, 1, 7)
bullet_heck(target, -1, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 2)
bullet_heck(target, 7, -2)
bullet_heck(target, 2, 7)
bullet_heck(target, -2, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 3)
bullet_heck(target, 7, -3)
bullet_heck(target, 3, 7)
bullet_heck(target, -3, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 4)
bullet_heck(target, 7, -4)
bullet_heck(target, 4, 7)
bullet_heck(target, -4, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 5)
bullet_heck(target, 7, -5)
bullet_heck(target, 5, 7)
bullet_heck(target, -5, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 6)
bullet_heck(target, 7, -6)
bullet_heck(target, 6, 7)
bullet_heck(target, -6, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 7)
bullet_heck(target, 7, -7)
bullet_heck(target, 7, 7)
bullet_heck(target, -7, -7)
addtimer(CALLBACK(src, PROC_REF(fdual_spinG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, 7)
bullet_heck(target, 6, -7)
bullet_heck(target, 7, 6)
bullet_heck(target, -7, -6)
addtimer(CALLBACK(src, PROC_REF(fdual_spinH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinH(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, 7)
bullet_heck(target, 5, -7)
bullet_heck(target, 7, 5)
bullet_heck(target, -7, -5)
addtimer(CALLBACK(src, PROC_REF(fdual_spinI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinI(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, 7)
bullet_heck(target, 4, -7)
bullet_heck(target, 7, 4)
bullet_heck(target, -7, -4)
addtimer(CALLBACK(src, PROC_REF(fdual_spinJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, 7)
bullet_heck(target, 3, -7)
bullet_heck(target, 7, 3)
bullet_heck(target, -7, -3)
addtimer(CALLBACK(src, PROC_REF(fdual_spinK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinK(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, 7)
bullet_heck(target, 2, -7)
bullet_heck(target, 7, 2)
bullet_heck(target, -7, -2)
addtimer(CALLBACK(src, PROC_REF(fdual_spinL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinL(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, 7)
bullet_heck(target, 1, -7)
bullet_heck(target, 7, 1)
bullet_heck(target, -7, -1)
addtimer(CALLBACK(src, PROC_REF(fdual_spinM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fdual_spinM(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, 7)
bullet_heck(target, 0, -7)
bullet_heck(target, 7, 0)
@@ -221,98 +221,98 @@
attackcycle = next_cycle
//the reverse
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinM(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, -7)
bullet_heck(target, 0, 7)
bullet_heck(target, 7, 0)
bullet_heck(target, -7, 0)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinL(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, -7)
bullet_heck(target, 1, 7)
bullet_heck(target, 7, -1)
bullet_heck(target, -7, 1)
addtimer(CALLBACK(src, PROC_REF(rdual_spinM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinK(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, -7)
bullet_heck(target, 2, 7)
bullet_heck(target, 7, -2)
bullet_heck(target, -7, 2)
addtimer(CALLBACK(src, PROC_REF(rdual_spinL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, -7)
bullet_heck(target, 3, 7)
bullet_heck(target, 7, -3)
bullet_heck(target, -7, 3)
addtimer(CALLBACK(src, PROC_REF(rdual_spinK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinI(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, -7)
bullet_heck(target, 4, 7)
bullet_heck(target, 7, -4)
bullet_heck(target, -7, 4)
addtimer(CALLBACK(src, PROC_REF(rdual_spinJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinH(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, -7)
bullet_heck(target, 5, 7)
bullet_heck(target, 7, -5)
bullet_heck(target, -7, 5)
addtimer(CALLBACK(src, PROC_REF(rdual_spinI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, -7)
bullet_heck(target, 6, 7)
bullet_heck(target, 7, -6)
bullet_heck(target, -7, 6)
addtimer(CALLBACK(src, PROC_REF(rdual_spinH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -7)
bullet_heck(target, 7, 7)
bullet_heck(target, 7, -7)
bullet_heck(target, -7, 7)
addtimer(CALLBACK(src, PROC_REF(rdual_spinG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -6)
bullet_heck(target, 7, 6)
bullet_heck(target, 6, -7)
bullet_heck(target, -6, 7)
addtimer(CALLBACK(src, PROC_REF(rdual_spinF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -5)
bullet_heck(target, 7, 5)
bullet_heck(target, 5, -7)
bullet_heck(target, -5, 7)
addtimer(CALLBACK(src, PROC_REF(rdual_spinE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -4)
bullet_heck(target, 7, 4)
bullet_heck(target, 4, -7)
bullet_heck(target, -4, 7)
addtimer(CALLBACK(src, PROC_REF(rdual_spinD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -3)
bullet_heck(target, 7, 3)
bullet_heck(target, 3, -7)
bullet_heck(target, -3, 7)
addtimer(CALLBACK(src, PROC_REF(rdual_spinC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spinA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -2)
bullet_heck(target, 7, 2)
bullet_heck(target, 2, -7)
bullet_heck(target, -2, 7)
addtimer(CALLBACK(src, PROC_REF(rdual_spinB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spin(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rdual_spin(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -1)
bullet_heck(target, 7, 1)
bullet_heck(target, 1, -7)
@@ -320,77 +320,77 @@
addtimer(CALLBACK(src, PROC_REF(rdual_spinA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
//two spinning blade
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spin(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spin(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, -7)
bullet_heck(target, 0, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, -7)
bullet_heck(target, 1, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, -7)
bullet_heck(target, 2, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, -7)
bullet_heck(target, 3, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, -7)
bullet_heck(target, 4, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, -7)
bullet_heck(target, 5, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, -7)
bullet_heck(target, 6, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -7)
bullet_heck(target, 7, 7)
addtimer(CALLBACK(src, PROC_REF(cross_spinH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinH(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -6)
bullet_heck(target, 7, 6)
addtimer(CALLBACK(src, PROC_REF(cross_spinI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinI(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -5)
bullet_heck(target, 7, 5)
addtimer(CALLBACK(src, PROC_REF(cross_spinJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -4)
bullet_heck(target, 7, 4)
addtimer(CALLBACK(src, PROC_REF(cross_spinK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinK(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -3)
bullet_heck(target, 7, 3)
addtimer(CALLBACK(src, PROC_REF(cross_spinL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinL(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -2)
bullet_heck(target, 7, 2)
addtimer(CALLBACK(src, PROC_REF(cross_spinM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinM(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -1)
bullet_heck(target, 7, 1)
addtimer(CALLBACK(src, PROC_REF(cross_spinN), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinN(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cross_spinN(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 0)
bullet_heck(target, 7, 0)
if(prob(50)) //coin flip to reverse
@@ -399,143 +399,143 @@
addtimer(CALLBACK(src, PROC_REF(rcross_spin), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
//the dual spin finish
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spin(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spin(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 1)
bullet_heck(target, 7, -1)
addtimer(CALLBACK(src, PROC_REF(fcross_spinA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 2)
bullet_heck(target, 7, -2)
addtimer(CALLBACK(src, PROC_REF(fcross_spinB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 3)
bullet_heck(target, 7, -3)
addtimer(CALLBACK(src, PROC_REF(fcross_spinC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 4)
bullet_heck(target, 7, -4)
addtimer(CALLBACK(src, PROC_REF(fcross_spinD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 5)
bullet_heck(target, 7, -5)
addtimer(CALLBACK(src, PROC_REF(fcross_spinE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 6)
bullet_heck(target, 7, -6)
addtimer(CALLBACK(src, PROC_REF(fcross_spinF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 7)
bullet_heck(target, 7, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, 7)
bullet_heck(target, 6, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinH(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, 7)
bullet_heck(target, 5, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinI(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, 7)
bullet_heck(target, 4, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, 7)
bullet_heck(target, 3, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinK(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, 7)
bullet_heck(target, 2, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinL(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, 7)
bullet_heck(target, 1, -7)
addtimer(CALLBACK(src, PROC_REF(fcross_spinM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/fcross_spinM(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, 7)
bullet_heck(target, 0, -7)
attackcycle = next_cycle
//the dual spin reverse
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinM(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, -7)
bullet_heck(target, 0, 7)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinL(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, -7)
bullet_heck(target, 1, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinK(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, -7)
bullet_heck(target, 2, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, -7)
bullet_heck(target, 3, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinI(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, -7)
bullet_heck(target, 4, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinH(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, -7)
bullet_heck(target, 5, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, -7)
bullet_heck(target, 6, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -7)
bullet_heck(target, 7, 7)
addtimer(CALLBACK(src, PROC_REF(rcross_spinG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -6)
bullet_heck(target, 7, 6)
addtimer(CALLBACK(src, PROC_REF(rcross_spinF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -5)
bullet_heck(target, 7, 5)
addtimer(CALLBACK(src, PROC_REF(rcross_spinE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -4)
bullet_heck(target, 7, 4)
addtimer(CALLBACK(src, PROC_REF(rcross_spinD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -3)
bullet_heck(target, 7, 3)
addtimer(CALLBACK(src, PROC_REF(rcross_spinC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spinA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -2)
bullet_heck(target, 7, 2)
addtimer(CALLBACK(src, PROC_REF(rcross_spinB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spin(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rcross_spin(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -1)
bullet_heck(target, 7, 1)
addtimer(CALLBACK(src, PROC_REF(rcross_spinA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
@@ -610,7 +610,7 @@
bullet_heck(target, -4, -3)
bullet_heck(target, -4, -4)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/checker_board(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/checker_board(atom/target, next_cycle)
bullet_heck(target, -1, 1)
bullet_heck(target, 1, 1)
bullet_heck(target, 1, -1)
@@ -638,32 +638,32 @@
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burst(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burst(atom/target, next_cycle, fire_delay)
burst_one(target)
addtimer(CALLBACK(src, PROC_REF(chain_burstA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burstA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burstA(atom/target, next_cycle, fire_delay)
burst_two(target)
addtimer(CALLBACK(src, PROC_REF(chain_burstB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burstB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burstB(atom/target, next_cycle, fire_delay)
burst_three(target)
addtimer(CALLBACK(src, PROC_REF(chain_burstC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burstC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chain_burstC(atom/target, next_cycle, fire_delay)
burst_four(target)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_burst(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/dual_burst(atom/target, next_cycle)
burst_two(target)
burst_four(target)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/giant_burst(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/giant_burst(atom/target, next_cycle)
burst_four(target)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/star_burst(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/star_burst(atom/target, next_cycle)
bullet_heck(target, 0, 7)
bullet_heck(target, 0, -7)
bullet_heck(target, 7, 7)
@@ -675,7 +675,7 @@
attackcycle = next_cycle
//random
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/random_firing(atom/target, var/amount, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/random_firing(atom/target, amount, next_cycle, fire_delay)
var/rngx = rand(-7,7)
var/rngy = rand(-7,7)
if(!target)
@@ -688,7 +688,7 @@
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/quad_random_firing(atom/target, var/amount, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/quad_random_firing(atom/target, amount, next_cycle, fire_delay)
var/rngx = rand(-7,7)
var/rngy = rand(-7,7)
var/rngxx = rand(-7,7)
@@ -706,7 +706,7 @@
attackcycle = next_cycle
//perscion
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/hole_in_wall(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/hole_in_wall(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -7)
bullet_heck(target, -7, -6)
bullet_heck(target, -7, -5)
@@ -737,7 +737,7 @@
bullet_heck(target, -4, 7)
addtimer(CALLBACK(src, PROC_REF(hole_in_wallA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/hole_in_wallA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/hole_in_wallA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -4)
bullet_heck(target, -7, -3)
bullet_heck(target, -7, -2)
@@ -776,7 +776,7 @@
bullet_heck(target, 7, 4)
addtimer(CALLBACK(src, PROC_REF(hole_in_wallB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/hole_in_wallB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/hole_in_wallB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, -7)
bullet_heck(target, -7, -6)
bullet_heck(target, -7, -5)
@@ -807,7 +807,7 @@
bullet_heck(target, -4, 7)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bomb_lines(atom/A, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bomb_lines(atom/A, next_cycle)
if(!A)
return
var/list/potential_targets = ai_holder.list_targets()
@@ -824,7 +824,7 @@
spawn_lines(target, next_cycle)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/spawn_lines(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/spawn_lines(atom/target, next_cycle)
var/alignment = rand(1,2) // 1 for vertical, 2 for horizontal
var/list/line_range = list()
var/turf/T = get_turf(target)
@@ -855,7 +855,7 @@
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bomb_chaos(atom/A, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bomb_chaos(atom/A, next_cycle)
if(!A)
return
var/list/potential_targets = ai_holder.list_targets()
@@ -872,7 +872,7 @@
chaos_lines(target, next_cycle)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chaos_lines(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/chaos_lines(atom/target, next_cycle)
var/alignment = rand(1,2)
var/list/line_range = list()
var/turf/T = get_turf(target)
@@ -909,7 +909,7 @@
new artidrop(dropspot)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rising_star(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rising_star(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 0)
bullet_heck(target, -7, 0)
bullet_heck(target, 0, 7)
@@ -920,7 +920,7 @@
bullet_heck(target, -7, -7)
addtimer(CALLBACK(src, PROC_REF(rising_starA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rising_starA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rising_starA(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -4)
bullet_heck(target, -7, 4)
bullet_heck(target, 4, 7)
@@ -931,7 +931,7 @@
bullet_heck(target, -4, -7)
addtimer(CALLBACK(src, PROC_REF(rising_starB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rising_starB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/rising_starB(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -1)
bullet_heck(target, -7, 1)
bullet_heck(target, 1, 7)
@@ -942,7 +942,7 @@
bullet_heck(target, -7, -5)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/gattlingfire(atom/target, var/next_cycle, var/amount, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/gattlingfire(atom/target, next_cycle, amount, fire_delay)
if(!target)
return
var/obj/item/projectile/P = new specialattackprojectile(get_turf(src))
@@ -953,7 +953,7 @@
else
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wall(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wall(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 0)
bullet_heck(target, 7, 1)
bullet_heck(target, 7, 2)
@@ -971,7 +971,7 @@
bullet_heck(target, 7, -7)
addtimer(CALLBACK(src, PROC_REF(death_wallA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wallA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wallA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 0)
bullet_heck(target, -7, 1)
bullet_heck(target, -7, 2)
@@ -989,7 +989,7 @@
bullet_heck(target, -7, -7)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wallR(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wallR(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 0)
bullet_heck(target, -7, 1)
bullet_heck(target, -7, 2)
@@ -1007,7 +1007,7 @@
bullet_heck(target, -7, -7)
addtimer(CALLBACK(src, PROC_REF(death_wallRA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wallRA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/death_wallRA(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 0)
bullet_heck(target, 7, 1)
bullet_heck(target, 7, 2)
@@ -1025,7 +1025,7 @@
bullet_heck(target, 7, -7)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cutoff(atom/target, var/next_cycle, var/fire_delay, var/amount)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cutoff(atom/target, next_cycle, fire_delay, amount)
if(!target)
return
bullet_heck(target, 7, 0)
@@ -1038,7 +1038,7 @@
else
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cutoff_ulti(atom/target, var/next_cycle, var/fire_delay, var/amount)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/cutoff_ulti(atom/target, next_cycle, fire_delay, amount)
if(!target)
return
bullet_heck(target, 7, 0)
@@ -1055,14 +1055,14 @@
else
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossom(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossom(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 7)
bullet_heck(target, -7, -7)
bullet_heck(target, -7, 7)
bullet_heck(target, 7, -7)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomA(atom/target, next_cycle, fire_delay)
bullet_heck(target, 6, 7)
bullet_heck(target, 7, 6)
bullet_heck(target, -6, -7)
@@ -1073,7 +1073,7 @@
bullet_heck(target, 7, -6)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomB(atom/target, next_cycle, fire_delay)
bullet_heck(target, 5, 7)
bullet_heck(target, 7, 5)
bullet_heck(target, -5, -7)
@@ -1084,7 +1084,7 @@
bullet_heck(target, 7, -5)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomC(atom/target, next_cycle, fire_delay)
bullet_heck(target, 4, 7)
bullet_heck(target, 7, 4)
bullet_heck(target, -4, -7)
@@ -1095,7 +1095,7 @@
bullet_heck(target, 7, -4)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomD(atom/target, next_cycle, fire_delay)
bullet_heck(target, 3, 7)
bullet_heck(target, 7, 3)
bullet_heck(target, -3, -7)
@@ -1106,7 +1106,7 @@
bullet_heck(target, 7, -3)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomE(atom/target, next_cycle, fire_delay)
bullet_heck(target, 2, 7)
bullet_heck(target, 7, 2)
bullet_heck(target, -2, -7)
@@ -1117,7 +1117,7 @@
bullet_heck(target, 7, -2)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomF(atom/target, next_cycle, fire_delay)
bullet_heck(target, 1, 7)
bullet_heck(target, 7, 1)
bullet_heck(target, -1, -7)
@@ -1128,7 +1128,7 @@
bullet_heck(target, 7, -1)
addtimer(CALLBACK(src, PROC_REF(bullet_blossomG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/bullet_blossomG(atom/target, next_cycle, fire_delay)
bullet_heck(target, 0, 7)
bullet_heck(target, -7, 0)
bullet_heck(target, 0, -7)
@@ -1136,7 +1136,7 @@
attackcycle = next_cycle
//Three spinning lines with occassional projectiles thrown in the middle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_lines(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_lines(atom/target, next_cycle, fire_delay)
bullet_heck(target, -7, 7)
bullet_heck(target, 7, 7)
bullet_heck(target, 0, -7)
@@ -1145,13 +1145,13 @@
bullet_heck(target, 0, 7)
addtimer(CALLBACK(src, PROC_REF(triple_linesA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesA(atom/target, next_cycle, fire_delay)
bullet_heck(target, -6, 7)
bullet_heck(target, 7, 6)
bullet_heck(target, -1, -7)
addtimer(CALLBACK(src, PROC_REF(triple_linesB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesB(atom/target, next_cycle, fire_delay)
bullet_heck(target, -5, 7)
bullet_heck(target, 7, 5)
bullet_heck(target, -2, -7)
@@ -1160,13 +1160,13 @@
bullet_heck(target, 2, 7)
addtimer(CALLBACK(src, PROC_REF(triple_linesC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesC(atom/target, next_cycle, fire_delay)
bullet_heck(target, -4, 7)
bullet_heck(target, 7, 4)
bullet_heck(target, -3, -7)
addtimer(CALLBACK(src, PROC_REF(triple_linesD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesD(atom/target, next_cycle, fire_delay)
bullet_heck(target, -3, 7)
bullet_heck(target, 7, 3)
bullet_heck(target, -4, -7)
@@ -1175,13 +1175,13 @@
bullet_heck(target, 4, 7)
addtimer(CALLBACK(src, PROC_REF(triple_linesE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesE(atom/target, next_cycle, fire_delay)
bullet_heck(target, -2, 7)
bullet_heck(target, 7, 2)
bullet_heck(target, -5, -7)
addtimer(CALLBACK(src, PROC_REF(triple_linesF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesF(atom/target, next_cycle, fire_delay)
bullet_heck(target, -1, 7)
bullet_heck(target, 7, 1)
bullet_heck(target, -6, -7)
@@ -1190,13 +1190,13 @@
bullet_heck(target, 6, 7)
addtimer(CALLBACK(src, PROC_REF(triple_linesG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/triple_linesG(atom/target, next_cycle, fire_delay)
bullet_heck(target, -0, 7)
bullet_heck(target, 7, 0)
bullet_heck(target, -7, -7)
attackcycle = next_cycle
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laser(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laser(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 7)
bullet_heck(target, 6, 7)
bullet_heck(target, 5, 7)
@@ -1215,7 +1215,7 @@
bullet_heck(target, 0, -7)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserA), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserA(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserA(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 6)
bullet_heck(target, 6, 6)
bullet_heck(target, 5, 6)
@@ -1234,7 +1234,7 @@
bullet_heck(target, 0, -6)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserB), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserB(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserB(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 5)
bullet_heck(target, 6, 5)
bullet_heck(target, 5, 5)
@@ -1253,7 +1253,7 @@
bullet_heck(target, 0, -5)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserC), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserC(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserC(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 4)
bullet_heck(target, 6, 4)
bullet_heck(target, 5, 4)
@@ -1272,7 +1272,7 @@
bullet_heck(target, 0, -4)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserD), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserD(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserD(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 3)
bullet_heck(target, 6, 3)
bullet_heck(target, 5, 3)
@@ -1291,7 +1291,7 @@
bullet_heck(target, 0, -3)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserE), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserE(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserE(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 2)
bullet_heck(target, 6, 2)
bullet_heck(target, 5, 2)
@@ -1310,7 +1310,7 @@
bullet_heck(target, 0, -2)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserF), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserF(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserF(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 1)
bullet_heck(target, 6, 1)
bullet_heck(target, 5, 1)
@@ -1329,7 +1329,7 @@
bullet_heck(target, 0, -1)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserG), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserG(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserG(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, 0)
bullet_heck(target, 6, 0)
bullet_heck(target, 5, 0)
@@ -1346,7 +1346,7 @@
bullet_heck(target, -1, 0)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserH), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserH(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserH(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -1)
bullet_heck(target, 6, -1)
bullet_heck(target, 5, -1)
@@ -1365,7 +1365,7 @@
bullet_heck(target, 0, 1)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserI), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserI(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserI(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -2)
bullet_heck(target, 6, -2)
bullet_heck(target, 5, -2)
@@ -1384,7 +1384,7 @@
bullet_heck(target, 0, 2)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserJ), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserJ(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserJ(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -3)
bullet_heck(target, 6, -3)
bullet_heck(target, 5, -3)
@@ -1403,7 +1403,7 @@
bullet_heck(target, 0, 3)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserK), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserK(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserK(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -4)
bullet_heck(target, 6, -4)
bullet_heck(target, 5, -4)
@@ -1422,7 +1422,7 @@
bullet_heck(target, 0, 4)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserL), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserL(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserL(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -5)
bullet_heck(target, 6, -5)
bullet_heck(target, 5, -5)
@@ -1441,7 +1441,7 @@
bullet_heck(target, 0, 5)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserM), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserM(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserM(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -6)
bullet_heck(target, 6, -6)
bullet_heck(target, 5, -6)
@@ -1460,7 +1460,7 @@
bullet_heck(target, 0, 6)
addtimer(CALLBACK(src, PROC_REF(vertical_double_laserN), target, next_cycle, fire_delay), fire_delay, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserN(atom/target, var/next_cycle, var/fire_delay)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/vertical_double_laserN(atom/target, next_cycle, fire_delay)
bullet_heck(target, 7, -7)
bullet_heck(target, 6, -7)
bullet_heck(target, 5, -7)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/other_attacks.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/other_attacks.dm
index 2faa5381a2..6eca7affcc 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/other_attacks.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/other_attacks.dm
@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/teleport_attack(atom/target, var/next_cycle, var/tele_miss)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/teleport_attack(atom/target, next_cycle, tele_miss)
// Teleport attack.
if(!target)
to_chat(src, span_warning("There's nothing to teleport to."))
@@ -77,7 +77,7 @@
.=..()
icon_state = "arti"
-/obj/effect/callstrike/end_fall(var/crushing = FALSE)
+/obj/effect/callstrike/end_fall(crushing = FALSE)
for(var/mob/living/L in loc)
var/target_zone = ran_zone()
var/blocked = L.run_armor_check(target_zone, "laser")
@@ -87,7 +87,7 @@
playsound(src, 'sound/effects/clang2.ogg', 50, 1)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), 0.25 SECONDS, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/gravity_surge(atom/target, var/next_cycle, var/pull_radius, var/pull_strength)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/gravity_surge(atom/target, next_cycle, pull_radius, pull_strength)
if(!target)
return
for(target in range(pull_radius, src))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/puddle_mechanic.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/puddle_mechanic.dm
index f1947130e5..4ed3c8a46d 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/puddle_mechanic.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/puddle_mechanic.dm
@@ -1,4 +1,4 @@
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/summon_puddles(atom/A, var/next_cycle, var/puddle_item)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/summon_puddles(atom/A, next_cycle, puddle_item)
for(var/mob/living/L in orange(src, 14))
if(L.stat != DEAD && !IIsAlly(L))
L.add_modifier(puddle_item, 3, src)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm
index 067f611bd6..1d7dbad101 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm
@@ -228,7 +228,7 @@
new /obj/effect/spider/spiderling/antling/created(src.loc)
..()
-/mob/living/simple_mob/mechanical/mecha/eclipse/tyrbosses/expirments/slime/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/mechanical/mecha/eclipse/tyrbosses/expirments/slime/attackby(obj/item/O as obj, mob/user as mob)
for(var/i =1 to 4)
new /obj/effect/spider/spiderling/antling/created(src.loc)
..()
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/fleshtaker.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/fleshtaker.dm
index 51e7d7de6d..b3ef129814 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/fleshtaker.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/fleshtaker.dm
@@ -36,7 +36,7 @@ Only physical attributes are copied.
//copy stats from our engulfed target
-/mob/living/simple_mob/fleshtaker/proc/flesh_mimic(var/mob/living/simple_mob/target)
+/mob/living/simple_mob/fleshtaker/proc/flesh_mimic(mob/living/simple_mob/target)
flesh_mimic = TRUE
name = target.name
desc = target.desc
@@ -73,7 +73,7 @@ Only physical attributes are copied.
armor = base_values["armor"]
update_icon()
-/mob/living/simple_mob/fleshtaker/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/fleshtaker/apply_melee_effects(atom/A)
if(istype(A,/mob/living/simple_mob) && !flesh_mimic)
var/mob/living/simple_mob/M = A
if(!M.mind)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm
index e60b40e8bc..d58d364724 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/alchemistbee.dm
@@ -242,7 +242,7 @@
create_reagents(splatter_volume)
ready_chemicals()
-/obj/item/projectile/arc/vial/on_impact(var/atom/A)
+/obj/item/projectile/arc/vial/on_impact(atom/A)
if(splatter)
var/turf/location = get_turf(src)
var/datum/effect/effect/system/smoke_spread/chem/blob/S = new /datum/effect/effect/system/smoke_spread/chem/blob
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm
index 81b122f93b..33f18fffc1 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm
@@ -556,7 +556,7 @@
explosion(target, 0, 0, 2, 4)//No need to have a question.
return 1
-/obj/item/projectile/energy/homing_bolt/missile/throw_impact(atom/target, var/speed)
+/obj/item/projectile/energy/homing_bolt/missile/throw_impact(atom/target, speed)
explosion(target, 0, 0, 2, 4)//No need to have a question.
qdel(src)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm
index 37e9dca8b5..f1bf55c5b3 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm
@@ -17,7 +17,7 @@
wreckage = null
pilot_type = /mob/living/simple_mob/mechanical/mecha/vistor/vistorblue
-/mob/living/simple_mob/mechanical/mecha/vistor/vistorblue/shielded/bullet_act(var/obj/item/projectile/P)
+/mob/living/simple_mob/mechanical/mecha/vistor/vistorblue/shielded/bullet_act(obj/item/projectile/P)
var/reflectchance = 100
if(prob(reflectchance))
var/damage_mod = rand(2,4)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm
index c6c3d7c779..41562239c4 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm
@@ -85,7 +85,7 @@
melee_damage_lower = 8
melee_damage_upper = 8
-/mob/living/simple_mob/vr/glitch/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vr/glitch/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
L.add_modifier(/datum/modifier/digitizing, 60 SECONDS)
@@ -104,7 +104,7 @@
melee_damage_lower = 30
melee_damage_upper = 30
-/mob/living/simple_mob/vr/doomknight/apply_melee_effects(var/atom/A) //If you get hit by this slow thing, you have 5 minuites to live.
+/mob/living/simple_mob/vr/doomknight/apply_melee_effects(atom/A) //If you get hit by this slow thing, you have 5 minuites to live.
if(isliving(A))
var/mob/living/L = A
L.add_modifier(/datum/modifier/doomed, 300 SECONDS)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm
index df6dda8052..797bb2f1f6 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm
@@ -39,7 +39,7 @@
/obj/item/capture_crystal/wendigo = 25
)
-/mob/living/simple_mob/humanoid/cultist/magus/rift/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/humanoid/cultist/magus/rift/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
var/leech = rand(1,100)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm
index 16a47e6cbe..c064602830 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm
@@ -322,7 +322,7 @@
special_attack_cooldown = 6 SECONDS
ranged_cooldown = 30
-/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat/bullet_act(obj/item/projectile/Proj)
if(!Proj)
return
if(prob(60))
@@ -401,12 +401,12 @@
icon_state = "blade_tosser"
icon_living = "blade_tosser"
-/mob/living/simple_mob/humanoid/astral_collective/body/dagger/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/humanoid/astral_collective/body/dagger/attackby(obj/item/O as obj, mob/user as mob)
if(prob(50))
teleport_attack(src)
..()
-/mob/living/simple_mob/humanoid/astral_collective/body/dagger/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/astral_collective/body/dagger/bullet_act(obj/item/projectile/Proj)
if(prob(50))
teleport_attack(src)
..()
@@ -442,7 +442,7 @@
special_attack_cooldown = 10 SECONDS
//Gravity shield. Hit it with melee, and a sudden gravity surge may tear your weapon to the ground
-/mob/living/simple_mob/humanoid/astral_collective/mind/gravity/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/humanoid/astral_collective/mind/gravity/attackby(obj/item/O as obj, mob/user as mob)
if(O.force)
if(prob(30))
visible_message(span_boldwarning(span_orange("[O] is pulled to the ground!.")))
@@ -495,7 +495,7 @@
barrier_health ++
icon_state = "clock_cat_shield"
-/mob/living/simple_mob/humanoid/astral_collective/soul/spear_bearer/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/humanoid/astral_collective/soul/spear_bearer/bullet_act(obj/item/projectile/Proj)
if(!Proj)
return
if(barrier_health > 0)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm
index 93f447bcf8..5f8e67a476 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm
@@ -100,7 +100,7 @@
embed_chance = 0
range = 12
-/obj/item/projectile/knockback/on_hit(var/atom/movable/target, var/blocked = 0)
+/obj/item/projectile/knockback/on_hit(atom/movable/target, blocked = 0)
if(isliving(target))
var/mob/living/L = target
var/throwdir = get_dir(firer,L)
@@ -117,7 +117,7 @@
muzzle_type = null
combustion = FALSE
-/obj/item/projectile/metalball/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/metalball/on_hit(atom/target, blocked = 0)
if(isturf(target.loc))
var/obj/structure/foamedmetal/W = locate() in get_turf(target)
if(!W)
@@ -455,4 +455,3 @@
else if(attackcycle == 2)
*/
-
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm
index 04c203734f..60128f9796 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm
@@ -43,7 +43,7 @@
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/dodge
projectiletype = /obj/item/projectile/energy/agate_lighting/fast
-/mob/living/simple_mob/mechanical/hivebot/tyr/meteor/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/mechanical/hivebot/tyr/meteor/bullet_act(obj/item/projectile/Proj)
if(!Proj)
return
projectiletype = Proj
@@ -74,4 +74,3 @@
icon_living = "janitor"
projectiletype = /obj/item/projectile/beam/midlaser/shortrange
ai_holder_type = /datum/ai_holder/simple_mob/ranged/pointblank
-
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/nanoweave.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/nanoweave.dm
index a2e7018913..396903b32f 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/nanoweave.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/nanoweave.dm
@@ -163,7 +163,7 @@
addtimer(CALLBACK(src, PROC_REF(teleport_attack), A, 1), 1 SECOND, TIMER_DELETE_ME)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega(atom/target, next_cycle)
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(omega_one), target, next_cycle), 1.5 SECONDS, TIMER_DELETE_ME)
@@ -172,7 +172,7 @@
upfour_leftfour(target)
downfour_rightfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_one(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_one(atom/target, next_cycle)
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(omega_two), target, next_cycle), 0.5 SECONDS, TIMER_DELETE_ME)
@@ -181,7 +181,7 @@
upfour_rightfour(target)
downfour_leftfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_two(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_two(atom/target, next_cycle)
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(omega_three), target, next_cycle), 1.5 SECONDS, TIMER_DELETE_ME)
@@ -194,7 +194,7 @@
downfour_rightfour(target)
upfour_rightfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_three(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_three(atom/target, next_cycle)
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(omega_four), target, next_cycle), 1.5 SECONDS, TIMER_DELETE_ME)
@@ -205,7 +205,7 @@
upfour(target)
downfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_four(atom/target, var/next_cycle)
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/omega_four(atom/target, next_cycle)
if(!target)
return
attackcycle = next_cycle
@@ -216,7 +216,7 @@
leftfour(target)
rightfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_slash(atom/target, var/next_cycle) //upright
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_slash(atom/target, next_cycle) //upright
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_one), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -224,7 +224,7 @@
upfour_rightthree(target)
upthree_rightfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_one(atom/target, var/next_cycle) //right
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_one(atom/target, next_cycle) //right
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_two), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -232,7 +232,7 @@
upone_rightfour(target)
downone_rightfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_two(atom/target, var/next_cycle) //downleft
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_two(atom/target, next_cycle) //downleft
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_three), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -240,7 +240,7 @@
downthree_leftfour(target)
downfour_leftthree(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_three(atom/target, var/next_cycle) //left
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_three(atom/target, next_cycle) //left
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_four), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -248,7 +248,7 @@
upone_leftfour(target)
downone_leftfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_four(atom/target, var/next_cycle) //upleft
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_four(atom/target, next_cycle) //upleft
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_five), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -256,7 +256,7 @@
upone_leftfour(target)
downone_leftfour(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_five(atom/target, var/next_cycle) //down
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_five(atom/target, next_cycle) //down
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_six), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -264,7 +264,7 @@
downfour_leftone(target)
downfour_rightone(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_six(atom/target, var/next_cycle) //up
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_six(atom/target, next_cycle) //up
if(!target)
return
addtimer(CALLBACK(src, PROC_REF(alpha_seven), target, next_cycle), 1 SECOND, TIMER_DELETE_ME)
@@ -272,7 +272,7 @@
upfour_leftone(target)
upfour_rightone(target)
-/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_seven(atom/target, var/next_cycle) //downright
+/mob/living/simple_mob/mechanical/mecha/eclipse/proc/alpha_seven(atom/target, next_cycle) //downright
if(!target)
return
downfour_leftfour(target)
@@ -288,7 +288,7 @@
icon ='modular_chomp/icons/mob/hivebot.dmi'
icon_state = "arti"
-/obj/effect/callstrike_nanoweave/end_fall(var/crushing = FALSE)
+/obj/effect/callstrike_nanoweave/end_fall(crushing = FALSE)
for(var/mob/living/L in loc)
var/target_zone = ran_zone()
var/blocked = L.run_armor_check(target_zone, "laser")
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metAI.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metAI.dm
index 7c3c6bd3f2..d5b9468255 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metAI.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metAI.dm
@@ -53,7 +53,7 @@
return 1 // Melee (eat) the target if dead/dying, don't shoot it.
return ..()
-/datum/ai_holder/simple_mob/juvenile_metroid/can_attack(atom/movable/AM, var/vision_required = TRUE)
+/datum/ai_holder/simple_mob/juvenile_metroid/can_attack(atom/movable/AM, vision_required = TRUE)
. = ..()
if(.) // Do some additional checks because we have Special Code(tm).
if(ishuman(AM))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metConsumption.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metConsumption.dm
index 357679af7a..511b3e1b86 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metConsumption.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metConsumption.dm
@@ -1,6 +1,6 @@
// Handles hunger, starvation, growth, and eatting humans.
-/mob/living/simple_mob/metroid/juvenile/adjust_nutrition(input, var/heal = 1)
+/mob/living/simple_mob/metroid/juvenile/adjust_nutrition(input, heal = 1)
..(input)
if(input > 0)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm
index fb3500339d..214757a6d6 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/metroid/metObjects.dm
@@ -21,7 +21,7 @@
var/amount_grown = 0
var/metroid_type = /mob/living/simple_mob/metroid/juvenile/baby
-/obj/effect/metroid/egg/Initialize(mapload, var/atom/parent)
+/obj/effect/metroid/egg/Initialize(mapload, atom/parent)
get_light_and_color(parent)
. = ..()
pixel_x = rand(3,-3)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm
index bb1f9ee6d1..91e53d6b02 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm
@@ -29,7 +29,7 @@
melee_damage_upper = 5
heat_resist = 1
-/mob/living/simple_mob/slime/feral/orange/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/slime/feral/orange/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
L.adjust_fire_stacks(5)
@@ -103,14 +103,14 @@
log_and_message_admins("[src] ignited due to exposure to fire.")
ignite()
-/mob/living/simple_mob/slime/feral/dark_purple/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/simple_mob/slime/feral/dark_purple/bullet_act(obj/item/projectile/P, def_zone)
if(P.damage_type && P.damage_type == BURN && P.damage) // Most bullets won't trigger the explosion, as a mercy towards Security.
log_and_message_admins("[src] ignited due to bring hit by a burning projectile[P.firer ? " by [key_name(P.firer)]" : ""].")
ignite()
else
..()
-/mob/living/simple_mob/slime/feral/dark_purple/attackby(var/obj/item/W, var/mob/user)
+/mob/living/simple_mob/slime/feral/dark_purple/attackby(obj/item/W, mob/user)
if(istype(W) && W.force && W.damtype == BURN)
log_and_message_admins("[src] ignited due to being hit with a burning weapon ([W]) by [key_name(user)].")
ignite()
@@ -124,7 +124,7 @@
coretype = /obj/item/slime_extract/silver
shiny = TRUE
-/mob/living/simple_mob/slime/feral/silver/bullet_act(var/obj/item/projectile/P, var/def_zone)
+/mob/living/simple_mob/slime/feral/silver/bullet_act(obj/item/projectile/P, def_zone)
if(istype(P,/obj/item/projectile/beam) || istype(P, /obj/item/projectile/energy))
visible_message(span_danger("\The [src] reflects \the [P]!"))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm
index be1f94560a..55b83f5d2a 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/xenobio.dm
@@ -39,7 +39,7 @@
result_amount = 1
required = /obj/item/slime_extract/sepia
-/datum/decl/chemical_reaction/instant/slime/secertslime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/secertslime/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with the mixture, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/redspace(get_turf(holder.my_atom))
..()
@@ -52,7 +52,7 @@
result_amount = 1
required = /obj/item/slime_extract/sepia
-/datum/decl/chemical_reaction/instant/slime/sepia_new_slime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/sepia_new_slime/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/sepia(get_turf(holder.my_atom))
..()
@@ -97,7 +97,7 @@
result_amount = 1
required = /obj/item/slime_extract/redspace
-/datum/decl/chemical_reaction/instant/slime/soulstone/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soulstone/on_reaction(datum/reagents/holder)
new /obj/item/soulstone(get_turf(holder.my_atom))
..()
@@ -108,7 +108,7 @@
result_amount = 1
required = /obj/item/slime_extract/redspace
-/datum/decl/chemical_reaction/instant/slime/redspace_smoke/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/redspace_smoke/on_reaction(datum/reagents/holder)
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem
S.attach(location)
@@ -166,7 +166,7 @@
required = /obj/item/slime_extract/dark
-/datum/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/feysight, 10 MINUTES, src)
..()
@@ -178,7 +178,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark
-/datum/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/painite(get_turf(holder.my_atom))
..()
@@ -189,7 +189,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark
-/datum/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_liquidfire/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(49, holder.my_atom))
L.add_modifier(/datum/modifier/sprinting, 5 MINUTES, src)
..()
@@ -202,7 +202,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark
-/datum/decl/chemical_reaction/instant/slime/dark_carpotoxin/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_carpotoxin/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/oceanic(get_turf(holder.my_atom))
..()
@@ -214,7 +214,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark
-/datum/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_deathblood/on_reaction(datum/reagents/holder)
new /obj/effect/spider/eggcluster/royal/space(get_turf(holder.my_atom))
..()
@@ -225,7 +225,7 @@
result_amount = 1
required = /obj/item/slime_extract/dark
-/datum/decl/chemical_reaction/instant/slime/dark_blood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dark_blood/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/void_opal(get_turf(holder.my_atom))
..()
@@ -266,7 +266,7 @@
result_amount = 1
required = /obj/item/slime_extract/plague
-/datum/decl/chemical_reaction/instant/slime/virusdish/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/virusdish/on_reaction(datum/reagents/holder)
// new /obj/item/virusdish(get_turf(holder.my_atom))
..()
@@ -334,7 +334,7 @@
result_amount = 1
required = /obj/item/slime_extract/oceanic
-/datum/decl/chemical_reaction/instant/slime/carpfren/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/carpfren/on_reaction(datum/reagents/holder)
new /mob/living/simple_mob/animal/space/carp/station(get_turf(holder.my_atom))
..()
@@ -361,7 +361,7 @@
result_amount = 1
required = /obj/item/slime_extract/oceanic
-/datum/decl/chemical_reaction/instant/slime/oceanboon/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/oceanboon/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(21, holder.my_atom))
L.add_modifier(/datum/modifier/healingtide, 10 MINUTES, src)
..()
@@ -373,7 +373,7 @@
result_amount = 1
required = /obj/item/slime_extract/plague
-/datum/decl/chemical_reaction/instant/slime/warplague/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/warplague/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/nuclear(get_turf(holder.my_atom))
..()
@@ -432,7 +432,7 @@
result_amount = 1
required = /obj/item/slime_extract/nuclear
-/datum/decl/chemical_reaction/instant/slime/nuclear_radpulse/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nuclear_radpulse/on_reaction(datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation pulse) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
playsound(holder.my_atom, 'sound/effects/phasein.ogg', 75, 1)
holder.my_atom.visible_message(span_danger("\The [holder.my_atom] begins to vibrate violently!"))
@@ -455,7 +455,7 @@
result_amount = 1
required = /obj/item/slime_extract/green
-/datum/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/green_emitter/on_reaction(datum/reagents/holder)
log_and_message_admins("Green extract reaction (radiation emitter) has been activated in [get_area(holder.my_atom)]. Last fingerprints: [holder.my_atom.forensic_data?.get_lastprint()]")
new /obj/item/slime_irradiator(get_turf(holder.my_atom))
..()
@@ -477,7 +477,7 @@
result_amount = 1
required = /obj/item/slime_extract/green
-/datum/decl/chemical_reaction/instant/slime/nuclear_uranium/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nuclear_uranium/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/uranium(get_turf(holder.my_atom), 10)
..()
@@ -508,7 +508,7 @@
result_amount = 1
required = /obj/item/slime_extract/dream
-/datum/decl/chemical_reaction/instant/slime/dreamscale/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/dreamscale/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/dreamscale(get_turf(holder.my_atom), 10)
..()
@@ -519,7 +519,7 @@
result_amount = 1
required = /obj/item/slime_extract/dream
-/datum/decl/chemical_reaction/instant/slime/nightmareslime/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmareslime/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with slime jelly, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/nightmare(get_turf(holder.my_atom))
..()
@@ -585,7 +585,7 @@
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/datum/decl/chemical_reaction/instant/slime/nightmarewater/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmarewater/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(3, holder.my_atom))
L.add_modifier(/datum/modifier/faraday, 1 MINUTES, src)
L.add_modifier(/datum/modifier/blastshield, 1 MINUTES, src)
@@ -598,7 +598,7 @@
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/datum/decl/chemical_reaction/instant/slime/nightmarejelly/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmarejelly/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(14, holder.my_atom))
L.add_modifier(/datum/modifier/poisoned/strong, 3 MINUTES, src)
..()
@@ -610,7 +610,7 @@
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/datum/decl/chemical_reaction/instant/slime/nightmareblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmareblood/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/valhollide(get_turf(holder.my_atom), 5)
..()
@@ -621,7 +621,7 @@
result_amount = 1
required = /obj/item/slime_extract/nightmare
-/datum/decl/chemical_reaction/instant/slime/nightmarephoron/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/nightmarephoron/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(14, holder.my_atom))
L.add_modifier(/datum/modifier/berserk_exhaustion, 1 MINUTES, src)
..()
@@ -636,7 +636,7 @@
result_amount = 1
required = /obj/item/slime_extract/redspace
-/datum/decl/chemical_reaction/instant/slime/redspace_sound/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/redspace_sound/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with the mixture, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/sound(get_turf(holder.my_atom))
..()
@@ -692,7 +692,7 @@
result_amount = 1
required = /obj/item/slime_extract/sound
-/datum/decl/chemical_reaction/instant/slime/soundblood/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundblood/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/quartz(get_turf(holder.my_atom), 5)
..()
@@ -703,7 +703,7 @@
result_amount = 1
required = /obj/item/slime_extract/sound
-/datum/decl/chemical_reaction/instant/slime/soundphoron/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundphoron/on_reaction(datum/reagents/holder)
for(var/mob/living/L in range(1, holder.my_atom))
L.add_modifier(/datum/modifier/aura/soothingsong, 10 MINUTES, src)
..()
@@ -715,7 +715,7 @@
result_amount = 1
required = /obj/item/slime_extract/sound
-/datum/decl/chemical_reaction/instant/slime/soundwater/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundwater/on_reaction(datum/reagents/holder)
holder.my_atom.visible_message(span_warning("Infused with the mixture, the core begins to quiver and grow, and soon a new baby slime emerges from it!"))
new /mob/living/simple_mob/slime/xenobio/sound(get_turf(holder.my_atom))
..()
@@ -727,6 +727,6 @@
result_amount = 1
required = /obj/item/slime_extract/sound
-/datum/decl/chemical_reaction/instant/slime/soundjelly/on_reaction(var/datum/reagents/holder)
+/datum/decl/chemical_reaction/instant/slime/soundjelly/on_reaction(datum/reagents/holder)
new /obj/item/stack/material/glass/plastitanium(get_turf(holder.my_atom), 5)
..()
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm
index 9b30f2c15a..3db4802cea 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/blackholemobs.dm
@@ -90,7 +90,7 @@
addtimer(CALLBACK(src, PROC_REF(doLeap), L), leap_warmup, TIMER_DELETE_ME)
return TRUE
-/mob/living/simple_mob/vore/otie/syndicate/blackhole/proc/doLeap(var/mob/living/L)
+/mob/living/simple_mob/vore/otie/syndicate/blackhole/proc/doLeap(mob/living/L)
if(!L)
return FALSE
if(L.z != z)
@@ -104,7 +104,7 @@
addtimer(CALLBACK(src, PROC_REF(afterLeap), L), 0.5 SECONDS, TIMER_DELETE_ME)
-/mob/living/simple_mob/vore/otie/syndicate/blackhole/proc/afterLeap(var/mob/living/L)
+/mob/living/simple_mob/vore/otie/syndicate/blackhole/proc/afterLeap(mob/living/L)
if(status_flags & LEAPING)
status_flags &= ~LEAPING
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm
index 8ae1d0bf3c..9e3dd62a90 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm
@@ -315,7 +315,7 @@
melee_damage_lower = 7
melee_damage_upper = 12
-/mob/living/simple_mob/vore/candy/greencabold/apply_melee_effects(var/atom/A)
+/mob/living/simple_mob/vore/candy/greencabold/apply_melee_effects(atom/A)
if(isliving(A))
var/mob/living/L = A
L.add_modifier(/datum/modifier/deep_wounds, 15 SECONDS)
@@ -436,7 +436,7 @@
special_attack_max_range = 15
special_attack_cooldown = 7 SECONDS
-/mob/living/simple_mob/vore/candy/ouroboros/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_mob/vore/candy/ouroboros/bullet_act(obj/item/projectile/Proj)
if(prob(50))
new /obj/random/mob/candycritter (src.loc)
..()
@@ -632,7 +632,7 @@
maxHealth = 10
health = 10
-/mob/living/simple_mob/vore/candy/peppermint/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_mob/vore/candy/peppermint/attackby(obj/item/O as obj, mob/user as mob)
if(O.force)
if(prob(80))
visible_message(span_danger("\The [src] deflects \the [O] with its shell!"))
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm
index 7f0a5fa55a..2993163e02 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/spacecritters.dm
@@ -40,7 +40,7 @@
var/copy = "/mob/living/simple_mob/vore/solarray"
-/mob/living/simple_mob/vore/spacecritter/attackby(var/obj/item/O, var/mob/user)
+/mob/living/simple_mob/vore/spacecritter/attackby(obj/item/O, mob/user)
if(istype(O, evolvekey))
user.drop_from_inventory(O)
qdel(O)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/weather.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/weather.dm
index 1653218497..9d389779cb 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/weather.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/weather.dm
@@ -162,7 +162,7 @@
B.escapechance = 15
-/mob/living/simple_mob/vore/boss_jellyfish/apply_melee_effects(var/atom/A) //Not a real threat unless multiple hits. It acts a timer for special traits.
+/mob/living/simple_mob/vore/boss_jellyfish/apply_melee_effects(atom/A) //Not a real threat unless multiple hits. It acts a timer for special traits.
if(isliving(A))
var/mob/living/L = A
if(L.nutrition)
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm
index d5d72276fc..5c923cb4ef 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/xeyakin.dm
@@ -57,7 +57,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_GODTIER
industrial_use = REFINERYEXPORT_REASON_FOOD
-/datum/reagent/xeyakinblood/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //should proabaly make something more special but this isn't meant to be a proper chem
+/datum/reagent/xeyakinblood/affect_blood(mob/living/carbon/M, alien, removed) //should proabaly make something more special but this isn't meant to be a proper chem
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
M.adjustBruteLoss(12 * removed) //This will uber merc prometheans. It wants to turn them to crystal.
diff --git a/modular_chomp/code/modules/organs/internal/malignant/malignant.dm b/modular_chomp/code/modules/organs/internal/malignant/malignant.dm
index 8d48ede6e5..d30ebcde83 100644
--- a/modular_chomp/code/modules/organs/internal/malignant/malignant.dm
+++ b/modular_chomp/code/modules/organs/internal/malignant/malignant.dm
@@ -9,7 +9,7 @@
var/cooldownmin = 0
var/cooldownmax = 0
-/obj/item/organ/internal/malignant/Initialize(mapload, var/internal, var/force_location = null, var/forcetag = null)
+/obj/item/organ/internal/malignant/Initialize(mapload, internal, force_location = null, forcetag = null)
organ_tag = "[initial(organ_tag)]_[rand(1,9999)]"
if(forcetag)
organ_tag = forcetag
@@ -39,7 +39,7 @@
parent_organ = force_location
return ..(mapload, internal)
-/mob/living/carbon/human/proc/random_malignant_organ( var/allowtumors = TRUE, var/allowparasites = TRUE, var/allowengineered = TRUE)
+/mob/living/carbon/human/proc/random_malignant_organ( allowtumors = TRUE, allowparasites = TRUE, allowengineered = TRUE)
// get a list of valid malignant organs and spawn one
var/list/paths = list()
if(allowtumors)
@@ -51,7 +51,7 @@
paths -= /obj/item/organ/internal/malignant/engineered/chemorgan // Don't use this one
return malignant_organ_spawn(pick(paths)) // place in body
-/mob/living/carbon/human/proc/malignant_organ_spawn(var/type_path)
+/mob/living/carbon/human/proc/malignant_organ_spawn(type_path)
if(!type_path)
return FALSE
if(stat == DEAD)
@@ -135,7 +135,7 @@
surgeryAllowedSites = list(BP_GROIN, BP_TORSO) // Lets keep these a little more restricted, due to size and complexity
supply_conversion_value = 100
-/obj/item/organ/internal/malignant/engineered/proc/update_degeneration(var/degradechance, var/intensity)
+/obj/item/organ/internal/malignant/engineered/proc/update_degeneration(degradechance, intensity)
if(degradechance == 0)
return FALSE
if(prob(degradechance))
@@ -145,7 +145,7 @@
return TRUE // do handle_sideeffects proc
return FALSE
-/obj/item/organ/internal/malignant/engineered/proc/handle_sideeffects(var/base_mult)
+/obj/item/organ/internal/malignant/engineered/proc/handle_sideeffects(base_mult)
if(damage < min_bruised_damage)
// skip any major effects if under bruise damage
return
@@ -606,7 +606,7 @@
var/chem_target = null
supply_conversion_value = 0
-/obj/item/organ/internal/malignant/engineered/lattice/Initialize(mapload, var/internal, var/force_location = null, var/forcetag = null)
+/obj/item/organ/internal/malignant/engineered/lattice/Initialize(mapload, internal, force_location = null, forcetag = null)
growth_trigger = rand(150,200)
return ..(mapload, internal, force_location, forcetag)
@@ -651,7 +651,7 @@
update_icon()
cooldown = rand(2,6)
-/obj/item/organ/internal/malignant/engineered/lattice/proc/get_mutation_result(var/reagent)
+/obj/item/organ/internal/malignant/engineered/lattice/proc/get_mutation_result(reagent)
var/newpath = null
switch(reagent)
if(REAGENT_ID_PHORON)
@@ -687,7 +687,7 @@
return newpath
-/obj/item/organ/internal/malignant/engineered/lattice/proc/make_mutoid(var/reagent)
+/obj/item/organ/internal/malignant/engineered/lattice/proc/make_mutoid(reagent)
if(!prepared)
return FALSE
if(chem_target)
diff --git a/modular_chomp/code/modules/overmap/dynamic_sector.dm b/modular_chomp/code/modules/overmap/dynamic_sector.dm
index 6170b6f188..c036b523b4 100644
--- a/modular_chomp/code/modules/overmap/dynamic_sector.dm
+++ b/modular_chomp/code/modules/overmap/dynamic_sector.dm
@@ -104,7 +104,7 @@ GLOBAL_VAR_INIT(dynamic_sector_master, null)
return i
return 0
-/obj/effect/overmap/visitable/dynamic/proc/is_empty(var/index, var/mob/observer)
+/obj/effect/overmap/visitable/dynamic/proc/is_empty(index, 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
@@ -140,7 +140,7 @@ GLOBAL_VAR_INIT(dynamic_sector_master, null)
var/loaded = FALSE
var/my_index = 0 // Tracks which z-level we're using in the parent. Corresponds to index in parent's active_pois[]
-/obj/effect/overmap/visitable/dynamic/poi/Initialize(mapload, dyn_poi, var/template)
+/obj/effect/overmap/visitable/dynamic/poi/Initialize(mapload, dyn_poi, template)
if(!global.using_map.use_overmap || !template)
return INITIALIZE_HINT_QDEL
my_template = template
@@ -321,7 +321,7 @@ GLOBAL_VAR_INIT(dynamic_sector_master, null)
base_area = /area/space
base_turf = /turf/space
-/obj/effect/shuttle_landmark/om_poi/Initialize(mapload, var/new_name, var/new_tag)
+/obj/effect/shuttle_landmark/om_poi/Initialize(mapload, new_name, new_tag)
name = new_name
landmark_tag = new_tag
. = ..()
diff --git a/modular_chomp/code/modules/paperwork/faxmachine.dm b/modular_chomp/code/modules/paperwork/faxmachine.dm
index c11df3bf5d..1b07678764 100644
--- a/modular_chomp/code/modules/paperwork/faxmachine.dm
+++ b/modular_chomp/code/modules/paperwork/faxmachine.dm
@@ -10,7 +10,7 @@
return list(channel)
return 0
-/proc/role_request_discord_message(var/message)
+/proc/role_request_discord_message(message)
if(!message)
return
var/datum/tgs_chat_channel/channel = get_role_request_channel()
@@ -29,14 +29,14 @@
return list(channel)
return 0
-/proc/fax_discord_message(var/message)
+/proc/fax_discord_message(message)
if(!message)
return
var/datum/tgs_chat_channel/channel = get_fax_channel()
if(channel)
world.TgsChatBroadcast(message,channel)
-/proc/get_discord_role_id_from_department(var/department)
+/proc/get_discord_role_id_from_department(department)
switch(department)
if("Command")
if(CONFIG_GET(string/role_request_id_command)) // CHOMPEdit
@@ -77,7 +77,7 @@
return FALSE
-/obj/machinery/photocopier/faxmachine/message_chat_admins(var/mob/sender, var/faxname, var/obj/item/sent, var/faxid, font_colour="#006100")
+/obj/machinery/photocopier/faxmachine/message_chat_admins(mob/sender, faxname, obj/item/sent, faxid, font_colour="#006100")
var/faxmsg
if(faxid && fexists("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html"))
faxmsg = file2text("[CONFIG_GET(string/fax_export_dir)]/fax_[faxid].html")
@@ -88,7 +88,7 @@
fax_discord_message("A fax; '[faxname]' was sent.\nSender: [sender.name]\nFax name: [sent.name]\nFax ID: **[faxid]**")
-/obj/machinery/photocopier/faxmachine/message_chat_rolerequest(var/font_colour="#006100", var/role_to_ping, var/reason, var/jobname)
+/obj/machinery/photocopier/faxmachine/message_chat_rolerequest(font_colour="#006100", role_to_ping, reason, jobname)
var/roleid = get_discord_role_id_from_department(role_to_ping)
if(roleid)
diff --git a/modular_chomp/code/modules/pda/core_apps.dm b/modular_chomp/code/modules/pda/core_apps.dm
index 37791eca4a..c3428442bc 100644
--- a/modular_chomp/code/modules/pda/core_apps.dm
+++ b/modular_chomp/code/modules/pda/core_apps.dm
@@ -61,7 +61,7 @@
makeOffDuty(ui.user)
return TRUE
-/datum/data/pda/app/timeclock/proc/getOpenOnDutyJobs(var/mob/user, var/department)
+/datum/data/pda/app/timeclock/proc/getOpenOnDutyJobs(mob/user, department)
var/list/available_jobs = list()
for(var/datum/job/job in SSjob.occupations)
if(isOpenOnDutyJob(user, department, job))
@@ -72,7 +72,7 @@
available_jobs[job.title] += alt_job
return available_jobs
-/datum/data/pda/app/timeclock/proc/isOpenOnDutyJob(var/mob/user, var/department, var/datum/job/job)
+/datum/data/pda/app/timeclock/proc/isOpenOnDutyJob(mob/user, department, datum/job/job)
return job \
&& job.is_position_available() \
&& !job.whitelist_only \
@@ -83,7 +83,7 @@
&& !job.disallow_jobhop \
&& job.timeoff_factor > 0
-/datum/data/pda/app/timeclock/proc/makeOnDuty(mob/user, var/newrank, var/newassignment)
+/datum/data/pda/app/timeclock/proc/makeOnDuty(mob/user, newrank, newassignment)
var/datum/job/oldjob = SSjob.get_job(pda.id.rank)
var/datum/job/newjob = SSjob.get_job(newrank)
if(!oldjob || !isOpenOnDutyJob(user, oldjob.pto_type, newjob))
diff --git a/modular_chomp/code/modules/player_tips/player_tips_list.dm b/modular_chomp/code/modules/player_tips/player_tips_list.dm
index e27892784b..50993b6fa2 100644
--- a/modular_chomp/code/modules/player_tips/player_tips_list.dm
+++ b/modular_chomp/code/modules/player_tips/player_tips_list.dm
@@ -5,7 +5,7 @@ prob(50) makes it half as likely to appear and so forth.
When editing the list, please try and keep similar probabilities near each other. High on top, low on bottom */
//argument determines if to pick a random tip or use a forced choice.
-/datum/player_tips/proc/pick_tip(var/isSpecific)
+/datum/player_tips/proc/pick_tip(isSpecific)
var/choice = null
if(!(isSpecific == "none" || isSpecific == "general" || isSpecific == "gameplay" || isSpecific == "roleplay" || isSpecific == "lore" ))
choice = "none" //Making sure that wrong arguments still give tips.
diff --git a/modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm b/modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
index 2b9d5a472e..1eda67e8c2 100644
--- a/modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
+++ b/modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
@@ -26,7 +26,7 @@
)
cell_type = /obj/item/cell/device/weapon/empproof
-/obj/item/gun/energy/clockwork/unload_ammo(var/mob/user)
+/obj/item/gun/energy/clockwork/unload_ammo(mob/user)
if(recharging)
return
recharging = 1
diff --git a/modular_chomp/code/modules/projectiles/gun.dm b/modular_chomp/code/modules/projectiles/gun.dm
index b261d5492c..0086c84c4b 100644
--- a/modular_chomp/code/modules/projectiles/gun.dm
+++ b/modular_chomp/code/modules/projectiles/gun.dm
@@ -1,6 +1,6 @@
// prevent gun activation when stealth swimming. The low alpha hides you from NPC AI, which allows you to cheese mobs.
//Just adding onto this code for funny net gun
-/obj/item/gun/special_check(var/mob/user)
+/obj/item/gun/special_check(mob/user)
var/mob/living/L = user
if(istype(L))
if(L.has_modifier_of_type(/datum/modifier/underwater_stealth))
diff --git a/modular_chomp/code/modules/projectiles/guns/energy/special.dm b/modular_chomp/code/modules/projectiles/guns/energy/special.dm
index 9956d35318..ef982a44f8 100644
--- a/modular_chomp/code/modules/projectiles/guns/energy/special.dm
+++ b/modular_chomp/code/modules/projectiles/guns/energy/special.dm
@@ -23,7 +23,7 @@
vacuum_traversal = 1
hud_state = "plasma_rifle_blast"
-/obj/item/projectile/energy/plasmastun/slow/on_hit(var/atom/target)
+/obj/item/projectile/energy/plasmastun/slow/on_hit(atom/target)
if(isliving(target))
var/mob/living/L = target
L.add_modifier(/datum/modifier/entangled, 10 SECONDS)
@@ -66,7 +66,7 @@
hud_state = "rocket_thermobaric"
speed = 0.2
-/obj/item/projectile/bullet/magnetic/supercannon/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null)
+/obj/item/projectile/bullet/magnetic/supercannon/on_hit(atom/target, blocked = 0, def_zone = null)
if(istype(target,/turf/simulated/wall) || istype(target,/mob/living))
target.visible_message(span_danger("The [src] burns a perfect hole through \the [target] with a blinding flash!"))
playsound(target, 'sound/effects/teleport.ogg', 40, 0)
diff --git a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
index d7146eae8e..c46128fdcc 100644
--- a/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
+++ b/modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm
@@ -923,7 +923,7 @@
if(do_after(user, 5 SECONDS, src)) //Give them a chance to take it back.
. = ..() //RIP
-/obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, var/pointblank=0, var/reflex=0)
+/obj/item/gun/projectile/automatic/serdy/kord/handle_post_fire(mob/living/user, atom/target, pointblank=0, reflex=0)
. = ..()
var/unhappy_factor = 1.3333333*(user.size_multiplier - 0.5) //Unhappy factor based on size. Below 50% is a really bad day, and above 125% is fine, everything inbetween is varying.
if(unhappy_factor >= 1) //They're fine
@@ -1425,7 +1425,7 @@
icon_expected_width = 64
var/is_picked_up = FALSE
-/obj/item/gun/projectile/shotgun/doublebarrel/process_accuracy(obj/projectile, mob/living/user, atom/target, var/burst, var/held_twohanded)
+/obj/item/gun/projectile/shotgun/doublebarrel/process_accuracy(obj/projectile, mob/living/user, atom/target, burst, held_twohanded)
. = ..()
var/obj/item/projectile/bullet/P = projectile
if(!istype(P))
@@ -1433,7 +1433,7 @@
if(sawn_off)
P.submunition_spread_max = 100 //More spread when sawn off
-/obj/item/gun/projectile/shotgun/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/gun/projectile/shotgun/doublebarrel/attackby(obj/item/A as obj, mob/user as mob)
if(istype(A, /obj/item/surgical/circular_saw) || istype(A, /obj/item/melee/energy) || istype(A, /obj/item/pickaxe/plasmacutter))
if(sawn_off) //Don't do anything if we were already sawed off.
return
diff --git a/modular_chomp/code/modules/projectiles/precursor/eclipse.dm b/modular_chomp/code/modules/projectiles/precursor/eclipse.dm
index 3bf9c6f7cc..6189823652 100644
--- a/modular_chomp/code/modules/projectiles/precursor/eclipse.dm
+++ b/modular_chomp/code/modules/projectiles/precursor/eclipse.dm
@@ -80,7 +80,7 @@
irradiate = 3
speed = 1 //a bit faster due to the source having a 3 second wind up
-/obj/item/projectile/energy/mechahack/on_hit(var/atom/target)
+/obj/item/projectile/energy/mechahack/on_hit(atom/target)
. = ..()
if(istype(target, /obj/mecha))
remote_eject(target)
@@ -99,7 +99,7 @@
speed = 2
var/power = 20 //How hard it will hit for with electrocute_act(), decreases with each bounce.
-/obj/item/projectile/energy/lightingspark/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier=0)
+/obj/item/projectile/energy/lightingspark/attack_mob(mob/living/target_mob, distance, miss_modifier=0)
//First we shock the guy we just hit.
if(ishuman(target_mob))
var/mob/living/carbon/human/H = target_mob
diff --git a/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm b/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm
index 4451164ca7..cc2704d3e4 100644
--- a/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm
+++ b/modular_chomp/code/modules/reagents/machinery/dispenser/chem_synthesizer_ch.dm
@@ -590,7 +590,7 @@
// This proc controls the timing for each step in a reaction. Step is the index for the current chem of our recipe, step + 1 is the volume of said chem.
-/obj/machinery/chemical_synthesizer/proc/follow_recipe(var/r_id, var/step as num)
+/obj/machinery/chemical_synthesizer/proc/follow_recipe(r_id, step as num)
if(stalled) // Emergency stop if() check.
stalled = FALSE
stall()
@@ -607,7 +607,7 @@
addtimer(CALLBACK(src, PROC_REF(perform_reaction), r_id, step), recipes[r_id][step + 1] * delay_modifier)
// This proc carries out the actual steps in each reaction.
-/obj/machinery/chemical_synthesizer/proc/perform_reaction(var/r_id, var/step as num)
+/obj/machinery/chemical_synthesizer/proc/perform_reaction(r_id, step as num)
if(stalled) // Emergency stop if() check.
stalled = FALSE
stall()
@@ -668,7 +668,7 @@
follow_recipe(r_id, step)
// Now that we're done, bottle up the product.
-/obj/machinery/chemical_synthesizer/proc/bottle_product(var/r_id)
+/obj/machinery/chemical_synthesizer/proc/bottle_product(r_id)
if(stat & (BROKEN|NOPOWER))
stall()
return
diff --git a/modular_chomp/code/modules/reagents/reagents/food_drinks.dm b/modular_chomp/code/modules/reagents/reagents/food_drinks.dm
index 51456cea63..67b90a4dc1 100644
--- a/modular_chomp/code/modules/reagents/reagents/food_drinks.dm
+++ b/modular_chomp/code/modules/reagents/reagents/food_drinks.dm
@@ -53,7 +53,7 @@
cup_name = "Medicinal tea cup"
color = "#00FF00"
-/datum/reagent/drink/tea/dyloteane/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/tea/dyloteane/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(M.ingested)
@@ -65,7 +65,7 @@
if(istype(R, /datum/reagent/ethanol))
R.remove_self(removed * 10)
-/datum/reagent/drink/tea/dyloteane/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/tea/dyloteane/affect_ingest(mob/living/carbon/M, alien, removed)
var/chem_effective = 1
if(alien != IS_DIONA)
M.drowsyness = max(0, M.drowsyness - 6 * removed * chem_effective)
@@ -134,7 +134,7 @@
glass_name = REAGENT_ID_LOWPOWER
glass_desc = "Smells, and tastes like lemon.. with a hint of Ozone, for whatever reason. It glows softly."
-/datum/reagent/drink/lowpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/lowpower/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -150,7 +150,7 @@
glass_name = REAGENT_ID_HIGHPOWER
glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights."
-/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/highpower/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
if(prob(5))
@@ -171,7 +171,7 @@
glass_name = REAGENT_JACKBREW
glass_desc = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job."
-/datum/reagent/ethanol/coffee/jackbrew/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/coffee/jackbrew/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_TAJARA)
removed *= 1.25
if(alien == IS_SLIME)
@@ -196,7 +196,7 @@
glass_name = REAGENT_BOOKWYRM
glass_desc = "A cold lime mint drink. Dont drink to much or you might fall asleep."
-/datum/reagent/ethanol/bookwyrm/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/bookwyrm/affect_ingest(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
@@ -292,7 +292,7 @@
cup_name = "cup of tea"
cup_desc = "Tasty green tea, it has antioxidants, it's good for you!"
-/datum/reagent/drink/freshtea/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/freshtea/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -384,7 +384,7 @@
cup_name = "cup of matcha"
cup_desc = "Heavenly matcha. Good for body and spirit."
-/datum/reagent/drink/matcha/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/drink/matcha/affect_ingest(mob/living/carbon/M, alien, removed)
..()
if(alien == IS_DIONA)
return
@@ -490,10 +490,10 @@
glass_desc = "A freezing pint of delicious Araching Slammer, it foams constantly with the air crisp around it."
allergen_type = ALLERGEN_GRAINS //Barley is grain
-/datum/reagent/ethanol/arachnidslammer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/arachnidslammer/affect_ingest(mob/living/carbon/M, alien, removed)
.=..()
M.reagents.add_reagent(REAGENT_ID_INFUSEDARACHNIDSLAMMER, removed * 5)
-/datum/reagent/ethanol/arachnidslammer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/arachnidslammer/affect_blood(mob/living/carbon/M, alien, removed)
.=..()
M.reagents.add_reagent(REAGENT_ID_INFUSEDARACHNIDSLAMMER, removed * 5)
@@ -526,7 +526,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_COMMON
industrial_use = REFINERYEXPORT_REASON_DRUG
-/datum/reagent/infusedarachnidslammer/enragedarachnidslammer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/infusedarachnidslammer/enragedarachnidslammer/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
M.adjustOxyLoss(-1.5 * removed * chem_effective)
@@ -571,7 +571,7 @@
glass_name = REAGENT_FETCHINGFIZZ
glass_desc = "Induces magnetism in the imbiber. Started as a barroom prank but evolved to become popular with miners and scrappers. Metallic aftertaste."
-/datum/reagent/ethanol/fetching_fizz/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/fetching_fizz/affect_ingest(mob/living/carbon/M, alien, removed)
for(var/obj/item/ore/O in orange(3, M))
step_towards(O, get_turf(M))
@@ -585,7 +585,7 @@
glass_name = REAGENT_HEARTYPUNCH
glass_desc = "Aromatic beverage served piping hot. According to folk tales it can almost wake the dead."
-/datum/reagent/ethanol/hearty_punch/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/hearty_punch/affect_ingest(mob/living/carbon/M, alien, removed)
if(M.health<=0)
M.adjustBruteLoss(-3 * removed)
M.adjustFireLoss(-3 * removed)
@@ -624,7 +624,7 @@
glass_name = REAGENT_CREVICESPIKE
glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably."
-/datum/reagent/ethanol/crevice_spike/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/crevice_spike/affect_ingest(mob/living/carbon/M, alien, removed)
M.adjustBruteLoss(50 * removed)
for(var/datum/reagent/R in M.ingested.reagent_list)
if(istype(R, /datum/reagent/ethanol))
@@ -650,7 +650,7 @@
glass_name = REAGENT_MAUNALOA
glass_desc = "Lava in a drink... mug... volcano... thing."
-/datum/reagent/ethanol/mauna_loa/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/ethanol/mauna_loa/affect_ingest(mob/living/carbon/M, alien, removed)
if(prob(10))
M.adjust_fire_stacks(5*removed)
M.ignite_mob()
diff --git a/modular_chomp/code/modules/reagents/reagents/medicalmods.dm b/modular_chomp/code/modules/reagents/reagents/medicalmods.dm
index 0182fb8be0..6c5186ef08 100644
--- a/modular_chomp/code/modules/reagents/reagents/medicalmods.dm
+++ b/modular_chomp/code/modules/reagents/reagents/medicalmods.dm
@@ -83,7 +83,7 @@
on_expired_text = span_notice("Your body returns to normal.")
stacks = MODIFIER_STACK_EXTEND
-/datum/modifier/life_cloak/can_apply(var/mob/living/L, var/suppress_failure = FALSE)
+/datum/modifier/life_cloak/can_apply(mob/living/L, suppress_failure = FALSE)
if(L.has_modifier_of_type(/datum/modifier/life_cloak_exhaustion))
return FALSE
return ..()
diff --git a/modular_chomp/code/modules/reagents/reagents/medicine.dm b/modular_chomp/code/modules/reagents/reagents/medicine.dm
index bb3edd0586..411a9e7f04 100644
--- a/modular_chomp/code/modules/reagents/reagents/medicine.dm
+++ b/modular_chomp/code/modules/reagents/reagents/medicine.dm
@@ -48,7 +48,7 @@
gender_change = "plural"
scannable = 1
-/datum/reagent/change_drug/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed)
+/datum/reagent/change_drug/affect_blood(mob/living/carbon/human/M, alien, removed)
if (!(alien == IS_DIONA || M.gender == gender_change || M.gender_change_cooldown == 1) && M.allow_spontaneous_tf)
//set not to bug them because the chem is activating
M.gender_change_cooldown = 1
@@ -82,7 +82,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/cleansingagent/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/cleansingagent/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.66
@@ -106,7 +106,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/purifyingagent/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/purifyingagent/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.66
@@ -132,7 +132,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/burncard/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/burncard/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.75
@@ -140,7 +140,7 @@
M.heal_organ_damage(13 * removed * chem_effective, 0)
M.adjustFireLoss(1 * removed)
-/datum/reagent/burncard/overdose(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/burncard/overdose(mob/living/carbon/M, alien, removed)
..()
var/wound_heal = 3 * removed
M.eye_blurry = min(M.eye_blurry + wound_heal, 250)
@@ -171,7 +171,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/flamecure/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/flamecure/affect_blood(mob/living/carbon/M, alien, removed)
if(alien == IS_DIONA)
return
M.eye_blurry = min(M.eye_blurry + (repair_strength * removed), 250)
@@ -206,7 +206,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/neotane/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/neotane/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 0.5
@@ -229,7 +229,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/bloodsealer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/bloodsealer/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
M.add_chemical_effect(CE_STABLE, 25)
M.heal_organ_damage(0, -1 * removed)
@@ -249,12 +249,12 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/livingagent/overdose(var/mob/living/carbon/M, var/alien)
+/datum/reagent/livingagent/overdose(mob/living/carbon/M, alien)
..()
M.druggy = max(M.druggy, 5)
M.Confuse(5)
-/datum/reagent/livingagent/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/livingagent/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -278,7 +278,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/performancepeaker/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/performancepeaker/affect_blood(mob/living/carbon/M, alien, removed)
M.add_chemical_effect(CE_SPEEDBOOST, 0.5)
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
@@ -304,7 +304,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/souldew/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/souldew/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(M.stat == DEAD)
M.adjustOxyLoss(-3 * removed * chem_effective)
@@ -323,7 +323,7 @@
overdose = REAGENTS_OVERDOSE * 2
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/quadcord/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/quadcord/affect_blood(mob/living/carbon/M, alien, removed)
if(alien != IS_DIONA)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
@@ -350,7 +350,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_HIGHREFINED
industrial_use = REFINERYEXPORT_REASON_MEDSCI
-/datum/reagent/curea/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/curea/affect_blood(mob/living/carbon/M, alien, removed)
M.remove_a_modifier_of_type(/datum/modifier/poisoned)
M.remove_a_modifier_of_type(/datum/modifier/chilled)
M.remove_a_modifier_of_type(/datum/modifier/doomed)
@@ -439,7 +439,7 @@
supply_conversion_value = REFINERYEXPORT_VALUE_PROCESSED
industrial_use = REFINERYEXPORT_REASON_INDUSTRY
-/datum/reagent/dryagent/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
+/datum/reagent/dryagent/affect_blood(mob/living/carbon/M, alien, removed)
var/chem_effective = 1 * M.species.chem_strength_heal
if(alien == IS_SLIME)
chem_effective = 1.25
@@ -451,7 +451,7 @@
qdel(O)
remove_self(10)
-/datum/reagent/dryagent/touch_turf(var/turf/T)
+/datum/reagent/dryagent/touch_turf(turf/T)
..()
if(volume >= 5)
if(istype(T, /turf/simulated/floor))
diff --git a/modular_chomp/code/modules/recycling/v_garbosystem.dm b/modular_chomp/code/modules/recycling/v_garbosystem.dm
index 0399cbe161..4355622a59 100644
--- a/modular_chomp/code/modules/recycling/v_garbosystem.dm
+++ b/modular_chomp/code/modules/recycling/v_garbosystem.dm
@@ -151,7 +151,7 @@ GLOBAL_VAR_INIT(Recycled_Items, 0)
playsound(src, 'sound/items/electronic_assembly_emptying.ogg', 50, 1)
playsound(src, 'sound/effects/metalscrape2.ogg', 50, 1)
-/obj/machinery/v_garbosystem/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
+/obj/machinery/v_garbosystem/emag_act(remaining_charges, mob/user, emag_source)
emagged = !emagged
update()
@@ -166,14 +166,14 @@ GLOBAL_VAR_INIT(Recycled_Items, 0)
to_chat(user, span_warning("Unable to empty filter while the machine is running."))
return ..()
-/obj/machinery/v_garbosystem/proc/transfer_reagent_to_tank(var/datum/reagents/reg,var/multiplier)
+/obj/machinery/v_garbosystem/proc/transfer_reagent_to_tank(datum/reagents/reg,multiplier)
var/volume_magic = reg.total_volume * multiplier
volume_magic -= rand(2,10) // reagent tax
if(volume_magic > 0)
reg.trans_to_holder( reagents, volume_magic)
transfer_sludge_to_tank(rand(1,5))
-/obj/machinery/v_garbosystem/proc/transfer_ore_to_tank(var/obj/item/ore/R,var/multiplier)
+/obj/machinery/v_garbosystem/proc/transfer_ore_to_tank(obj/item/ore/R,multiplier)
if(GLOB.ore_reagents[R.type])
var/list/ore_components = GLOB.ore_reagents[R.type]
if(islist(ore_components))
@@ -184,7 +184,7 @@ GLOBAL_VAR_INIT(Recycled_Items, 0)
reagents.add_reagent(ore_components, REAGENTS_PER_ORE * multiplier)
transfer_sludge_to_tank(rand(1,5))
-/obj/machinery/v_garbosystem/proc/transfer_sludge_to_tank(var/amt)
+/obj/machinery/v_garbosystem/proc/transfer_sludge_to_tank(amt)
if(prob(10) || amt >= 5)
reagents.add_reagent(REAGENT_ID_TOXIN, amt)
visible_message("\The [src] gurgles.")
diff --git a/modular_chomp/code/modules/spells/spells.dm b/modular_chomp/code/modules/spells/spells.dm
index ef8775b069..50c3f119bb 100644
--- a/modular_chomp/code/modules/spells/spells.dm
+++ b/modular_chomp/code/modules/spells/spells.dm
@@ -57,7 +57,7 @@
return 1
return 0
-/obj/item/spell/unrestricted/pay_energy(var/amount)
+/obj/item/spell/unrestricted/pay_energy(amount)
if(owner)
return 1
diff --git a/modular_chomp/code/modules/virus2/effect.dm b/modular_chomp/code/modules/virus2/effect.dm
index 1b4c3a5117..c4e849dd05 100644
--- a/modular_chomp/code/modules/virus2/effect.dm
+++ b/modular_chomp/code/modules/virus2/effect.dm
@@ -6,7 +6,7 @@
stage = 1
chance_maxm = 10
-/datum/disease2/effect/cat/activate(var/mob/living/carbon/mob,var/multiplier)
+/datum/disease2/effect/cat/activate(mob/living/carbon/mob,multiplier)
mob.say("[pick("Meow.","*meow","*mrow","*mgeow")]")
/datum/disease2/effect/choreomania
@@ -61,7 +61,7 @@
stage = 2
chance_maxm = 5
-/datum/disease2/effect/jellylegs/activate(var/mob/living/carbon/mob,var/multiplier)
+/datum/disease2/effect/jellylegs/activate(mob/living/carbon/mob,multiplier)
to_chat(mob, span_notice("Your body seems to lose balance!"))
mob.slip("yourself.")
@@ -70,7 +70,7 @@
stage = 2
chance_maxm = 7
-/datum/disease2/effect/morgellon/activate(var/mob/living/carbon/mob,var/multiplier)
+/datum/disease2/effect/morgellon/activate(mob/living/carbon/mob,multiplier)
if(prob(65))
var/obj/item/organ/external/O = pick(mob.organs)
to_chat(mob, span_warning("Your [O.name] [pick(" itches slightly...", " stings!")]"))
diff --git a/modular_chomp/code/modules/vore/resizing/resize.dm b/modular_chomp/code/modules/vore/resizing/resize.dm
index 1c12fd14a3..60e4f4de72 100644
--- a/modular_chomp/code/modules/vore/resizing/resize.dm
+++ b/modular_chomp/code/modules/vore/resizing/resize.dm
@@ -1,4 +1,4 @@
-/mob/living/Crossed(var/atom/movable/AM)
+/mob/living/Crossed(atom/movable/AM)
..()
var/mob/living/target = AM
if(istype(target) && src.lying && target.loc && target.buckled != src)
diff --git a/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm b/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm
index 348025d0a1..3905283594 100644
--- a/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm
+++ b/modular_chomp/code/modules/xenobio/machinery/monkey_processor.dm
@@ -28,7 +28,7 @@
processing = FALSE
playsound(src, 'sound/machines/ding.ogg', 50, 1)
-/obj/machinery/processor/monkey/extract(var/atom/movable/AM)
+/obj/machinery/processor/monkey/extract(atom/movable/AM)
if(istype(AM, /mob/living/carbon/human))
var/mob/living/carbon/human/M = AM
playsound(src, 'sound/effects/splat.ogg', 50, 1)
@@ -37,7 +37,7 @@
monkeys_recycled++
sleep(1 SECOND)
-/obj/machinery/processor/monkey/can_insert(var/atom/movable/AM)
+/obj/machinery/processor/monkey/can_insert(atom/movable/AM)
if(istype(AM, /mob/living/carbon/human))
var/mob/living/carbon/human/H = AM
if(!istype(H.species, /datum/species/monkey))
diff --git a/modular_chomp/doc/coalesce.dm b/modular_chomp/doc/coalesce.dm
index 72cd162445..1871733e32 100644
--- a/modular_chomp/doc/coalesce.dm
+++ b/modular_chomp/doc/coalesce.dm
@@ -17,7 +17,7 @@ the syntax is coalesce(var1,var2...)
// This makes it so we do not have to do any extra if/else statements, we simply use whatever is present first.
//as a second example you can also use coalesce as a fallback
-/proc/fetch_name_with_fallback(var/name,var/nametwo)
+/proc/fetch_name_with_fallback(name,nametwo)
coalesce(name, nametwo, "Not found")
//Now what this will do is return name, if name is not null, nametwo if name is null but nametwo isnt null
//however if both given vars are in fact null we have a hardocded fallback "not found" that will always return instead
diff --git a/modular_chomp/maps/common/common_machinery.dm b/modular_chomp/maps/common/common_machinery.dm
index 419be7692a..6316532d50 100644
--- a/modular_chomp/maps/common/common_machinery.dm
+++ b/modular_chomp/maps/common/common_machinery.dm
@@ -19,7 +19,7 @@
icon = 'icons/mob/screen1.dmi' //VS Edit
icon_state = "centermarker" //VS Edit
-/obj/effect/step_trigger/tramblock/Trigger(var/atom/movable/A)
+/obj/effect/step_trigger/tramblock/Trigger(atom/movable/A)
if(istype(A, /mob/living/carbon/human))
to_chat(A, span_notice("OOC Notice: You have an itch to explore, it seems! \
This tunnel does not go any further past the doors, thanks to game limitations and stuff in the way! \
diff --git a/modular_chomp/maps/common/common_turfs.dm b/modular_chomp/maps/common/common_turfs.dm
index c6290dcf9e..7a88c83726 100644
--- a/modular_chomp/maps/common/common_turfs.dm
+++ b/modular_chomp/maps/common/common_turfs.dm
@@ -3,7 +3,7 @@
/turf/simulated/floor/maglev/unpowered
desc = "Magnetic levitation tram tracks. Unpowered? Looks like it. Safe? Your try."
-/turf/simulated/floor/maglev/unpowered/Entered(var/atom/movable/AM, var/atom/old_loc)
+/turf/simulated/floor/maglev/unpowered/Entered(atom/movable/AM, atom/old_loc)
return // No zappy.
/turf/simulated/mineral/thor
diff --git a/modular_chomp/maps/common_submaps/asteroid_belt/belt_miner_things.dm b/modular_chomp/maps/common_submaps/asteroid_belt/belt_miner_things.dm
index 1988b7aa43..f66ea8a832 100644
--- a/modular_chomp/maps/common_submaps/asteroid_belt/belt_miner_things.dm
+++ b/modular_chomp/maps/common_submaps/asteroid_belt/belt_miner_things.dm
@@ -23,7 +23,7 @@
max_n2 = 0
minbodytemp = 0
-/mob/living/simple_mob/animal/giant_spider/frost/space/Process_Spacemove(var/check_drift = 0)
+/mob/living/simple_mob/animal/giant_spider/frost/space/Process_Spacemove(check_drift = 0)
return TRUE
// Belt mob spawners
diff --git a/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm b/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
index 3b9339cf46..953f6cb7d8 100644
--- a/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
+++ b/modular_chomp/maps/common_submaps/overmap/planets/thor/thor.dm
@@ -336,7 +336,7 @@
for(var/d in crossed_dirs)
add_overlay(image(icon = 'icons/turf/outdoors.dmi', icon_state = "snow_footprints", dir = text2num(d)))
-/turf/simulated/floor/outdoors/snow/thor/planetuse/attackby(var/obj/item/W, var/mob/user)
+/turf/simulated/floor/outdoors/snow/thor/planetuse/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/shovel))
to_chat(user, span_notice("You begin to remove \the [src] with your [W]."))
if(do_after(user, 4 SECONDS * W.toolspeed, src))
diff --git a/modular_chomp/maps/overmap/sectors/common_overmap.dm b/modular_chomp/maps/overmap/sectors/common_overmap.dm
index c001f21ca5..88feed663c 100644
--- a/modular_chomp/maps/overmap/sectors/common_overmap.dm
+++ b/modular_chomp/maps/overmap/sectors/common_overmap.dm
@@ -63,15 +63,15 @@ GLOBAL_LIST_EMPTY(station_waypoints) //Create global list for station waypoints,
Z_LEVEL_SN_STATION_THREE,
GLOB.map_templates_loaded[Z_NAME_ALIAS_MISC])
-/obj/effect/overmap/visitable/sector/Soluna_Nexus/Crossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/Soluna_Nexus/Crossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = FALSE)
-/obj/effect/overmap/visitable/sector/Soluna_Nexus/Uncrossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/Soluna_Nexus/Uncrossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = TRUE)
-/obj/effect/overmap/visitable/sector/Soluna_Nexus/announce_atc(var/atom/movable/AM, var/going = FALSE)
+/obj/effect/overmap/visitable/sector/Soluna_Nexus/announce_atc(atom/movable/AM, going = FALSE)
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
if(world.time < mob_announce_cooldown)
return
@@ -147,15 +147,15 @@ GLOBAL_LIST_EMPTY(station_waypoints) //Create global list for station waypoints,
Z_LEVEL_SC_STATION_THREE,
GLOB.map_templates_loaded[Z_NAME_ALIAS_MISC])
-/obj/effect/overmap/visitable/sector/Southern_Cross/Crossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/Southern_Cross/Crossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = FALSE)
-/obj/effect/overmap/visitable/sector/Southern_Cross/Uncrossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/Southern_Cross/Uncrossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = TRUE)
-/obj/effect/overmap/visitable/sector/Southern_Cross/announce_atc(var/atom/movable/AM, var/going = FALSE)
+/obj/effect/overmap/visitable/sector/Southern_Cross/announce_atc(atom/movable/AM, going = FALSE)
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
if(world.time < mob_announce_cooldown)
return
@@ -235,15 +235,15 @@ GLOBAL_LIST_EMPTY(station_waypoints) //Create global list for station waypoints,
Z_LEVEL_CETUS_STATION_THREE,
GLOB.map_templates_loaded[Z_NAME_ALIAS_MISC])
-/obj/effect/overmap/visitable/sector/Cetus/Crossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/Cetus/Crossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = FALSE)
-/obj/effect/overmap/visitable/sector/Cetus/Uncrossed(var/atom/movable/AM)
+/obj/effect/overmap/visitable/sector/Cetus/Uncrossed(atom/movable/AM)
. = ..()
announce_atc(AM,going = TRUE)
-/obj/effect/overmap/visitable/sector/Cetus/announce_atc(var/atom/movable/AM, var/going = FALSE)
+/obj/effect/overmap/visitable/sector/Cetus/announce_atc(atom/movable/AM, going = FALSE)
if(istype(AM, /obj/effect/overmap/visitable/ship/simplemob))
if(world.time < mob_announce_cooldown)
return
diff --git a/modular_chomp/maps/relic_base/relicbase_defines.dm b/modular_chomp/maps/relic_base/relicbase_defines.dm
index 7983db4521..d479ac19b4 100644
--- a/modular_chomp/maps/relic_base/relicbase_defines.dm
+++ b/modular_chomp/maps/relic_base/relicbase_defines.dm
@@ -123,7 +123,7 @@
// Commented out due to causing a lot of bugs. The base proc plus overmap achieves this functionality anyways.
/*
// Short range computers see only the six main levels, others can see the surrounding surface levels.
-/datum/map/southern_cross/get_map_levels(var/srcz, var/long_range = TRUE)
+/datum/map/southern_cross/get_map_levels(srcz, long_range = TRUE)
if (long_range && (srcz in map_levels))
return map_levels
else if (srcz == Z_LEVEL_RB_TRANSIT && !long_range)
diff --git a/modular_chomp/maps/relic_base/relicbase_shuttles.dm b/modular_chomp/maps/relic_base/relicbase_shuttles.dm
index 070a03da84..4d19041294 100644
--- a/modular_chomp/maps/relic_base/relicbase_shuttles.dm
+++ b/modular_chomp/maps/relic_base/relicbase_shuttles.dm
@@ -23,7 +23,7 @@
signal.data["command"] = "secure_close"
post_signal(signal)
-/datum/shuttle/autodock/ferry/emergency/escape/proc/post_signal(datum/signal/signal, var/filter = null)
+/datum/shuttle/autodock/ferry/emergency/escape/proc/post_signal(datum/signal/signal, filter = null)
signal.transmission_method = TRANSMISSION_RADIO
if(radio_connection)
return radio_connection.post_signal(src, signal, filter)
diff --git a/modular_chomp/maps/~map_system/maps.dm b/modular_chomp/maps/~map_system/maps.dm
index 5d7efef3dc..5a71d1fb93 100644
--- a/modular_chomp/maps/~map_system/maps.dm
+++ b/modular_chomp/maps/~map_system/maps.dm
@@ -161,7 +161,7 @@ GLOBAL_LIST_EMPTY(all_maps)
default_skybox = new()
// Gets the current time on a current zlevel, and returns a time datum
-/datum/map/proc/get_zlevel_time(var/z)
+/datum/map/proc/get_zlevel_time(z)
if(!z)
z = 1
var/datum/planet/P = z <= SSplanets.z_to_planet.len ? SSplanets.z_to_planet[z] : null
@@ -175,7 +175,7 @@ GLOBAL_LIST_EMPTY(all_maps)
return T
// Returns a boolean for if it's night or not on a particular zlevel
-/datum/map/proc/get_night(var/z)
+/datum/map/proc/get_night(z)
if(!z)
z = 1
var/datum/time/now = get_zlevel_time(z)
@@ -198,11 +198,11 @@ GLOBAL_LIST_EMPTY(all_maps)
/datum/map/proc/perform_map_generation()
return
-/datum/map/proc/get_network_access(var/network)
+/datum/map/proc/get_network_access(network)
return 0
// By default transition randomly to another zlevel
-/datum/map/proc/get_transit_zlevel(var/current_z_level)
+/datum/map/proc/get_transit_zlevel(current_z_level)
var/list/candidates = using_map.accessible_z_levels.Copy()
candidates.Remove(num2text(current_z_level))
@@ -223,12 +223,12 @@ GLOBAL_LIST_EMPTY(all_maps)
empty_levels += world.maxz
return pick_n_take(empty_levels)
-/datum/map/proc/cache_empty_zlevel(var/z)
+/datum/map/proc/cache_empty_zlevel(z)
if(z) // Else, it's not a valid z and we want to expunge it
empty_levels |= z
//CHOMPAdd Start restricted map view
-/datum/map/proc/get_visible_map_levels(var/srcz, var/long_range = FALSE)
+/datum/map/proc/get_visible_map_levels(srcz, long_range = FALSE)
if (long_range && (srcz in contact_levels))
return contact_levels.Copy() - admin_levels
//If in station levels, return station levels
@@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(all_maps)
// Get a list of 'nearby' or 'connected' zlevels.
// You should at least return a list with the given z if nothing else.
-/datum/map/proc/get_map_levels(var/srcz, var/long_range = FALSE, var/om_range = -1)
+/datum/map/proc/get_map_levels(srcz, long_range = FALSE, om_range = -1)
//Get what sector we're in
var/obj/effect/overmap/visitable/O = get_overmap_sector(srcz)
if(istype(O))
@@ -269,7 +269,7 @@ GLOBAL_LIST_EMPTY(all_maps)
else
return list(srcz)
-/datum/map/proc/get_zlevel_name(var/index)
+/datum/map/proc/get_zlevel_name(index)
var/datum/map_z_level/Z = zlevels["[index]"]
return Z?.name
@@ -322,7 +322,7 @@ GLOBAL_LIST_EMPTY(all_maps)
var/datum/skybox_settings/custom_skybox // Can override skybox type here for this z
// Default constructor applies itself to the parent map datum
-/datum/map_z_level/New(var/datum/map/map)
+/datum/map_z_level/New(datum/map/map)
if(!z) return
map.zlevels["[z]"] = src
if(flags & MAP_LEVEL_STATION) map.station_levels += z
@@ -362,7 +362,7 @@ GLOBAL_LIST_EMPTY(all_maps)
if(custom_skybox)
custom_skybox = new custom_skybox()
-/datum/map_z_level/Destroy(var/force)
+/datum/map_z_level/Destroy(force)
stack_trace("Attempt to delete a map_z_level instance [log_info_line(src)]")
if(!force)
return QDEL_HINT_LETMELIVE // No.
diff --git a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm
index bae3f5de1b..0d68a62939 100644
--- a/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm
+++ b/modular_chomp/maps/~turfpacks/unsim_turfs/unsim_turfs_outdoors.dm
@@ -107,10 +107,10 @@
icon_state = "ice_dark_smooth"
desc = "Dark rock that has been smoothened to be perfectly even. It's coated in a layer of slippey ice"
-/turf/unsimulated/floor/outdoors/ice/Entered(var/mob/living/M)
+/turf/unsimulated/floor/outdoors/ice/Entered(mob/living/M)
addtimer(CALLBACK(src, PROC_REF(do_slip), M), (1 * world.tick_lag), TIMER_DELETE_ME)
-/turf/unsimulated/floor/outdoors/ice/proc/do_slip(var/mob/living/M)
+/turf/unsimulated/floor/outdoors/ice/proc/do_slip(mob/living/M)
if(istype(M, /mob/living))
if(M.stunned == 0)
to_chat(M, span_warning("You slide across the ice!"))
diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh
index 08ca933614..993167fc83 100755
--- a/tools/ci/check_grep.sh
+++ b/tools/ci/check_grep.sh
@@ -209,12 +209,12 @@ if $grep '\.proc/' $code_x_515 ; then
FAILED=1
fi;
-#part "var in proc args"
-#if grep -P '^/[\w/]\S+\(.*(var/|, ?var/.*).*\)' $code_files; then
-# echo
-# echo -e "${RED}ERROR: changed files contains proc argument starting with 'var'.${NC}"
-# FAILED=1
-#fi;
+part "var in proc args"
+if grep -P '^/[\w/]\S+\(.*(var/|, ?var/.*).*\)' $code_files; then
+ echo
+ echo -e "${RED}ERROR: changed files contains proc argument starting with 'var'.${NC}"
+ FAILED=1
+fi;
part "unmanaged global vars"
if grep -P '^/*var/' $code_files; then
| | |